From 024bc97a5d0a394010689f56f62b89a2a6256a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 9 Mar 2021 10:05:39 +0100 Subject: [PATCH] Replacing require.nil in cmd/mattermost/commands package (#16964) Co-authored-by: Mattermod --- cmd/mattermost/commands/channel_test.go | 4 +-- cmd/mattermost/commands/config_test.go | 14 ++++----- cmd/mattermost/commands/plugin_test.go | 14 ++++----- cmd/mattermost/commands/roles_test.go | 4 +-- cmd/mattermost/commands/sampledata_test.go | 4 +-- cmd/mattermost/commands/team_test.go | 2 +- cmd/mattermost/commands/user_test.go | 34 +++++++++++----------- cmd/mattermost/commands/webhook_test.go | 2 +- 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/cmd/mattermost/commands/channel_test.go b/cmd/mattermost/commands/channel_test.go index d6f77dd0bc..ada00f5c89 100644 --- a/cmd/mattermost/commands/channel_test.go +++ b/cmd/mattermost/commands/channel_test.go @@ -320,7 +320,7 @@ func TestModifyChannel(t *testing.T) { th.CheckCommand(t, "channel", "modify", "--public", th.BasicTeam.Name+":"+channel1.Name, "--username", th.BasicUser2.Email) res, err := th.App.Srv().Store.Channel().Get(channel1.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, model.CHANNEL_OPEN, res.Type) // should fail because user doesn't exist @@ -331,7 +331,7 @@ func TestModifyChannel(t *testing.T) { th.CheckCommand(t, "channel", "modify", "--private", th.BasicTeam.Name+":"+pchannel1.Name, "--username", th.BasicUser2.Email) res, err = th.App.Srv().Store.Channel().Get(pchannel1.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, model.CHANNEL_PRIVATE, res.Type) // should fail because user doesn't exist diff --git a/cmd/mattermost/commands/config_test.go b/cmd/mattermost/commands/config_test.go index 11c5b88bea..0e8e8677ef 100644 --- a/cmd/mattermost/commands/config_test.go +++ b/cmd/mattermost/commands/config_test.go @@ -418,7 +418,7 @@ func TestConfigShow(t *testing.T) { t.Run("successfully dumping config as json", func(t *testing.T) { output, err := th.RunCommandWithOutput(t, "config", "show", "--json") - require.Nil(t, err) + require.NoError(t, err) // Filter out the test headers var filteredOutput []string @@ -434,7 +434,7 @@ func TestConfigShow(t *testing.T) { var config model.Config err = json.Unmarshal([]byte(output), &config) - require.Nil(t, err) + require.NoError(t, err) }) } @@ -525,7 +525,7 @@ func TestUpdateMap(t *testing.T) { t.Run(test.Name, func(t *testing.T) { err := UpdateMap(configMap, test.configSettings, test.newVal) - require.Nil(t, err, "Wasn't expecting an error") + require.NoError(t, err, "Wasn't expecting an error") if !contains(configMap, test.expected, test.configSettings) { t.Error("update didn't happen") @@ -635,18 +635,18 @@ func TestPluginConfigs(t *testing.T) { configMap := configToMap(pluginConfig) err := UpdateMap(configMap, []string{"Enable"}, []string{"false"}) - require.Nil(t, err, "Wasn't expecting an error") + require.NoError(t, err, "Wasn't expecting an error") assert.Equal(t, false, configMap["Enable"].(bool)) err = UpdateMap(configMap, []string{"Plugins", "antivirus", "clamavhostport"}, []string{"some text"}) - require.Nil(t, err, "Wasn't expecting an error") + require.NoError(t, err, "Wasn't expecting an error") assert.Equal(t, "some text", configMap["Plugins"].(map[string]map[string]interface{})["antivirus"]["clamavhostport"].(string)) err = UpdateMap(configMap, []string{"Plugins", "mattermost-autolink", "enableadmincommand"}, []string{"true"}) - require.Nil(t, err, "Wasn't expecting an error") + require.NoError(t, err, "Wasn't expecting an error") assert.Equal(t, true, configMap["Plugins"].(map[string]map[string]interface{})["mattermost-autolink"]["enableadmincommand"].(bool)) err = UpdateMap(configMap, []string{"PluginStates", "antivirus", "Enable"}, []string{"true"}) - require.Nil(t, err, "Wasn't expecting an error") + require.NoError(t, err, "Wasn't expecting an error") assert.Equal(t, true, configMap["PluginStates"].(map[string]*model.PluginState)["antivirus"].Enable) } diff --git a/cmd/mattermost/commands/plugin_test.go b/cmd/mattermost/commands/plugin_test.go index 491dc66a8b..4e2248e3df 100644 --- a/cmd/mattermost/commands/plugin_test.go +++ b/cmd/mattermost/commands/plugin_test.go @@ -25,9 +25,9 @@ func TestPlugin(t *testing.T) { th.SetConfig(cfg) err := os.MkdirAll("./test-plugins", os.ModePerm) - require.Nil(t, err) + require.NoError(t, err) err = os.MkdirAll("./test-client-plugins", os.ModePerm) - require.Nil(t, err) + require.NoError(t, err) path, _ := fileutils.FindDir("tests") @@ -37,9 +37,9 @@ func TestPlugin(t *testing.T) { assert.Contains(t, output, "Enabled plugin: testplugin") fs, err := config.NewFileStore(th.ConfigPath(), false) - require.Nil(t, err) + require.NoError(t, err) cfsStore, err := config.NewStoreFromBacking(fs, nil, false) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, cfsStore.Get().PluginSettings.PluginStates["testplugin"]) assert.True(t, cfsStore.Get().PluginSettings.PluginStates["testplugin"].Enable) cfsStore.Close() @@ -47,9 +47,9 @@ func TestPlugin(t *testing.T) { output = th.CheckCommand(t, "plugin", "disable", "testplugin") assert.Contains(t, output, "Disabled plugin: testplugin") fs, err = config.NewFileStore(th.ConfigPath(), false) - require.Nil(t, err) + require.NoError(t, err) cfsStore, err = config.NewStoreFromBacking(fs, nil, false) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, cfsStore.Get().PluginSettings.PluginStates["testplugin"]) assert.False(t, cfsStore.Get().PluginSettings.PluginStates["testplugin"].Enable) cfsStore.Close() @@ -96,7 +96,7 @@ func TestAddPluginPublicKeys(t *testing.T) { th.SetConfig(cfg) err := th.RunCommand(t, "plugin", "keys", "add", "pk1") - assert.NotNil(t, err) + assert.Error(t, err) } func TestDeletePluginPublicKeys(t *testing.T) { diff --git a/cmd/mattermost/commands/roles_test.go b/cmd/mattermost/commands/roles_test.go index 928704d666..ed36228e5f 100644 --- a/cmd/mattermost/commands/roles_test.go +++ b/cmd/mattermost/commands/roles_test.go @@ -17,13 +17,13 @@ func TestAssignRole(t *testing.T) { th.CheckCommand(t, "roles", "system_admin", th.BasicUser.Email) user, err := th.App.Srv().Store.User().GetByEmail(th.BasicUser.Email) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, "system_user system_admin", user.Roles) th.CheckCommand(t, "roles", "member", th.BasicUser.Email) user, err = th.App.Srv().Store.User().GetByEmail(th.BasicUser.Email) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, "system_user", user.Roles) } diff --git a/cmd/mattermost/commands/sampledata_test.go b/cmd/mattermost/commands/sampledata_test.go index fd2262a8b7..921ffa7be3 100644 --- a/cmd/mattermost/commands/sampledata_test.go +++ b/cmd/mattermost/commands/sampledata_test.go @@ -33,7 +33,7 @@ func TestSampledataBadParameters(t *testing.T) { t.Run("should not fail with less than 6 users and no group channels", func(t *testing.T) { f, err := ioutil.TempFile("", "*") - require.Nil(t, err) + require.NoError(t, err) f.Close() defer os.Remove(f.Name()) require.NoError(t, th.RunCommand(t, "sampledata", "--group-channels", "0", "--users", "5", "--bulk", f.Name())) @@ -41,7 +41,7 @@ func TestSampledataBadParameters(t *testing.T) { t.Run("should not fail with less than 6 users and no group channels", func(t *testing.T) { f, err := ioutil.TempFile("", "*") - require.Nil(t, err) + require.NoError(t, err) f.Close() defer os.Remove(f.Name()) require.NoError(t, th.RunCommand(t, "sampledata", "--group-channels", "0", "--users", "5", "--bulk", f.Name())) diff --git a/cmd/mattermost/commands/team_test.go b/cmd/mattermost/commands/team_test.go index 799cfc5c8f..2729b16ad9 100644 --- a/cmd/mattermost/commands/team_test.go +++ b/cmd/mattermost/commands/team_test.go @@ -67,7 +67,7 @@ func TestLeaveTeam(t *testing.T) { require.False(t, found, "profile should not be on team") teams, err := th.App.Srv().Store.Team().GetTeamsByUserId(th.BasicUser.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 0, len(teams), "Shouldn't be in team") } diff --git a/cmd/mattermost/commands/user_test.go b/cmd/mattermost/commands/user_test.go index a1c31d63d0..ab15603648 100644 --- a/cmd/mattermost/commands/user_test.go +++ b/cmd/mattermost/commands/user_test.go @@ -49,7 +49,7 @@ func TestCreateUserWithoutTeam(t *testing.T) { th.CheckCommand(t, "user", "create", "--email", email, "--password", "mypassword1", "--username", username) user, err := th.App.Srv().Store.User().GetByEmail(email) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, email, user.Email) } @@ -84,10 +84,10 @@ func TestChangeUserEmail(t *testing.T) { th.CheckCommand(t, "user", "email", th.BasicUser.Username, newEmail) _, err := th.App.Srv().Store.User().GetByEmail(th.BasicUser.Email) - require.NotNil(t, err, "should've updated to the new email") + require.Error(t, err, "should've updated to the new email") user, err := th.App.Srv().Store.User().GetByEmail(newEmail) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, user.Email, newEmail, "should've updated to the new email") @@ -126,10 +126,10 @@ func TestDeleteUserBotUser(t *testing.T) { OwnerId: model.NewId(), } user, err := th.App.Srv().Store.User().Save(model.UserFromBot(bot)) - require.Nil(t, err) + require.NoError(t, err) bot.UserId = user.Id bot, nErr := th.App.Srv().Store.Bot().Save(bot) - require.Nil(t, nErr) + require.NoError(t, nErr) th.CheckCommand(t, "user", "delete", bot.Username, "--confirm") _, err = th.App.Srv().Store.User().Get(context.Background(), user.Id) @@ -144,45 +144,45 @@ func TestConvertUser(t *testing.T) { t.Run("Invalid command line input", func(t *testing.T) { err := th.RunCommand(t, "user", "convert", th.BasicUser.Username) - require.NotNil(t, err) + require.Error(t, err) err = th.RunCommand(t, "user", "convert", th.BasicUser.Username, "--user", "--bot") - require.NotNil(t, err) + require.Error(t, err) err = th.RunCommand(t, "user", "convert", "--bot") - require.NotNil(t, err) + require.Error(t, err) }) t.Run("Convert to bot from username", func(t *testing.T) { th.CheckCommand(t, "user", "convert", th.BasicUser.Username, "anotherinvaliduser", "--bot") _, err := th.App.Srv().Store.Bot().Get(th.BasicUser.Id, false) - require.Nil(t, err) + require.NoError(t, err) }) t.Run("Unable to convert to user with missing password", func(t *testing.T) { err := th.RunCommand(t, "user", "convert", th.BasicUser.Username, "--user") - require.NotNil(t, err) + require.Error(t, err) }) t.Run("Unable to convert to user with invalid email", func(t *testing.T) { err := th.RunCommand(t, "user", "convert", th.BasicUser.Username, "--user", "--password", "password", "--email", "invalidEmail") - require.NotNil(t, err) + require.Error(t, err) }) t.Run("Convert to user with minimum flags", func(t *testing.T) { err := th.RunCommand(t, "user", "convert", th.BasicUser.Username, "--user", "--password", "password") - require.Nil(t, err) + require.NoError(t, err) _, err = th.App.Srv().Store.Bot().Get(th.BasicUser.Id, false) - require.NotNil(t, err) + require.Error(t, err) }) t.Run("Convert to bot from email", func(t *testing.T) { th.CheckCommand(t, "user", "convert", th.BasicUser2.Email, "--bot") _, err := th.App.Srv().Store.Bot().Get(th.BasicUser2.Id, false) - require.Nil(t, err) + require.NoError(t, err) }) t.Run("Convert to user with all flags", func(t *testing.T) { @@ -195,13 +195,13 @@ func TestConvertUser(t *testing.T) { "--lastname", "newLastName", "--locale", "en_CA", "--system_admin") - require.Nil(t, err) + require.NoError(t, err) _, err = th.App.Srv().Store.Bot().Get(th.BasicUser2.Id, false) - require.NotNil(t, err) + require.Error(t, err) user, appErr := th.App.Srv().Store.User().Get(context.Background(), th.BasicUser2.Id) - require.Nil(t, appErr) + require.NoError(t, appErr) require.Equal(t, "newusername", user.Username) require.Equal(t, "valid@email.com", user.Email) require.Equal(t, "newNickname", user.Nickname) diff --git a/cmd/mattermost/commands/webhook_test.go b/cmd/mattermost/commands/webhook_test.go index dc853500d8..0c56e6302f 100644 --- a/cmd/mattermost/commands/webhook_test.go +++ b/cmd/mattermost/commands/webhook_test.go @@ -505,7 +505,7 @@ func TestMoveOutgoingWebhook(t *testing.T) { th.CheckCommand(t, "webhook", "move-outgoing", newTeam.Id, th.BasicTeam.Id+":"+oldHook.Id, "--channel", channel.Name) _, webhookErr := th.App.GetOutgoingWebhook(oldHook.Id) - assert.Error(t, webhookErr) + assert.NotNil(t, webhookErr) output := th.CheckCommand(t, "webhook", "list", newTeam.Name) assert.True(t, strings.Contains(output, displayName))