diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-07-26 08:31:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 08:31:22 -0700 |
| commit | bae26ec268aef4e85d5055f1b83c6b3992bf178f (patch) | |
| tree | 74ab5e508661068b30516c704ffc0a9b02efa8d5 /api4/apitestlib.go | |
| parent | 185ed89978e0d88d75b5c606104e78058753bd4d (diff) | |
| download | chat-bae26ec268aef4e85d5055f1b83c6b3992bf178f.tar.gz chat-bae26ec268aef4e85d5055f1b83c6b3992bf178f.tar.bz2 chat-bae26ec268aef4e85d5055f1b83c6b3992bf178f.zip | |
MM-11160 Adding proper CORS support. (#9152)
* Adding proper CORS support.
* Better CORS tests.
Diffstat (limited to 'api4/apitestlib.go')
| -rw-r--r-- | api4/apitestlib.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index ff7d47b26..fce44cfa1 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -75,7 +75,7 @@ func StopTestStore() { } } -func setupTestHelper(enterprise bool) *TestHelper { +func setupTestHelper(enterprise bool, updateConfig func(*model.Config)) *TestHelper { permConfig, err := os.Open(utils.FindConfigFile("config.json")) if err != nil { panic(err) @@ -115,6 +115,9 @@ func setupTestHelper(enterprise bool) *TestHelper { if testStore != nil { th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" }) } + if updateConfig != nil { + th.App.UpdateConfig(updateConfig) + } serverErr := th.App.StartServer() if serverErr != nil { panic(serverErr) @@ -161,11 +164,15 @@ func setupTestHelper(enterprise bool) *TestHelper { } func SetupEnterprise() *TestHelper { - return setupTestHelper(true) + return setupTestHelper(true, nil) } func Setup() *TestHelper { - return setupTestHelper(false) + return setupTestHelper(false, nil) +} + +func SetupConfig(updateConfig func(cfg *model.Config)) *TestHelper { + return setupTestHelper(false, updateConfig) } func (me *TestHelper) TearDown() { |