From 08b7b1c4144f18a9dbf52bfe0eb9182f2b4eba4a Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Mon, 23 Oct 2017 02:39:51 -0700
Subject: Reduce cfg boilerplate (#7689)

* reduce cfg boilerplate

* fix compile error

* user test fix

* another test fix

* simplify diagnostics / testing
---
 api4/apitestlib.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'api4/apitestlib.go')

diff --git a/api4/apitestlib.go b/api4/apitestlib.go
index 3e093df56..54b142c4b 100644
--- a/api4/apitestlib.go
+++ b/api4/apitestlib.go
@@ -32,7 +32,8 @@ import (
 )
 
 type TestHelper struct {
-	App *app.App
+	App            *app.App
+	originalConfig *model.Config
 
 	Client              *model.Client4
 	BasicUser           *model.User
@@ -86,6 +87,7 @@ func setupTestHelper(enterprise bool) *TestHelper {
 	th := &TestHelper{
 		App: app.New(options...),
 	}
+	th.originalConfig = th.App.Config().Clone()
 
 	th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.MaxUsersPerTeam = 50 })
 	th.App.UpdateConfig(func(cfg *model.Config) { *cfg.RateLimitSettings.Enable = false })
@@ -177,6 +179,11 @@ func (me *TestHelper) TearDown() {
 
 	wg.Wait()
 
+	me.App.UpdateConfig(func(cfg *model.Config) {
+		*cfg = *me.originalConfig
+	})
+	utils.SetDefaultRolesBasedOnConfig()
+
 	me.App.Shutdown()
 
 	utils.EnableDebugLogForTest()
-- 
cgit v1.2.3-1-g7c22