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

[v10.3.x] Folders: Fix creating/updating a folder whose title has leading and trailing spaces (#81006)

Browse Source 
Folders: Fix creating/updating a folder whose title has leading and trailing spaces (#80909)

* Add tests

* Folders: Fix creating folder whose title has leading and trailing spaces

* Fix folder update

* Remove redundant argument

* Fix test

(cherry picked from commit 4243079cb5)
This commit is contained in:
Sofia Papagiannaki
2024-01-22 20:50:54 +02:00
committed by GitHub
parent c57ba08e28
commit b168ca8a9a
4 changed files with 97 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/folder/folderimpl/sqlstore_test.go
+8 -9
View File
@@ -11,7 +11,6 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/folder"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/org/orgimpl"
@@ -29,7 +28,7 @@ func TestIntegrationCreate(t *testing.T) {
}
db := sqlstore.InitTestDB(t)
folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
folderStore := ProvideStore(db, db.Cfg)
orgID := CreateOrg(t, db)
@@ -152,7 +151,7 @@ func TestIntegrationDelete(t *testing.T) {
}
db := sqlstore.InitTestDB(t)
folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
folderStore := ProvideStore(db, db.Cfg)
orgID := CreateOrg(t, db)
@@ -199,7 +198,7 @@ func TestIntegrationUpdate(t *testing.T) {
}
db := sqlstore.InitTestDB(t)
folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
folderStore := ProvideStore(db, db.Cfg)
orgID := CreateOrg(t, db)
@@ -374,7 +373,7 @@ func TestIntegrationGet(t *testing.T) {
}
db := sqlstore.InitTestDB(t)
folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
folderStore := ProvideStore(db, db.Cfg)
orgID := CreateOrg(t, db)
@@ -458,7 +457,7 @@ func TestIntegrationGetParents(t *testing.T) {
}
db := sqlstore.InitTestDB(t)
folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
folderStore := ProvideStore(db, db.Cfg)
orgID := CreateOrg(t, db)
@@ -526,7 +525,7 @@ func TestIntegrationGetChildren(t *testing.T) {
}
db := sqlstore.InitTestDB(t)
folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
folderStore := ProvideStore(db, db.Cfg)
orgID := CreateOrg(t, db)
@@ -706,7 +705,7 @@ func TestIntegrationGetHeight(t *testing.T) {
}
db := sqlstore.InitTestDB(t)
folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
folderStore := ProvideStore(db, db.Cfg)
orgID := CreateOrg(t, db)
@@ -739,7 +738,7 @@ func TestIntegrationGetFolders(t *testing.T) {
foldersNum := 10
db := sqlstore.InitTestDB(t)
folderStore := ProvideStore(db, db.Cfg, featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders))
folderStore := ProvideStore(db, db.Cfg)
orgID := CreateOrg(t, db)