diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2018-04-09 12:16:11 -0400 |
|---|---|---|
| committer | Jesús Espino <jespinog@gmail.com> | 2018-04-09 18:16:11 +0200 |
| commit | 0a6b96cb40d9dd5acca7e366df9cd14fa4eff6a7 (patch) | |
| tree | 4b46ef4dc50aed2171d3b5ec38117a148db7ae29 /cmd | |
| parent | 57ee6f505e1b231733dc73dc25d2fbe14bd6b7d5 (diff) | |
| download | chat-0a6b96cb40d9dd5acca7e366df9cd14fa4eff6a7.tar.gz chat-0a6b96cb40d9dd5acca7e366df9cd14fa4eff6a7.tar.bz2 chat-0a6b96cb40d9dd5acca7e366df9cd14fa4eff6a7.zip | |
MM-9849 Added tracking of which settings are set through environment variables (#8586)
* MM-9849 Added tracking of which settings are set through environment variables
* Removed old version of viper
* Added forked version of viper
* Fixed unit tests
* Fixed more unit tests
* Removed copy from App.GetEnvironmentConfig
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/commands/config_flag_test.go | 2 | ||||
| -rw-r--r-- | cmd/commands/message_export_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/commands/config_flag_test.go b/cmd/commands/config_flag_test.go index 7ea0d5153..f31c989d8 100644 --- a/cmd/commands/config_flag_test.go +++ b/cmd/commands/config_flag_test.go @@ -22,7 +22,7 @@ func TestConfigFlag(t *testing.T) { defer os.RemoveAll(dir) utils.TranslationsPreInit() - config, _, err := utils.LoadConfig("config.json") + config, _, _, err := utils.LoadConfig("config.json") require.Nil(t, err) configPath := filepath.Join(dir, "foo.json") require.NoError(t, ioutil.WriteFile(configPath, []byte(config.ToJson()), 0600)) diff --git a/cmd/commands/message_export_test.go b/cmd/commands/message_export_test.go index 5170b77af..bd0e049d6 100644 --- a/cmd/commands/message_export_test.go +++ b/cmd/commands/message_export_test.go @@ -57,7 +57,7 @@ func writeTempConfig(t *testing.T, isMessageExportEnabled bool) string { require.NoError(t, err) utils.TranslationsPreInit() - config, _, appErr := utils.LoadConfig("config.json") + config, _, _, appErr := utils.LoadConfig("config.json") require.Nil(t, appErr) config.MessageExportSettings.EnableExport = model.NewBool(isMessageExportEnabled) configPath := filepath.Join(dir, "foo.json") |