summaryrefslogtreecommitdiffstats
path: root/api/apitestlib.go
diff options
context:
space:
mode:
authorDerrick Anderson <derrick@andersonwebstudio.com>2018-02-12 16:01:02 -0500
committerDerrick Anderson <derrick@andersonwebstudio.com>2018-02-12 16:01:02 -0500
commitc209e4457457edc042f063390c9a222a694f3a6d (patch)
tree5e1653318a6a14bcad80025793adab0f700deed9 /api/apitestlib.go
parent62efb1df754bfe6b10a3c17ca6f89fd33b991f56 (diff)
downloadchat-c209e4457457edc042f063390c9a222a694f3a6d.tar.gz
chat-c209e4457457edc042f063390c9a222a694f3a6d.tar.bz2
chat-c209e4457457edc042f063390c9a222a694f3a6d.zip
revert master changes
Diffstat (limited to 'api/apitestlib.go')
-rw-r--r--api/apitestlib.go11
1 files changed, 3 insertions, 8 deletions
diff --git a/api/apitestlib.go b/api/apitestlib.go
index 47691b2dd..8d7f54902 100644
--- a/api/apitestlib.go
+++ b/api/apitestlib.go
@@ -105,11 +105,7 @@ func setupTestHelper(enterprise bool) *TestHelper {
if testStore != nil {
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" })
}
- serverErr := th.App.StartServer()
- if serverErr != nil {
- panic(serverErr)
- }
-
+ th.App.StartServer()
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = prevListenAddress })
api4.Init(th.App, th.App.Srv.Router, false)
Init(th.App, th.App.Srv.Router)
@@ -118,10 +114,9 @@ func setupTestHelper(enterprise bool) *TestHelper {
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableOpenServer = true })
+ utils.SetIsLicensed(enterprise)
if enterprise {
- th.App.SetLicense(model.NewTestLicense())
- } else {
- th.App.SetLicense(nil)
+ utils.License().Features.SetDefaults()
}
return th