summaryrefslogtreecommitdiffstats
path: root/app/oauth_test.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-10-26 14:21:22 -0500
committerJoram Wilander <jwawilander@gmail.com>2017-10-26 15:21:22 -0400
commit7ed011745a544873f40f806f1803cb8a4998ba01 (patch)
treefe13919b050b33c8dd3f6ca5fce6ad1980b2dd3e /app/oauth_test.go
parenta0bfd2885d03e3f9fb6b3cdd6ba60eea93c848b2 (diff)
downloadchat-7ed011745a544873f40f806f1803cb8a4998ba01.tar.gz
chat-7ed011745a544873f40f806f1803cb8a4998ba01.tar.bz2
chat-7ed011745a544873f40f806f1803cb8a4998ba01.zip
Remove more global refs / state (#7723)
* remove more global refs / state * fix job enterprise initialization * fix api4 test compilation * saml api endpoints fix
Diffstat (limited to 'app/oauth_test.go')
-rw-r--r--app/oauth_test.go11
1 files changed, 5 insertions, 6 deletions
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()