diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-12 12:02:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 12:02:54 -0600 |
| commit | 1ae680aefae2deb1e9d07d7c2a1c863ec807a79f (patch) | |
| tree | a99a74d6b858d73624c06f85e393acbe97c90586 /api4/apitestlib.go | |
| parent | 9707ac3aaf2cb4352c573aadf54b8535e237dd9e (diff) | |
| parent | 07fd7aeeb8eb2b198b01b713a4ab57f6352faef2 (diff) | |
| download | chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.tar.gz chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.tar.bz2 chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.zip | |
Merge branch 'master' into release-4.7
Diffstat (limited to 'api4/apitestlib.go')
| -rw-r--r-- | api4/apitestlib.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index a7e64ae84..db43a6512 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -113,7 +113,11 @@ func setupTestHelper(enterprise bool) *TestHelper { if testStore != nil { th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" }) } - th.App.StartServer() + serverErr := th.App.StartServer() + if serverErr != nil { + panic(serverErr) + } + th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = prevListenAddress }) Init(th.App, th.App.Srv.Router, true) wsapi.Init(th.App, th.App.Srv.WebSocketRouter) @@ -121,9 +125,10 @@ func setupTestHelper(enterprise bool) *TestHelper { th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableOpenServer = true }) - utils.SetIsLicensed(enterprise) if enterprise { - utils.License().Features.SetDefaults() + th.App.SetLicense(model.NewTestLicense()) + } else { + th.App.SetLicense(nil) } th.Client = th.CreateClient() @@ -298,8 +303,7 @@ func (me *TestHelper) CreateUserWithClient(client *model.Client4) *model.User { } utils.DisableDebugLogForTest() - ruser, r := client.CreateUser(user) - fmt.Println(r) + ruser, _ := client.CreateUser(user) ruser.Password = "Password1" store.Must(me.App.Srv.Store.User().VerifyEmail(ruser.Id)) utils.EnableDebugLogForTest() |