public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Ensure we save correct default admin user in integration test DB setup (#105752)

Browse Source 
* fix helper + amend tests

* fix import + remove unused var

* remove more users

* remove unused code

* update test comment
This commit is contained in:
Will Browne
2025-05-28 11:25:01 +01:00
committed by GitHub
parent 10f2b76156
commit edb0865caa
31 changed files with 95 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tests/api/correlations/correlations_create_test.go
+2 -2
View File
@@ -23,8 +23,8 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
adminUser := ctx.createUser(user.CreateUserCommand{
DefaultOrgRole: string(org.RoleAdmin),
Password: "admin",
Login: "admin",
Password: "admin2",
Login: "admin2",
})
editorUser := ctx.createUser(user.CreateUserCommand{
pkg/tests/api/correlations/correlations_delete_test.go
+2 -2
View File
@@ -23,8 +23,8 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
adminUser := ctx.createUser(user.CreateUserCommand{
DefaultOrgRole: string(org.RoleAdmin),
Password: "admin",
Login: "admin",
Password: "admin2",
Login: "admin2",
})
editorUser := ctx.createUser(user.CreateUserCommand{
pkg/tests/api/correlations/correlations_provisioning_api_test.go
+2 -2
View File
@@ -23,8 +23,8 @@ func TestIntegrationCreateOrUpdateCorrelation(t *testing.T) {
adminUser := ctx.createUser(user.CreateUserCommand{
DefaultOrgRole: string(org.RoleAdmin),
Password: "admin",
Login: "admin",
Password: "admin2",
Login: "admin2",
})
createDsCommand := &datasources.AddDataSourceCommand{
pkg/tests/api/correlations/correlations_read_test.go
+4 -4
View File
@@ -25,15 +25,15 @@ func TestIntegrationReadCorrelation(t *testing.T) {
adminUser := ctx.createUser(user.CreateUserCommand{
DefaultOrgRole: string(org.RoleAdmin),
Password: "admin",
Login: "admin",
Password: "admin2",
Login: "admin2",
})
otherOrgId := ctx.createOrg("New organization")
otherOrgUser := ctx.createUser(user.CreateUserCommand{
DefaultOrgRole: string(org.RoleAdmin),
Password: "admin2",
Login: "admin2",
Password: "admin3",
Login: "admin3",
OrgID: otherOrgId,
})
pkg/tests/api/correlations/correlations_update_test.go
+1 -1
View File
@@ -24,7 +24,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
adminUser := ctx.createUser(user.CreateUserCommand{
DefaultOrgRole: string(org.RoleAdmin),
Password: "admin",
Login: "admin",
Login: "admin2",
})
editorUser := ctx.createUser(user.CreateUserCommand{