From cebfa38a6414bf360bd99e6a3b7e145f321df742 Mon Sep 17 00:00:00 2001 From: Hanzei <16541325+hanzei@users.noreply.github.com> Date: Tue, 18 Dec 2018 14:06:44 +0100 Subject: [PATCH] Fix shadowed variables in api4 package (#10010) --- api4/channel.go | 3 +-- api4/emoji_test.go | 12 ++++++------ api4/file.go | 2 +- api4/file_test.go | 6 ++---- api4/webhook_test.go | 20 ++++++++------------ 5 files changed, 18 insertions(+), 25 deletions(-) diff --git a/api4/channel.go b/api4/channel.go index 681da31c6f..3dbba93368 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -252,7 +252,7 @@ func patchChannel(c *Context, w http.ResponseWriter, r *http.Request) { case model.CHANNEL_GROUP, model.CHANNEL_DIRECT: // Modifying the header is not linked to any specific permission for group/dm channels, so just check for membership. - if _, err := c.App.GetChannelMember(c.Params.ChannelId, c.App.Session.UserId); err != nil { + if _, err = c.App.GetChannelMember(c.Params.ChannelId, c.App.Session.UserId); err != nil { c.Err = model.NewAppError("patchChannel", "api.channel.patch_update_channel.forbidden.app_error", nil, "", http.StatusForbidden) return } @@ -1041,7 +1041,6 @@ func addChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { return } - var err *model.AppError if ok && len(postRootId) == 26 { rootPost, err := c.App.GetSinglePost(postRootId) if err != nil { diff --git a/api4/emoji_test.go b/api4/emoji_test.go index 64e155b7c2..6f05994a41 100644 --- a/api4/emoji_test.go +++ b/api4/emoji_test.go @@ -208,9 +208,9 @@ func TestGetEmojiList(t *testing.T) { } for idx, emoji := range emojis { - emoji, resp := Client.CreateEmoji(emoji, utils.CreateTestGif(t, 10, 10), "image.gif") + newEmoji, resp := Client.CreateEmoji(emoji, utils.CreateTestGif(t, 10, 10), "image.gif") CheckNoError(t, resp) - emojis[idx] = emoji + emojis[idx] = newEmoji } listEmoji, resp := Client.GetEmojiList(0, 100) @@ -622,9 +622,9 @@ func TestSearchEmoji(t *testing.T) { } for idx, emoji := range emojis { - emoji, resp := Client.CreateEmoji(emoji, utils.CreateTestGif(t, 10, 10), "image.gif") + newEmoji, resp := Client.CreateEmoji(emoji, utils.CreateTestGif(t, 10, 10), "image.gif") CheckNoError(t, resp) - emojis[idx] = emoji + emojis[idx] = newEmoji } search := &model.EmojiSearch{Term: searchTerm1} @@ -700,9 +700,9 @@ func TestAutocompleteEmoji(t *testing.T) { } for idx, emoji := range emojis { - emoji, resp := Client.CreateEmoji(emoji, utils.CreateTestGif(t, 10, 10), "image.gif") + newEmoji, resp := Client.CreateEmoji(emoji, utils.CreateTestGif(t, 10, 10), "image.gif") CheckNoError(t, resp) - emojis[idx] = emoji + emojis[idx] = newEmoji } remojis, resp := Client.AutocompleteEmoji(searchTerm1, "") diff --git a/api4/file.go b/api4/file.go index 5d6065a4de..ddd705d52a 100644 --- a/api4/file.go +++ b/api4/file.go @@ -317,7 +317,7 @@ NEXT_PART: filename := part.FileName() if filename == "" { var b bytes.Buffer - _, err := io.CopyN(&b, part, maxMultipartFormDataBytes) + _, err = io.CopyN(&b, part, maxMultipartFormDataBytes) if err != nil && err != io.EOF { c.Err = model.NewAppError("uploadFileMultipart", "api.file.upload_file.read_form_value.app_error", diff --git a/api4/file_test.go b/api4/file_test.go index 4d2b7915b8..4ec8c5e7cb 100644 --- a/api4/file_test.go +++ b/api4/file_test.go @@ -217,12 +217,10 @@ func testUploadFiles( fileUploadResponse = &model.FileUploadResponse{} } - var f io.ReadCloser - var cl int64 - var err error data := make([]byte, 512) upload := func(i int, f io.ReadCloser) *model.Response { + var cl int64 defer f.Close() if len(contentLengths) > i { @@ -287,7 +285,7 @@ func testUploadFiles( } for i, open := range openers { - f, cl, err = open() + f, _, err := open() if err != nil { return nil, emergencyResponse(err, "upload_post_attachment") } diff --git a/api4/webhook_test.go b/api4/webhook_test.go index 8abb948615..171f66dd1f 100644 --- a/api4/webhook_test.go +++ b/api4/webhook_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/mattermost/mattermost-server/model" ) @@ -525,20 +526,15 @@ func TestUpdateIncomingHook(t *testing.T) { t.Run("RetainCreateAt", func(t *testing.T) { hook2 := &model.IncomingWebhook{ChannelId: th.BasicChannel.Id, CreateAt: 100} - createdHook, resp := th.SystemAdminClient.CreateIncomingWebhook(hook2) + createdHook2, resp := th.SystemAdminClient.CreateIncomingWebhook(hook2) CheckNoError(t, resp) - createdHook.DisplayName = "Name2" + createdHook2.DisplayName = "Name2" - updatedHook, resp := th.SystemAdminClient.UpdateIncomingWebhook(createdHook) + updatedHook, resp := th.SystemAdminClient.UpdateIncomingWebhook(createdHook2) CheckNoError(t, resp) - if updatedHook != nil { - if updatedHook.CreateAt != createdHook.CreateAt { - t.Fatal("failed - hook create at should not be changed") - } - } else { - t.Fatal("should not be nil") - } + require.NotNil(t, updatedHook) + assert.Equal(t, createdHook2.CreateAt, updatedHook.CreateAt) }) t.Run("ModifyUpdateAt", func(t *testing.T) { @@ -691,8 +687,8 @@ func TestUpdateOutgoingHook(t *testing.T) { createdHook := &model.OutgoingWebhook{ChannelId: th.BasicChannel.Id, TeamId: th.BasicChannel.TeamId, CallbackURLs: []string{"http://nowhere.com"}, TriggerWords: []string{"cats"}} - createdHook, resp := th.SystemAdminClient.CreateOutgoingWebhook(createdHook) - CheckNoError(t, resp) + createdHook, webookResp := th.SystemAdminClient.CreateOutgoingWebhook(createdHook) + CheckNoError(t, webookResp) t.Run("UpdateOutgoingWebhook", func(t *testing.T) { createdHook.DisplayName = "Cats"