From 2945e8a2b0ce9306bb049e65eb2410038e0fa18c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 2 Oct 2018 19:33:52 +0200 Subject: MM-10699: Disallow renaming direct and group message channels (#9518) * MM-10699: Disallow renaming direct and group message channels * Replacing errors.New with errors.Wrapf --- app/channel_test.go | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) (limited to 'app/channel_test.go') diff --git a/app/channel_test.go b/app/channel_test.go index 4dc8dce37..0501b9406 100644 --- a/app/channel_test.go +++ b/app/channel_test.go @@ -640,12 +640,45 @@ func TestRenameChannel(t *testing.T) { th := Setup().InitBasic() defer th.TearDown() - channel := th.createChannel(th.BasicTeam, model.CHANNEL_OPEN) - - channel, err := th.App.RenameChannel(channel, "newchannelname", "New Display Name") - if err != nil { - t.Fatal("Failed to update channel name. Error: " + err.Error()) + testCases := []struct { + Name string + Channel *model.Channel + ExpectError bool + ExpectedName string + ExpectedDisplayName string + }{ + { + "Rename open channel", + th.createChannel(th.BasicTeam, model.CHANNEL_OPEN), + false, + "newchannelname", + "New Display Name", + }, + { + "Fail on rename direct message channel", + th.CreateDmChannel(th.BasicUser2), + true, + "", + "", + }, + { + "Fail on rename direct message channel", + th.CreateGroupChannel(th.BasicUser2, th.CreateUser()), + true, + "", + "", + }, + } + + for _, tc := range testCases { + t.Run(tc.Name, func(t *testing.T) { + channel, err := th.App.RenameChannel(tc.Channel, "newchannelname", "New Display Name") + if tc.ExpectError { + assert.NotNil(t, err) + } else { + assert.Equal(t, tc.ExpectedName, channel.Name) + assert.Equal(t, tc.ExpectedDisplayName, channel.DisplayName) + } + }) } - assert.Equal(t, "newchannelname", channel.Name) - assert.Equal(t, "New Display Name", channel.DisplayName) } -- cgit v1.2.3-1-g7c22