diff options
| author | Jonathan Fritz <jonathan.fritz@mattermost.com> | 2018-02-13 08:39:56 -0500 |
|---|---|---|
| committer | Jonathan Fritz <jonathan.fritz@mattermost.com> | 2018-02-13 08:39:56 -0500 |
| commit | 18fa32567b56584c6e24da2ae68814d5bf8ece6f (patch) | |
| tree | 311ab6a3918ba64ac665286f15950b32dc1b1dba /app/channel_test.go | |
| parent | 7b2861de3a09cf00d00b0872cc537d54302c4bfa (diff) | |
| parent | 8b79f5d49cb8d4877e136a76e515edef41ef6f28 (diff) | |
| download | chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.tar.gz chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.tar.bz2 chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.zip | |
Merge branch 'release-4.7' into XYZ-110
Diffstat (limited to 'app/channel_test.go')
| -rw-r--r-- | app/channel_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/channel_test.go b/app/channel_test.go index e4a0e4320..d83590a27 100644 --- a/app/channel_test.go +++ b/app/channel_test.go @@ -97,7 +97,7 @@ func TestMoveChannel(t *testing.T) { t.Fatal(err) } - if err := th.App.MoveChannel(targetTeam, channel1, th.BasicUser); err == nil { + if err := th.App.MoveChannel(targetTeam, channel1); err == nil { t.Fatal("Should have failed due to mismatched members.") } @@ -105,7 +105,7 @@ func TestMoveChannel(t *testing.T) { t.Fatal(err) } - if err := th.App.MoveChannel(targetTeam, channel1, th.BasicUser); err != nil { + if err := th.App.MoveChannel(targetTeam, channel1); err != nil { t.Fatal(err) } } |