diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-01-13 13:53:37 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-13 13:53:37 -0500 |
commit | 97558f6a6ec4c53fa69035fb430ead209d9c222d (patch) | |
tree | 6fc57f5b75b15a025348c6e295cea6aedb9e69ae /api/websocket_test.go | |
parent | 07bad4d6d518a9012a20fec8309cd625f57c7a8c (diff) | |
download | chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.gz chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.bz2 chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.zip |
PLT-4938 Add app package and move logic over from api package (#4931)
* Add app package and move logic over from api package
* Change app package functions to return errors
* Move non-api tests into app package
* Fix merge
Diffstat (limited to 'api/websocket_test.go')
-rw-r--r-- | api/websocket_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/api/websocket_test.go b/api/websocket_test.go index d7dbf1561..39a55f8f4 100644 --- a/api/websocket_test.go +++ b/api/websocket_test.go @@ -10,6 +10,7 @@ import ( "time" //"github.com/gorilla/websocket" + "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" ) @@ -192,7 +193,7 @@ func TestWebSocketEvent(t *testing.T) { omitUser["somerandomid"] = true evt1 := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_TYPING, "", th.BasicChannel.Id, "", omitUser) evt1.Add("user_id", "somerandomid") - Publish(evt1) + app.Publish(evt1) time.Sleep(300 * time.Millisecond) @@ -221,7 +222,7 @@ func TestWebSocketEvent(t *testing.T) { } evt2 := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_TYPING, "", "somerandomid", "", nil) - go Publish(evt2) + go app.Publish(evt2) time.Sleep(300 * time.Millisecond) eventHit = false |