Skip to content

N
nexpie-grafana-theme
Commit 8c7e7e6d by Emil Hessman Committed by GitHub
Options

Chore: Rewrite preferences test from GoConvey to stdlib and testify (#29129)

parent 115f38f5
Showing with 42 additions and 45 deletions
pkg/services/sqlstore/preferences_test.go
...@@ -5,116 +5,113 @@ package sqlstore ...@@ -5,116 +5,113 @@ package sqlstore
import ( import (
"testing" "testing"
. "github.com/smartystreets/goconvey/convey"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/stretchr/testify/require"
) )
func TestPreferencesDataAccess(t *testing.T) { func TestPreferencesDataAccess(t *testing.T) {
Convey("Testing preferences data access", t, func() {
ss := InitTestDB(t) ss := InitTestDB(t)
Convey("GetPreferencesWithDefaults with no saved preferences should return defaults", func() { t.Run("GetPreferencesWithDefaults with no saved preferences should return defaults", func(t *testing.T) {
setting.DefaultTheme = "light" setting.DefaultTheme = "light"
ss.Cfg.DateFormats.DefaultTimezone = "UTC" ss.Cfg.DateFormats.DefaultTimezone = "UTC"
query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{}} query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{}}
err := ss.GetPreferencesWithDefaults(query) err := ss.GetPreferencesWithDefaults(query)
So(err, ShouldBeNil) require.NoError(t, err)
So(query.Result.Theme, ShouldEqual, "light") require.Equal(t, "light", query.Result.Theme)
So(query.Result.Timezone, ShouldEqual, "UTC") require.Equal(t, "UTC", query.Result.Timezone)
So(query.Result.HomeDashboardId, ShouldEqual, 0) require.Equal(t, int64(0), query.Result.HomeDashboardId)
}) })
Convey("GetPreferencesWithDefaults with saved org and user home dashboard should return user home dashboard", func() { t.Run("GetPreferencesWithDefaults with saved org and user home dashboard should return user home dashboard", func(t *testing.T) {
err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4})
So(err, ShouldBeNil) require.NoError(t, err)
query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 1}} query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 1}}
err = ss.GetPreferencesWithDefaults(query) err = ss.GetPreferencesWithDefaults(query)
So(err, ShouldBeNil) require.NoError(t, err)
So(query.Result.HomeDashboardId, ShouldEqual, 4) require.Equal(t, int64(4), query.Result.HomeDashboardId)
}) })
Convey("GetPreferencesWithDefaults with saved org and other user home dashboard should return org home dashboard", func() { t.Run("GetPreferencesWithDefaults with saved org and other user home dashboard should return org home dashboard", func(t *testing.T) {
err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4})
So(err, ShouldBeNil) require.NoError(t, err)
query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 2}} query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 2}}
err = ss.GetPreferencesWithDefaults(query) err = ss.GetPreferencesWithDefaults(query)
So(err, ShouldBeNil) require.NoError(t, err)
So(query.Result.HomeDashboardId, ShouldEqual, 1) require.Equal(t, int64(1), query.Result.HomeDashboardId)
}) })
Convey("GetPreferencesWithDefaults with saved org and teams home dashboard should return last team home dashboard", func() { t.Run("GetPreferencesWithDefaults with saved org and teams home dashboard should return last team home dashboard", func(t *testing.T) {
err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3})
So(err, ShouldBeNil) require.NoError(t, err)
query := &models.GetPreferencesWithDefaultsQuery{ query := &models.GetPreferencesWithDefaultsQuery{
User: &models.SignedInUser{OrgId: 1, Teams: []int64{2, 3}}, User: &models.SignedInUser{OrgId: 1, Teams: []int64{2, 3}},
} }
err = ss.GetPreferencesWithDefaults(query) err = ss.GetPreferencesWithDefaults(query)
So(err, ShouldBeNil) require.NoError(t, err)
So(query.Result.HomeDashboardId, ShouldEqual, 3) require.Equal(t, int64(3), query.Result.HomeDashboardId)
}) })
Convey("GetPreferencesWithDefaults with saved org and other teams home dashboard should return org home dashboard", func() { t.Run("GetPreferencesWithDefaults with saved org and other teams home dashboard should return org home dashboard", func(t *testing.T) {
err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3})
So(err, ShouldBeNil) require.NoError(t, err)
query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1}} query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1}}
err = ss.GetPreferencesWithDefaults(query) err = ss.GetPreferencesWithDefaults(query)
So(err, ShouldBeNil) require.NoError(t, err)
So(query.Result.HomeDashboardId, ShouldEqual, 1) require.Equal(t, int64(1), query.Result.HomeDashboardId)
}) })
Convey("GetPreferencesWithDefaults with saved org, teams and user home dashboard should return user home dashboard", func() { t.Run("GetPreferencesWithDefaults with saved org, teams and user home dashboard should return user home dashboard", func(t *testing.T) {
err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4})
So(err, ShouldBeNil) require.NoError(t, err)
query := &models.GetPreferencesWithDefaultsQuery{ query := &models.GetPreferencesWithDefaultsQuery{
User: &models.SignedInUser{OrgId: 1, UserId: 1, Teams: []int64{2, 3}}, User: &models.SignedInUser{OrgId: 1, UserId: 1, Teams: []int64{2, 3}},
} }
err = ss.GetPreferencesWithDefaults(query) err = ss.GetPreferencesWithDefaults(query)
So(err, ShouldBeNil) require.NoError(t, err)
So(query.Result.HomeDashboardId, ShouldEqual, 4) require.Equal(t, int64(4), query.Result.HomeDashboardId)
}) })
Convey("GetPreferencesWithDefaults with saved org, other teams and user home dashboard should return org home dashboard", func() { t.Run("GetPreferencesWithDefaults with saved org, other teams and user home dashboard should return org home dashboard", func(t *testing.T) {
err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) err := SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3})
So(err, ShouldBeNil) require.NoError(t, err)
err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4}) err = SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4})
So(err, ShouldBeNil) require.NoError(t, err)
query := &models.GetPreferencesWithDefaultsQuery{ query := &models.GetPreferencesWithDefaultsQuery{
User: &models.SignedInUser{OrgId: 1, UserId: 2}, User: &models.SignedInUser{OrgId: 1, UserId: 2},
} }
err = ss.GetPreferencesWithDefaults(query) err = ss.GetPreferencesWithDefaults(query)
So(err, ShouldBeNil) require.NoError(t, err)
So(query.Result.HomeDashboardId, ShouldEqual, 1) require.Equal(t, int64(1), query.Result.HomeDashboardId)
})
}) })
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment