diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-03-28 04:58:19 -0400 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-03-28 09:58:19 +0100 |
commit | daca0d93f621bcb1daae149c178af0631bcd120a (patch) | |
tree | 6127936c76dbc6fd20a7377385469980e5bd72e3 /api4/apitestlib.go | |
parent | ca8b8d1245026672b1a56d256bb8ff3c8bb1bba9 (diff) | |
download | chat-daca0d93f621bcb1daae149c178af0631bcd120a.tar.gz chat-daca0d93f621bcb1daae149c178af0631bcd120a.tar.bz2 chat-daca0d93f621bcb1daae149c178af0631bcd120a.zip |
Move WebSocket API to it's own package and add websocket v4 endpoint (#5881)
Diffstat (limited to 'api4/apitestlib.go')
-rw-r--r-- | api4/apitestlib.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index c6c1dfa94..87a3976f5 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -20,6 +20,7 @@ import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/store" "github.com/mattermost/platform/utils" + "github.com/mattermost/platform/wsapi" s3 "github.com/minio/minio-go" ) @@ -55,9 +56,11 @@ func SetupEnterprise() *TestHelper { app.NewServer() app.InitStores() InitRouter() + wsapi.InitRouter() app.StartServer() utils.InitHTML() InitApi(true) + wsapi.InitApi() utils.EnableDebugLogForTest() app.Srv.Store.MarkSystemRanUnitTests() @@ -85,8 +88,10 @@ func Setup() *TestHelper { app.NewServer() app.InitStores() InitRouter() + wsapi.InitRouter() app.StartServer() InitApi(true) + wsapi.InitApi() utils.EnableDebugLogForTest() app.Srv.Store.MarkSystemRanUnitTests() @@ -167,6 +172,10 @@ func (me *TestHelper) CreateClient() *model.Client4 { return model.NewAPIv4Client("http://localhost" + utils.Cfg.ServiceSettings.ListenAddress) } +func (me *TestHelper) CreateWebSocketClient() (*model.WebSocketClient, *model.AppError) { + return model.NewWebSocketClient4("ws://localhost"+utils.Cfg.ServiceSettings.ListenAddress, me.Client.AuthToken) +} + func (me *TestHelper) CreateUser() *model.User { return me.CreateUserWithClient(me.Client) } |