From b54d1342990253d3fe4a00c64df27cdd1bb0719b Mon Sep 17 00:00:00 2001 From: David Meza Date: Thu, 3 Aug 2017 07:59:42 -0500 Subject: PLT-6484 Add /leave command to leave a channel (#6402) * PLT-6484 Add /leave command to leave a channel * Text changes requeted on review. * PLT-6484 Display the right error message when trying to /leave town-square * PLT-6484 Be able to execute /leave command in direct and group message channels with the same effect as clicking x * PLT-6484 Refactor to create new leave_private_channel_modal.jsx * PLT-6484 Remove previous leave private channel logic to use new leave_private_channel_modal.jsx * Remove dot in command description. Change localized error when leaving Town square. * disable /leave command in reply threads on the right-hand sidebar, since it is not obvious which channel you should leave --- api/command_leave_test.go | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 api/command_leave_test.go (limited to 'api') diff --git a/api/command_leave_test.go b/api/command_leave_test.go new file mode 100644 index 000000000..ae098b8a2 --- /dev/null +++ b/api/command_leave_test.go @@ -0,0 +1,66 @@ +// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package api + +import ( + "strings" + "testing" + + "github.com/mattermost/platform/model" +) + +func TestLeaveCommands(t *testing.T) { + th := Setup().InitBasic() + Client := th.BasicClient + team := th.BasicTeam + user2 := th.BasicUser2 + + channel1 := &model.Channel{DisplayName: "AA", Name: "aa" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id} + channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel) + Client.Must(Client.JoinChannel(channel1.Id)) + + channel2 := &model.Channel{DisplayName: "BB", Name: "bb" + model.NewId() + "a", Type: model.CHANNEL_PRIVATE, TeamId: team.Id} + channel2 = Client.Must(Client.CreateChannel(channel2)).Data.(*model.Channel) + Client.Must(Client.JoinChannel(channel2.Id)) + Client.Must(Client.AddChannelMember(channel2.Id, user2.Id)) + + channel3 := Client.Must(Client.CreateDirectChannel(user2.Id)).Data.(*model.Channel) + + rs1 := Client.Must(Client.Command(channel1.Id, "/leave")).Data.(*model.CommandResponse) + if !strings.HasSuffix(rs1.GotoLocation, "/"+team.Name+"/channels/"+model.DEFAULT_CHANNEL) { + t.Fatal("failed to leave open channel 1") + } + + rs2 := Client.Must(Client.Command(channel2.Id, "/leave")).Data.(*model.CommandResponse) + if !strings.HasSuffix(rs2.GotoLocation, "/"+team.Name+"/channels/"+model.DEFAULT_CHANNEL) { + t.Fatal("failed to leave private channel 1") + } + + rs3 := Client.Must(Client.Command(channel3.Id, "/leave")).Data.(*model.CommandResponse) + if strings.HasSuffix(rs3.GotoLocation, "/"+team.Name+"/channels/"+model.DEFAULT_CHANNEL) { + t.Fatal("should not have left direct message channel") + } + + cdata := Client.Must(Client.GetChannels("")).Data.(*model.ChannelList) + + found := false + for _, c := range *cdata { + if c.Id == channel1.Id || c.Id == channel2.Id { + found = true + } + } + + if found { + t.Fatal("did not leave right channels") + } + + for _, c := range *cdata { + if c.Name == model.DEFAULT_CHANNEL { + if _, err := Client.LeaveChannel(c.Id); err == nil { + t.Fatal("should have errored on leaving default channel") + } + break + } + } +} -- cgit v1.2.3-1-g7c22