summaryrefslogtreecommitdiffstats
path: root/api/channel_test.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-04-28 10:56:19 -0400
committerChristopher Speller <crspeller@gmail.com>2016-04-28 10:56:19 -0400
commit383cddd3d14107fabea28e09f5f9401623cd19d5 (patch)
treef0aedc438756bf41aa29aa5f3518e83f40e95da1 /api/channel_test.go
parent3dbb5ab4cca74de7d7a00909927e1f034949052d (diff)
downloadchat-383cddd3d14107fabea28e09f5f9401623cd19d5.tar.gz
chat-383cddd3d14107fabea28e09f5f9401623cd19d5.tar.bz2
chat-383cddd3d14107fabea28e09f5f9401623cd19d5.zip
Don't return error if already part of channel being joined (#2814)
Diffstat (limited to 'api/channel_test.go')
-rw-r--r--api/channel_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/channel_test.go b/api/channel_test.go
index 8ac785f77..a70e5532a 100644
--- a/api/channel_test.go
+++ b/api/channel_test.go
@@ -691,8 +691,8 @@ func TestAddChannelMember(t *testing.T) {
t.Fatal("Should have errored, bad user id")
}
- if _, err := Client.AddChannelMember(channel1.Id, user2.Id); err == nil {
- t.Fatal("Should have errored, user already a member")
+ if _, err := Client.AddChannelMember(channel1.Id, user2.Id); err != nil {
+ t.Fatal(err)
}
if _, err := Client.AddChannelMember("sgdsgsdg", user2.Id); err == nil {