From 8c94f489916e874f5986b170367bf70000f9502b Mon Sep 17 00:00:00 2001 From: Michael Kochell Date: Thu, 17 Oct 2019 10:39:27 -0600 Subject: [PATCH] =?UTF-8?q?[MM-18831]=20Trim=20whitespace=20of=20Display?= =?UTF-8?q?=20Name=20when=20channel=20is=20cre=E2=80=A6=20(#12380)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/channel.go | 2 ++ app/channel_test.go | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/app/channel.go b/app/channel.go index 7ec1b5f61f..7021cd4192 100644 --- a/app/channel.go +++ b/app/channel.go @@ -223,6 +223,8 @@ func (a *App) RenameChannel(channel *model.Channel, newChannelName string, newDi } func (a *App) CreateChannel(channel *model.Channel, addMember bool) (*model.Channel, *model.AppError) { + channel.DisplayName = strings.TrimSpace(channel.DisplayName) + sc, err := a.Srv.Store.Channel().Save(channel, *a.Config().TeamSettings.MaxChannelsPerTeam) if err != nil { return nil, err diff --git a/app/channel_test.go b/app/channel_test.go index 7c6d836f48..1a9f689e77 100644 --- a/app/channel_test.go +++ b/app/channel_test.go @@ -254,6 +254,14 @@ func TestCreateChannelPrivateCreatesChannelMemberHistoryRecord(t *testing.T) { assert.Equal(t, th.BasicUser.Id, histories[0].UserId) assert.Equal(t, privateChannel.Id, histories[0].ChannelId) } +func TestCreateChannelDisplayNameTrimsWhitespace(t *testing.T) { + th := Setup(t).InitBasic() + defer th.TearDown() + + channel, err := th.App.CreateChannel(&model.Channel{DisplayName: " Public 1 ", Name: "public1", Type: model.CHANNEL_OPEN, TeamId: th.BasicTeam.Id}, false) + require.Nil(t, err) + require.Equal(t, channel.DisplayName, "Public 1") +} func TestUpdateChannelPrivacy(t *testing.T) { th := Setup(t).InitBasic()