From 08b7b1c4144f18a9dbf52bfe0eb9182f2b4eba4a Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 23 Oct 2017 02:39:51 -0700 Subject: Reduce cfg boilerplate (#7689) * reduce cfg boilerplate * fix compile error * user test fix * another test fix * simplify diagnostics / testing --- app/diagnostics_test.go | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'app/diagnostics_test.go') diff --git a/app/diagnostics_test.go b/app/diagnostics_test.go index a7d879a7f..842322e9c 100644 --- a/app/diagnostics_test.go +++ b/app/diagnostics_test.go @@ -12,6 +12,9 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + + "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) @@ -29,21 +32,15 @@ func newTestServer() (chan string, *httptest.Server) { } func TestPluginSetting(t *testing.T) { - before := utils.Cfg.PluginSettings.Plugins - utils.Cfg.PluginSettings.Plugins = map[string]interface{}{ - "test": map[string]string{ - "foo": "bar", + settings := &model.PluginSettings{ + Plugins: map[string]interface{}{ + "test": map[string]string{ + "foo": "bar", + }, }, } - defer func() { - utils.Cfg.PluginSettings.Plugins = before - }() - if pluginSetting("test", "foo", "asd") != "bar" { - t.Fatal() - } - if pluginSetting("test", "qwe", "asd") != "asd" { - t.Fatal() - } + assert.Equal(t, "bar", pluginSetting(settings, "test", "foo", "asd")) + assert.Equal(t, "asd", pluginSetting(settings, "test", "qwe", "asd")) } func TestDiagnostics(t *testing.T) { -- cgit v1.2.3-1-g7c22