From 30fd4a2951906a59137312d6d1dea2e54fe9c8e9 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Sat, 5 May 2018 02:16:00 +0800 Subject: update permission of converting a channel from public to private to allow team admin (#8723) --- api4/channel_test.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'api4/channel_test.go') diff --git a/api4/channel_test.go b/api4/channel_test.go index 767fdbdb8..b428a382a 100644 --- a/api4/channel_test.go +++ b/api4/channel_test.go @@ -915,10 +915,13 @@ func TestConvertChannelToPrivate(t *testing.T) { CheckForbiddenStatus(t, resp) th.LoginTeamAdmin() - _, resp = Client.ConvertChannelToPrivate(publicChannel.Id) - CheckForbiddenStatus(t, resp) + rchannel, resp := Client.ConvertChannelToPrivate(publicChannel.Id) + CheckOKStatus(t, resp) + if rchannel.Type != model.CHANNEL_PRIVATE { + t.Fatal("channel should be converted from public to private") + } - rchannel, resp := th.SystemAdminClient.ConvertChannelToPrivate(privateChannel.Id) + rchannel, resp = th.SystemAdminClient.ConvertChannelToPrivate(privateChannel.Id) CheckBadRequestStatus(t, resp) if rchannel != nil { t.Fatal("should not return a channel") @@ -930,7 +933,8 @@ func TestConvertChannelToPrivate(t *testing.T) { t.Fatal("should not return a channel") } - rchannel, resp = th.SystemAdminClient.ConvertChannelToPrivate(publicChannel.Id) + publicChannel2 := th.CreatePublicChannel() + rchannel, resp = th.SystemAdminClient.ConvertChannelToPrivate(publicChannel2.Id) CheckOKStatus(t, resp) if rchannel.Type != model.CHANNEL_PRIVATE { t.Fatal("channel should be converted from public to private") -- cgit v1.2.3-1-g7c22