summaryrefslogtreecommitdiffstats
path: root/api/channel_test.go
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-04-28 17:03:59 -0700
committer=Corey Hulen <corey@hulen.com>2016-04-28 17:03:59 -0700
commit62901defaebb8f3524bdfcad86b2576cfd9fe587 (patch)
treeb0740451c56c68c5284834fd02bbce4d831acc17 /api/channel_test.go
parentad9dfc9c42b6597515d9eb0a96e9f069372dffdd (diff)
parentf3fa435a1b35c2ada4cd9a81744a41904fe97909 (diff)
downloadchat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.gz
chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.bz2
chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.zip
Merge branch 'master' of https://github.com/mattermost/platform
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 {