From 9a4f3ce1e5b22a297eeb00b2aaff44f88304ae8c Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Mon, 8 Oct 2018 16:39:03 +0100 Subject: MM-12251: Add flag to MoveChannel to remove all deactivated users. (#9515) --- app/channel_test.go | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'app/channel_test.go') diff --git a/app/channel_test.go b/app/channel_test.go index 0501b9406..4b09bbb78 100644 --- a/app/channel_test.go +++ b/app/channel_test.go @@ -98,7 +98,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, th.BasicUser, false); err == nil { t.Fatal("Should have failed due to mismatched members.") } @@ -106,7 +106,34 @@ 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, th.BasicUser, false); err != nil { + t.Fatal(err) + } + + // Test moving a channel with a deactivated user who isn't in the destination team. + // It should fail, unless removeDeactivatedMembers is true. + deacivatedUser := th.CreateUser() + channel2 := th.CreateChannel(sourceTeam) + + if _, err := th.App.AddUserToTeam(sourceTeam.Id, deacivatedUser.Id, ""); err != nil { + t.Fatal(err) + } + if _, err := th.App.AddUserToChannel(th.BasicUser, channel2); err != nil { + t.Fatal(err) + } + if _, err := th.App.AddUserToChannel(deacivatedUser, channel2); err != nil { + t.Fatal(err) + } + + if _, err := th.App.UpdateActive(deacivatedUser, false); err != nil { + t.Fatal(err) + } + + if err := th.App.MoveChannel(targetTeam, channel2, th.BasicUser, false); err == nil { + t.Fatal("Should have failed due to mismatched deacivated member.") + } + + if err := th.App.MoveChannel(targetTeam, channel2, th.BasicUser, true); err != nil { t.Fatal(err) } } -- cgit v1.2.3-1-g7c22