diff options
author | Justin Wyer <justin@lifeasageek.com> | 2017-04-25 18:37:57 +0200 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2017-04-25 09:37:57 -0700 |
commit | 83ca76f8f2bfef819ba928dd1e5c94d65eed46cf (patch) | |
tree | 6bd87c71a1d9bce0afd4ff92c97ba21c629b2868 /model | |
parent | f1668bad15d27e6e2b40e5079f0b878603b33684 (diff) | |
download | chat-83ca76f8f2bfef819ba928dd1e5c94d65eed46cf.tar.gz chat-83ca76f8f2bfef819ba928dd1e5c94d65eed46cf.tar.bz2 chat-83ca76f8f2bfef819ba928dd1e5c94d65eed46cf.zip |
PLT-4113 Added default for FileSettings.Directory (#6188)
Diffstat (limited to 'model')
-rw-r--r-- | model/config.go | 4 | ||||
-rw-r--r-- | model/config_test.go | 17 |
2 files changed, 21 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index 303d7bb75..0c3307a06 100644 --- a/model/config.go +++ b/model/config.go @@ -487,6 +487,10 @@ func (o *Config) SetDefaults() { o.FileSettings.InitialFont = "luximbi.ttf" } + if o.FileSettings.Directory == "" { + o.FileSettings.Directory = "./data/" + } + if len(o.EmailSettings.InviteSalt) == 0 { o.EmailSettings.InviteSalt = NewRandomString(32) } diff --git a/model/config_test.go b/model/config_test.go new file mode 100644 index 000000000..62a77c133 --- /dev/null +++ b/model/config_test.go @@ -0,0 +1,17 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package model + +import ( + "testing" +) + +func TestConfigDefaultFileSettingsDirectory(t *testing.T) { + c1 := Config{} + c1.SetDefaults() + + if c1.FileSettings.Directory != "./data/" { + t.Fatal("FileSettings.Directory should default to './data/'") + } +} |