From 7ed011745a544873f40f806f1803cb8a4998ba01 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 26 Oct 2017 14:21:22 -0500 Subject: Remove more global refs / state (#7723) * remove more global refs / state * fix job enterprise initialization * fix api4 test compilation * saml api endpoints fix --- app/oauth_test.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'app/oauth_test.go') diff --git a/app/oauth_test.go b/app/oauth_test.go index 81f331657..d5fbe8f5e 100644 --- a/app/oauth_test.go +++ b/app/oauth_test.go @@ -7,7 +7,6 @@ import ( "testing" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) func TestOAuthRevokeAccessToken(t *testing.T) { @@ -50,11 +49,11 @@ func TestOAuthDeleteApp(t *testing.T) { th := Setup() defer th.TearDown() - oldSetting := utils.Cfg.ServiceSettings.EnableOAuthServiceProvider - defer func() { - utils.Cfg.ServiceSettings.EnableOAuthServiceProvider = oldSetting - }() - utils.Cfg.ServiceSettings.EnableOAuthServiceProvider = true + oldSetting := th.App.Config().ServiceSettings.EnableOAuthServiceProvider + defer th.App.UpdateConfig(func(cfg *model.Config) { + cfg.ServiceSettings.EnableOAuthServiceProvider = oldSetting + }) + th.App.Config().ServiceSettings.EnableOAuthServiceProvider = true a1 := &model.OAuthApp{} a1.CreatorId = model.NewId() -- cgit v1.2.3-1-g7c22