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

Preferences: Remove SQLX backing store (#78015)

Browse Source
This commit is contained in:
Ryan McKinley
2023-11-13 06:22:22 -08:00
committed by GitHub
parent c91fc18d31
commit ad44164910
4 changed files with 42 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/preference/prefimpl/pref_test.go
+17 -23
View File
@@ -8,16 +8,15 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/services/featuremgmt"
pref "github.com/grafana/grafana/pkg/services/preference"
"github.com/grafana/grafana/pkg/setting"
)
func TestGet_empty(t *testing.T) {
cfg := setting.NewCfg()
prefService := &Service{
store: newFake(),
cfg: setting.NewCfg(),
features: featuremgmt.WithFeatures(),
defaults: prefsFromConfig(cfg),
}
preference, err := prefService.Get(context.Background(), &pref.GetPreferenceQuery{})
require.NoError(t, err)
@@ -28,14 +27,15 @@ func TestGet_empty(t *testing.T) {
}
func TestGetDefaults(t *testing.T) {
cfg := setting.NewCfg()
cfg.DefaultLanguage = "en-US"
cfg.DefaultTheme = "light"
cfg.DateFormats.DefaultTimezone = "UTC"
prefService := &Service{
store: newFake(),
cfg: setting.NewCfg(),
features: featuremgmt.WithFeatures(),
defaults: prefsFromConfig(cfg),
}
prefService.cfg.DefaultLanguage = "en-US"
prefService.cfg.DefaultTheme = "light"
prefService.cfg.DateFormats.DefaultTimezone = "UTC"
weekStart := ""
t.Run("GetDefaults", func(t *testing.T) {
@@ -74,12 +74,12 @@ func TestGetDefaults(t *testing.T) {
}
func TestGetWithDefaults_withUserAndOrgPrefs(t *testing.T) {
cfg := setting.NewCfg()
cfg.DefaultLanguage = "en-US"
prefService := &Service{
store: newFake(),
cfg: setting.NewCfg(),
features: featuremgmt.WithFeatures(),
defaults: prefsFromConfig(cfg),
}
prefService.cfg.DefaultLanguage = "en-US"
weekStartOne := "1"
weekStartTwo := "2"
@@ -163,8 +163,7 @@ func TestGetDefaults_JSONData(t *testing.T) {
t.Run("users have precedence over org", func(t *testing.T) {
prefService := &Service{
store: newFake(),
cfg: setting.NewCfg(),
features: featuremgmt.WithFeatures(),
defaults: prefsFromConfig(setting.NewCfg()),
}
insertPrefs(t, prefService.store,
@@ -191,8 +190,7 @@ func TestGetDefaults_JSONData(t *testing.T) {
t.Run("user JSONData with missing language does not override org preference", func(t *testing.T) {
prefService := &Service{
store: newFake(),
cfg: setting.NewCfg(),
features: featuremgmt.WithFeatures(),
defaults: prefsFromConfig(setting.NewCfg()),
}
insertPrefs(t, prefService.store,
@@ -222,8 +220,7 @@ func TestGetDefaults_JSONData(t *testing.T) {
t.Run("teams have precedence over org and are read in ascending order", func(t *testing.T) {
prefService := &Service{
store: newFake(),
cfg: setting.NewCfg(),
features: featuremgmt.WithFeatures(),
defaults: prefsFromConfig(setting.NewCfg()),
}
insertPrefs(t, prefService.store,
@@ -260,8 +257,7 @@ func TestGetWithDefaults_teams(t *testing.T) {
weekStartTwo := "2"
prefService := &Service{
store: newFake(),
cfg: setting.NewCfg(),
features: featuremgmt.WithFeatures(),
defaults: prefsFromConfig(setting.NewCfg()),
}
insertPrefs(t, prefService.store,
pref.Preference{
@@ -307,8 +303,7 @@ func TestGetWithDefaults_teams(t *testing.T) {
func TestPatch_toCreate(t *testing.T) {
prefService := &Service{
store: newFake(),
cfg: setting.NewCfg(),
features: featuremgmt.WithFeatures(),
defaults: prefsFromConfig(setting.NewCfg()),
}
themeValue := "light"
@@ -328,8 +323,7 @@ func TestPatch_toCreate(t *testing.T) {
func TestSave(t *testing.T) {
prefService := &Service{
store: newFake(),
cfg: setting.NewCfg(),
features: featuremgmt.WithFeatures(),
defaults: prefsFromConfig(setting.NewCfg()),
}
t.Run("insert", func(t *testing.T) {