diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-15 07:45:28 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-15 07:45:28 -0400 |
| commit | f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7 (patch) | |
| tree | d3899b890408f6f16b2d5f543bf975475f1a5584 /api4/apitestlib.go | |
| parent | 51bd710ecdca6628461c9fa2679737073e4d5059 (diff) | |
| parent | a1656dffa98fbc8865e476b214e4e0c562547d39 (diff) | |
| download | chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.tar.gz chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.tar.bz2 chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'api4/apitestlib.go')
| -rw-r--r-- | api4/apitestlib.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index abee5de02..3396c7630 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -26,6 +26,7 @@ import ( "github.com/mattermost/mattermost-server/store/sqlstore" "github.com/mattermost/mattermost-server/store/storetest" "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/web" "github.com/mattermost/mattermost-server/wsapi" s3 "github.com/minio/minio-go" @@ -120,6 +121,7 @@ func setupTestHelper(enterprise bool) *TestHelper { th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = prevListenAddress }) Init(th.App, th.App.Srv.Router, true) + web.NewWeb(th.App, th.App.Srv.Router) wsapi.Init(th.App, th.App.Srv.WebSocketRouter) th.App.Srv.Store.MarkSystemRanUnitTests() th.App.DoAdvancedPermissionsMigration() |