diff options
| author | George Goldberg <george@gberg.me> | 2018-02-13 13:35:52 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-13 13:46:01 +0000 |
| commit | 5c101253c5987743cf1b3a8fe68814d748070622 (patch) | |
| tree | e2632505d051e7d15d6daf974ed8ac92095f82fe /utils/config_test.go | |
| parent | b7fc3d7d35ca4dd16097715a66463392a1dfaf0a (diff) | |
| parent | d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa (diff) | |
| download | chat-5c101253c5987743cf1b3a8fe68814d748070622.tar.gz chat-5c101253c5987743cf1b3a8fe68814d748070622.tar.bz2 chat-5c101253c5987743cf1b3a8fe68814d748070622.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'utils/config_test.go')
| -rw-r--r-- | utils/config_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/config_test.go b/utils/config_test.go index 9abc56d5e..5809422f1 100644 --- a/utils/config_test.go +++ b/utils/config_test.go @@ -197,7 +197,7 @@ func TestGetClientConfig(t *testing.T) { cfg, _, err := LoadConfig("config.json") require.Nil(t, err) - configMap := GenerateClientConfig(cfg, "") + configMap := GenerateClientConfig(cfg, "", nil) if configMap["EmailNotificationContentsType"] != *cfg.EmailSettings.EmailNotificationContentsType { t.Fatal("EmailSettings.EmailNotificationContentsType not exposed to client config") } |