summaryrefslogtreecommitdiffstats
path: root/api/web_socket_test.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-10-08 09:51:04 -0700
committerCorey Hulen <corey@hulen.com>2015-10-08 09:51:04 -0700
commite36227405b4bc44fe3cea52f2082c723a91366ea (patch)
tree78f585a8ae7d0da8afc4a5ca03d00302df99c34f /api/web_socket_test.go
parent26252ccebf23d8e0ce6cd0f6b79b268e5c3b90fd (diff)
parent70144962522a5d8db1c46cbd93d83e64b8ca778b (diff)
downloadchat-e36227405b4bc44fe3cea52f2082c723a91366ea.tar.gz
chat-e36227405b4bc44fe3cea52f2082c723a91366ea.tar.bz2
chat-e36227405b4bc44fe3cea52f2082c723a91366ea.zip
Merge pull request #978 from mattermost/plt-355
PLT-355 Fixing ability to dynamicly update members list.
Diffstat (limited to 'api/web_socket_test.go')
-rw-r--r--api/web_socket_test.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/api/web_socket_test.go b/api/web_socket_test.go
index 49a4c6870..7523d0e77 100644
--- a/api/web_socket_test.go
+++ b/api/web_socket_test.go
@@ -55,12 +55,17 @@ func TestSocket(t *testing.T) {
time.Sleep(300 * time.Millisecond)
Client.Must(Client.JoinChannel(channel1.Id))
- // Read the join channel message that gets generated
+ // Read the user_added message that gets generated
var rmsg model.Message
if err := c2.ReadJSON(&rmsg); err != nil {
t.Fatal(err)
}
+ // Read the second user_added message that gets generated
+ if err := c2.ReadJSON(&rmsg); err != nil {
+ t.Fatal(err)
+ }
+
// Test sending message without a channelId
m := model.NewMessage("", "", "", model.ACTION_TYPING)
m.Add("RootId", model.NewId())