mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
RBAC: Update TestIntegrationFolderService remove RBAC setting (#67052)
* remove the RBAC configuration setting * add back tests
This commit is contained in:
parent
0d0c6401e3
commit
b93f26f29d
@ -64,7 +64,6 @@ func TestIntegrationFolderService(t *testing.T) {
|
|||||||
folderStore := foldertest.NewFakeFolderStore(t)
|
folderStore := foldertest.NewFakeFolderStore(t)
|
||||||
|
|
||||||
cfg := setting.NewCfg()
|
cfg := setting.NewCfg()
|
||||||
cfg.RBACEnabled = true
|
|
||||||
features := featuremgmt.WithFeatures()
|
features := featuremgmt.WithFeatures()
|
||||||
|
|
||||||
service := &Service{
|
service := &Service{
|
||||||
@ -451,7 +450,6 @@ func TestNestedFolderServiceFeatureToggle(t *testing.T) {
|
|||||||
dashboardFolderStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
|
dashboardFolderStore.On("GetFolderByID", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(&folder.Folder{}, nil)
|
||||||
|
|
||||||
cfg := setting.NewCfg()
|
cfg := setting.NewCfg()
|
||||||
cfg.RBACEnabled = false
|
|
||||||
folderService := &Service{
|
folderService := &Service{
|
||||||
cfg: cfg,
|
cfg: cfg,
|
||||||
store: nestedFolderStore,
|
store: nestedFolderStore,
|
||||||
@ -1033,7 +1031,6 @@ func setup(t *testing.T, dashStore dashboards.Store, dashboardFolderStore folder
|
|||||||
|
|
||||||
// nothing enabled yet
|
// nothing enabled yet
|
||||||
cfg := setting.NewCfg()
|
cfg := setting.NewCfg()
|
||||||
cfg.RBACEnabled = false
|
|
||||||
return &Service{
|
return &Service{
|
||||||
cfg: cfg,
|
cfg: cfg,
|
||||||
log: log.New("test-folder-service"),
|
log: log.New("test-folder-service"),
|
||||||
|
Loading…
Reference in New Issue
Block a user