migrate t.Fatal to require.Fail (#12530)

* migrate t.Fatal to require.Fail

* remove nested if/else logic in tests, use bool

* correct bool eval on plugin tests

config/unmarshal_test.go

@@ -161,19 +161,17 @@ func TestConfigFromEnviroVars(t *testing.T) {
 		assert.Equal(t, "From Environment", *cfg.TeamSettings.SiteName)
 		assert.Equal(t, "Custom Brand", *cfg.TeamSettings.CustomBrandText)
 
-		if teamSettings, ok := envCfg["TeamSettings"]; !ok {
+		teamSettings, ok := envCfg["TeamSettings"]
-			t.Fatal("TeamSettings is missing from envConfig")
+		require.True(t, ok, "TeamSettings is missing from envConfig")
-		} else if teamSettingsAsMap, ok := teamSettings.(map[string]interface{}); !ok {
-			t.Fatal("TeamSettings is not a map in envConfig")
-		} else {
-			if siteNameInEnv, ok := teamSettingsAsMap["SiteName"].(bool); !ok || !siteNameInEnv {
-				t.Fatal("SiteName should be in envConfig")
-			}
 
-			if customBrandTextInEnv, ok := teamSettingsAsMap["CustomBrandText"].(bool); !ok || !customBrandTextInEnv {
+		teamSettingsAsMap, ok := teamSettings.(map[string]interface{})
-				t.Fatal("SiteName should be in envConfig")
+		require.True(t, ok, "TeamSettings is not a map in envConfig")
-			}
+
-		}
+		siteNameInEnv, ok := teamSettingsAsMap["SiteName"].(bool)
+		require.True(t, ok || siteNameInEnv, "SiteName should be in envConfig")
+
+		customBrandTextInEnv, ok := teamSettingsAsMap["CustomBrandText"].(bool)
+		require.True(t, ok || customBrandTextInEnv, "SiteName should be in envConfig")
 
 		os.Unsetenv("MM_TEAMSETTINGS_SITENAME")
 		os.Unsetenv("MM_TEAMSETTINGS_CUSTOMBRANDTEXT")
@@ -183,9 +181,8 @@ func TestConfigFromEnviroVars(t *testing.T) {
 
 		assert.Equal(t, "Mattermost", *cfg.TeamSettings.SiteName)
 
-		if _, ok := envCfg["TeamSettings"]; ok {
+		_, ok = envCfg["TeamSettings"]
-			t.Fatal("TeamSettings should be missing from envConfig")
+		require.False(t, ok, "TeamSettings should be missing from envConfig")
-		}
 	})
 
 	t.Run("boolean setting", func(t *testing.T) {
@@ -195,19 +192,16 @@ func TestConfigFromEnviroVars(t *testing.T) {
 		cfg, envCfg, err := unmarshalConfig(strings.NewReader(config), true)
 		require.Nil(t, err)
 
-		if *cfg.ServiceSettings.EnableCommands {
+		require.False(t, *cfg.ServiceSettings.EnableCommands, "Couldn't read config from environment var")
-			t.Fatal("Couldn't read config from environment var")
-		}
 
-		if serviceSettings, ok := envCfg["ServiceSettings"]; !ok {
+		serviceSettings, ok := envCfg["ServiceSettings"]
-			t.Fatal("ServiceSettings is missing from envConfig")
+		require.True(t, ok, "ServiceSettings is missing from envConfig")
-		} else if serviceSettingsAsMap, ok := serviceSettings.(map[string]interface{}); !ok {
+
-			t.Fatal("ServiceSettings is not a map in envConfig")
+		serviceSettingsAsMap, ok := serviceSettings.(map[string]interface{})
-		} else {
+		require.True(t, ok, "ServiceSettings is not a map in envConfig")
-			if enableCommandsInEnv, ok := serviceSettingsAsMap["EnableCommands"].(bool); !ok || !enableCommandsInEnv {
+
-				t.Fatal("EnableCommands should be in envConfig")
+		enableCommandsInEnv, ok := serviceSettingsAsMap["EnableCommands"].(bool)
-			}
+		require.True(t, ok || enableCommandsInEnv, "EnableCommands should be in envConfig")
-		}
 	})
 
 	t.Run("integer setting", func(t *testing.T) {
@@ -219,15 +213,14 @@ func TestConfigFromEnviroVars(t *testing.T) {
 
 		assert.Equal(t, 400, *cfg.ServiceSettings.ReadTimeout)
 
-		if serviceSettings, ok := envCfg["ServiceSettings"]; !ok {
+		serviceSettings, ok := envCfg["ServiceSettings"]
-			t.Fatal("ServiceSettings is missing from envConfig")
+		require.True(t, ok, "ServiceSettings is missing from envConfig")
-		} else if serviceSettingsAsMap, ok := serviceSettings.(map[string]interface{}); !ok {
+
-			t.Fatal("ServiceSettings is not a map in envConfig")
+		serviceSettingsAsMap, ok := serviceSettings.(map[string]interface{})
-		} else {
+		require.True(t, ok, "ServiceSettings is not a map in envConfig")
-			if readTimeoutInEnv, ok := serviceSettingsAsMap["ReadTimeout"].(bool); !ok || !readTimeoutInEnv {
+
-				t.Fatal("ReadTimeout should be in envConfig")
+		readTimeoutInEnv, ok := serviceSettingsAsMap["ReadTimeout"].(bool)
-			}
+		require.True(t, ok || readTimeoutInEnv, "ReadTimeout should be in envConfig")
-		}
 	})
 
 	t.Run("setting missing from config.json", func(t *testing.T) {
@@ -239,15 +232,14 @@ func TestConfigFromEnviroVars(t *testing.T) {
 
 		assert.Equal(t, "https://example.com", *cfg.ServiceSettings.SiteURL)
 
-		if serviceSettings, ok := envCfg["ServiceSettings"]; !ok {
+		serviceSettings, ok := envCfg["ServiceSettings"]
-			t.Fatal("ServiceSettings is missing from envConfig")
+		require.True(t, ok, "ServiceSettings is missing from envConfig")
-		} else if serviceSettingsAsMap, ok := serviceSettings.(map[string]interface{}); !ok {
+
-			t.Fatal("ServiceSettings is not a map in envConfig")
+		serviceSettingsAsMap, ok := serviceSettings.(map[string]interface{})
-		} else {
+		require.True(t, ok, "ServiceSettings is not a map in envConfig")
-			if siteURLInEnv, ok := serviceSettingsAsMap["SiteURL"].(bool); !ok || !siteURLInEnv {
+
-				t.Fatal("SiteURL should be in envConfig")
+		siteURLInEnv, ok := serviceSettingsAsMap["SiteURL"].(bool)
-			}
+		require.True(t, ok || siteURLInEnv, "SiteURL should be in envConfig")
-		}
 	})
 
 	t.Run("empty string setting", func(t *testing.T) {
@@ -259,15 +251,14 @@ func TestConfigFromEnviroVars(t *testing.T) {
 
 		assert.Empty(t, *cfg.SupportSettings.TermsOfServiceLink)
 
-		if supportSettings, ok := envCfg["SupportSettings"]; !ok {
+		supportSettings, ok := envCfg["SupportSettings"]
-			t.Fatal("SupportSettings is missing from envConfig")
+		require.True(t, ok, "SupportSettings is missing from envConfig")
-		} else if supportSettingsAsMap, ok := supportSettings.(map[string]interface{}); !ok {
+
-			t.Fatal("SupportSettings is not a map in envConfig")
+		supportSettingsAsMap, ok := supportSettings.(map[string]interface{})
-		} else {
+		require.True(t, ok, "SupportSettings is not a map in envConfig")
-			if termsOfServiceLinkInEnv, ok := supportSettingsAsMap["TermsOfServiceLink"].(bool); !ok || !termsOfServiceLinkInEnv {
+
-				t.Fatal("TermsOfServiceLink should be in envConfig")
+		termsOfServiceLinkInEnv, ok := supportSettingsAsMap["TermsOfServiceLink"].(bool)
-			}
+		require.True(t, ok || termsOfServiceLinkInEnv, "TermsOfServiceLink should be in envConfig")
-		}
 	})
 
 	t.Run("plugin directory settings", func(t *testing.T) {
@@ -285,18 +276,17 @@ func TestConfigFromEnviroVars(t *testing.T) {
 		assert.Equal(t, "/temp/plugins", *cfg.PluginSettings.Directory)
 		assert.Equal(t, "/temp/clientplugins", *cfg.PluginSettings.ClientDirectory)
 
-		if pluginSettings, ok := envCfg["PluginSettings"]; !ok {
+		pluginSettings, ok := envCfg["PluginSettings"]
-			t.Fatal("PluginSettings is missing from envConfig")
+		require.True(t, ok, "PluginSettings is missing from envConfig")
-		} else if pluginSettingsAsMap, ok := pluginSettings.(map[string]interface{}); !ok {
+
-			t.Fatal("PluginSettings is not a map in envConfig")
+		pluginSettingsAsMap, ok := pluginSettings.(map[string]interface{})
-		} else {
+		require.True(t, ok, "PluginSettings is not a map in envConfig")
-			if directory, ok := pluginSettingsAsMap["Directory"].(bool); !ok || !directory {
+
-				t.Fatal("Directory should be in envConfig")
+		directory, ok := pluginSettingsAsMap["Directory"].(bool)
-			}
+		require.True(t, ok || directory, "Directory should be in envConfig")
-			if clientDirectory, ok := pluginSettingsAsMap["ClientDirectory"].(bool); !ok || !clientDirectory {
+
-				t.Fatal("ClientDirectory should be in envConfig")
+		clientDirectory, ok := pluginSettingsAsMap["ClientDirectory"].(bool)
-			}
+		require.True(t, ok || clientDirectory, "ClientDirectory should be in envConfig")
-		}
 	})
 
 	t.Run("plugin specific settings cannot be overridden via environment", func(t *testing.T) {
@@ -310,45 +300,38 @@ func TestConfigFromEnviroVars(t *testing.T) {
 		cfg, envCfg, err := unmarshalConfig(strings.NewReader(config), true)
 		require.Nil(t, err)
 
-		if pluginsJira, ok := cfg.PluginSettings.Plugins["jira"]; !ok {
+		pluginsJira, ok := cfg.PluginSettings.Plugins["jira"]
-			t.Fatal("PluginSettings.Plugins.jira is missing from config")
+		require.True(t, ok, "PluginSettings.Plugins.jira is missing from config")
-		} else {
-			if enabled, ok := pluginsJira["enabled"]; !ok {
-				t.Fatal("PluginSettings.Plugins.jira.enabled is missing from config")
-			} else {
-				assert.Equal(t, "true", enabled)
-			}
 
-			if secret, ok := pluginsJira["secret"]; !ok {
+		enabled, ok := pluginsJira["enabled"]
-				t.Fatal("PluginSettings.Plugins.jira.secret is missing from config")
+		require.True(t, ok, "PluginSettings.Plugins.jira.enabled is missing from config")
-			} else {
+		assert.Equal(t, "true", enabled)
-				assert.Equal(t, "config-secret", secret)
-			}
-		}
 
-		if pluginStatesJira, ok := cfg.PluginSettings.PluginStates["jira"]; !ok {
+		secret, ok := pluginsJira["secret"]
-			t.Fatal("PluginSettings.PluginStates.jira is missing from config")
+		require.True(t, ok, "PluginSettings.Plugins.jira.secret is missing from config")
-		} else {
+		assert.Equal(t, "config-secret", secret)
-			require.Equal(t, true, pluginStatesJira.Enable)
-		}
 
-		if pluginSettings, ok := envCfg["PluginSettings"]; !ok {
+		pluginStatesJira, ok := cfg.PluginSettings.PluginStates["jira"]
-			t.Fatal("PluginSettings is missing from envConfig")
+		require.True(t, ok, "PluginSettings.PluginStates.jira is missing from config")
-		} else if pluginSettingsAsMap, ok := pluginSettings.(map[string]interface{}); !ok {
+		require.Equal(t, true, pluginStatesJira.Enable)
-			t.Fatal("PluginSettings is not a map in envConfig")
-		} else {
-			if plugins, ok := pluginSettingsAsMap["Plugins"].(map[string]interface{}); !ok {
-				t.Fatal("PluginSettings.Plugins is not a map in envConfig")
-			} else if _, ok := plugins["jira"].(map[string]interface{}); ok {
-				t.Fatal("PluginSettings.Plugins.jira should not be a map in envConfig")
-			}
 
-			if pluginStates, ok := pluginSettingsAsMap["PluginStates"].(map[string]interface{}); !ok {
+		pluginSettings, ok := envCfg["PluginSettings"]
-				t.Fatal("PluginSettings.PluginStates is missing from envConfig")
+		require.True(t, ok, "PluginSettings is missing from envConfig")
-			} else if _, ok := pluginStates["jira"].(map[string]interface{}); ok {
+
-				t.Fatal("PluginSettings.PluginStates.jira should not be a map in envConfig")
+		pluginSettingsAsMap, ok := pluginSettings.(map[string]interface{})
-			}
+		require.True(t, ok, "PluginSettings is not a map in envConfig")
-		}
+
+		plugins, ok := pluginSettingsAsMap["Plugins"].(map[string]interface{})
+		require.True(t, ok, "PluginSettings.Plugins is not a map in envConfig")
+
+		_, ok = plugins["jira"].(map[string]interface{})
+		require.False(t, ok, "PluginSettings.Plugins.jira should not be a map in envConfig")
+
+		pluginStates, ok := pluginSettingsAsMap["PluginStates"].(map[string]interface{})
+		require.True(t, ok, "PluginSettings.PluginStates is missing from envConfig")
+
+		_, ok = pluginStates["jira"].(map[string]interface{})
+		require.False(t, ok, "PluginSettings.PluginStates.jira should not be a map in envConfig")
 	})
 }