1 files changed, 48 insertions, 0 deletions
diff --git a/cmd/mattermost/commands/config_flag_test.go b/cmd/mattermost/commands/config_flag_test.go
new file mode 100644
index 000000000..00a817448
--- /dev/null
+++ b/cmd/mattermost/commands/config_flag_test.go
@@ -0,0 +1,48 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package commands
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"encoding/json"
+
+	"github.com/mattermost/mattermost-server/utils"
+)
+
+func TestConfigFlag(t *testing.T) {
+	dir, err := ioutil.TempDir("", "")
+	require.NoError(t, err)
+	defer os.RemoveAll(dir)
+
+	utils.TranslationsPreInit()
+	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))
+
+	timezones := utils.LoadTimezones("timezones.json")
+	tzConfigPath := filepath.Join(dir, "timezones.json")
+	timezoneData, _ := json.Marshal(timezones)
+	require.NoError(t, ioutil.WriteFile(tzConfigPath, timezoneData, 0600))
+
+	i18n, ok := utils.FindDir("i18n")
+	require.True(t, ok)
+	require.NoError(t, utils.CopyDir(i18n, filepath.Join(dir, "i18n")))
+
+	prevDir, err := os.Getwd()
+	require.NoError(t, err)
+	defer os.Chdir(prevDir)
+	os.Chdir(dir)
+
+	require.Error(t, RunCommand(t, "version"))
+	CheckCommand(t, "--config", "foo.json", "version")
+	CheckCommand(t, "--config", "./foo.json", "version")
+	CheckCommand(t, "--config", configPath, "version")
+}