mirror of
https://github.com/grafana/grafana.git
synced 2026-07-30 08:18:10 -05:00
Chore: remove IsDisabled method for access control (#74340)
remove IsDisabled method for access control, clean up tests
This commit is contained in:
@@ -120,7 +120,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
|
||||
VerifyEmailEnabled: setting.VerifyEmailEnabled,
|
||||
SigV4AuthEnabled: setting.SigV4AuthEnabled,
|
||||
AzureAuthEnabled: setting.AzureAuthEnabled,
|
||||
RbacEnabled: hs.Cfg.RBACEnabled,
|
||||
RbacEnabled: true,
|
||||
ExploreEnabled: setting.ExploreEnabled,
|
||||
HelpEnabled: setting.HelpEnabled,
|
||||
ProfileEnabled: setting.ProfileEnabled,
|
||||
|
||||
@@ -68,7 +68,7 @@ func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features *featuremgmt.
|
||||
SettingsProvider: setting.ProvideProvider(cfg),
|
||||
pluginStore: pluginStore,
|
||||
grafanaUpdateChecker: &updatechecker.GrafanaService{},
|
||||
AccessControl: accesscontrolmock.New().WithDisabled(),
|
||||
AccessControl: accesscontrolmock.New(),
|
||||
PluginSettings: pluginsSettings,
|
||||
pluginsCDNService: pluginscdn.ProvideService(&config.Cfg{
|
||||
PluginsCDNURLTemplate: cfg.PluginsCDNURLTemplate,
|
||||
|
||||
@@ -65,7 +65,6 @@ func Test_PluginsInstallAndUninstall(t *testing.T) {
|
||||
for _, tc := range tcs {
|
||||
server := SetupAPITestServer(t, func(hs *HTTPServer) {
|
||||
hs.Cfg = &setting.Cfg{
|
||||
RBACEnabled: true,
|
||||
PluginAdminEnabled: tc.pluginAdminEnabled,
|
||||
PluginAdminExternalManageEnabled: tc.pluginAdminExternalManageEnabled}
|
||||
hs.orgService = &orgtest.FakeOrgService{ExpectedOrg: &org.Org{}}
|
||||
|
||||
Reference in New Issue
Block a user