Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

1 files changed, 40 insertions, 0 deletions

diff --git a/api4/channel_test.go b/api4/channel_test.go
index 0603afe74..c3d8c8039 100644
--- a/api4/channel_test.go
+++ b/api4/channel_test.go
@@ -897,6 +897,46 @@ func TestDeleteChannel(t *testing.T) {
 	CheckForbiddenStatus(t, resp)
 }
 
+func TestConvertChannelToPrivate(t *testing.T) {
+	th := Setup().InitBasic().InitSystemAdmin()
+	defer th.TearDown()
+	Client := th.Client
+
+	defaultChannel, _ := th.App.GetChannelByName(model.DEFAULT_CHANNEL, th.BasicTeam.Id)
+	_, resp := Client.ConvertChannelToPrivate(defaultChannel.Id)
+	CheckForbiddenStatus(t, resp)
+
+	privateChannel := th.CreatePrivateChannel()
+	_, resp = Client.ConvertChannelToPrivate(privateChannel.Id)
+	CheckForbiddenStatus(t, resp)
+
+	publicChannel := th.CreatePublicChannel()
+	_, resp = Client.ConvertChannelToPrivate(publicChannel.Id)
+	CheckForbiddenStatus(t, resp)
+
+	th.LoginTeamAdmin()
+	_, resp = Client.ConvertChannelToPrivate(publicChannel.Id)
+	CheckForbiddenStatus(t, resp)
+
+	rchannel, resp := th.SystemAdminClient.ConvertChannelToPrivate(privateChannel.Id)
+	CheckBadRequestStatus(t, resp)
+	if rchannel != nil {
+		t.Fatal("should not return a channel")
+	}
+
+	rchannel, resp = th.SystemAdminClient.ConvertChannelToPrivate(defaultChannel.Id)
+	CheckBadRequestStatus(t, resp)
+	if rchannel != nil {
+		t.Fatal("should not return a channel")
+	}
+
+	rchannel, resp = th.SystemAdminClient.ConvertChannelToPrivate(publicChannel.Id)
+	CheckOKStatus(t, resp)
+	if rchannel.Type != model.CHANNEL_PRIVATE {
+		t.Fatal("channel should be converted from public to private")
+	}
+}
+
 func TestRestoreChannel(t *testing.T) {
 	th := Setup().InitBasic().InitSystemAdmin()
 	defer th.TearDown()