diff options
| author | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
| commit | 7f266c19511171f509ae8a60170de10c8d10b41e (patch) | |
| tree | 04cd68ac4722313abec3ea47cc7cda229e463b1d /api4/channel_test.go | |
| parent | bfae88e60c7a623afae82e06ce1421ca778c06e7 (diff) | |
| parent | 8568afe5b4fb4d26b14fbc0d21f088eaa490b314 (diff) | |
| download | chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.gz chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.bz2 chat-7f266c19511171f509ae8a60170de10c8d10b41e.zip | |
Merge branch 'release-3.7' into master.
Diffstat (limited to 'api4/channel_test.go')
| -rw-r--r-- | api4/channel_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api4/channel_test.go b/api4/channel_test.go index bf7218f0b..6d5b5cef3 100644 --- a/api4/channel_test.go +++ b/api4/channel_test.go @@ -426,7 +426,7 @@ func TestDeleteChannel(t *testing.T) { if ch, err := app.GetChannel(publicChannel1.Id); err == nil && ch.DeleteAt == 0 { t.Fatal("should have failed to get deleted channel") - } else if err := app.JoinChannel(ch, user2.Id); err == nil { + } else if err := app.JoinChannel(ch, user2.Id, ""); err == nil { t.Fatal("should have failed to join deleted channel") } |