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

Chore: avoid hard-coding IDs in integration tests (#33152)

Browse Source 
* use dynamic user Ids in test

* use dynamic IDs in alert tests

* use dynamic IDs in dashboard test queries

* use dynamic IDs in org test queries
This commit is contained in:
Dafydd
2021-04-21 11:22:46 +03:00
committed by GitHub
parent 2cd6c0565b
commit 0dcd0281ab
4 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/user_test.go
+4 -4
View File
@@ -363,7 +363,7 @@ func TestUserDataAccess(t *testing.T) {
require.True(t, found)
disableCmd := models.BatchDisableUsersCommand{
UserIds: []int64{1, 2, 3, 4, 5},
UserIds: []int64{users[0].Id, users[1].Id, users[2].Id, users[3].Id, users[4].Id},
IsDisabled: true,
}
@@ -406,7 +406,7 @@ func TestUserDataAccess(t *testing.T) {
t.Run("Testing DB - enable all users", func(t *testing.T) {
createFiveTestUsers(t, ss, func(i int) *models.CreateUserCommand {
users := createFiveTestUsers(t, ss, func(i int) *models.CreateUserCommand {
return &models.CreateUserCommand{
Email: fmt.Sprint("user", i, "@test.com"),
Name: fmt.Sprint("user", i),
@@ -416,7 +416,7 @@ func TestUserDataAccess(t *testing.T) {
})
disableCmd := models.BatchDisableUsersCommand{
UserIds: []int64{1, 2, 3, 4, 5},
UserIds: []int64{users[0].Id, users[1].Id, users[2].Id, users[3].Id, users[4].Id},
IsDisabled: false,
}
@@ -607,7 +607,7 @@ func TestUserDataAccess(t *testing.T) {
require.Nil(t, err)
// Cannot make themselves a non-admin
updatePermsError := ss.UpdateUserPermissions(1, false)
updatePermsError := ss.UpdateUserPermissions(user.Id, false)
require.Equal(t, updatePermsError, models.ErrLastGrafanaAdmin)