diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 08:16:38 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 08:16:38 -0500 |
| commit | 8b79f5d49cb8d4877e136a76e515edef41ef6f28 (patch) | |
| tree | 95feb1a0b94f43fd38533adc508df2daf823ea86 /api4 | |
| parent | 32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c (diff) | |
| parent | fbef16f8630f74248157c2cd9e546ece355c869a (diff) | |
| download | chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.tar.gz chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.tar.bz2 chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.zip | |
Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7
Diffstat (limited to 'api4')
| -rw-r--r-- | api4/image_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/api4/image_test.go b/api4/image_test.go index 236d5785d..aa3619cdd 100644 --- a/api4/image_test.go +++ b/api4/image_test.go @@ -37,7 +37,8 @@ func TestGetImage(t *testing.T) { assert.Equal(t, http.StatusNotFound, resp.StatusCode) th.App.UpdateConfig(func(cfg *model.Config) { - cfg.ServiceSettings.ImageProxyType = model.NewString("willnorris/imageproxy") + cfg.ServiceSettings.ImageProxyType = model.NewString("atmos/camo") + cfg.ServiceSettings.ImageProxyOptions = model.NewString("foo") cfg.ServiceSettings.ImageProxyURL = model.NewString("https://proxy.foo.bar") }) @@ -48,5 +49,5 @@ func TestGetImage(t *testing.T) { resp, err = th.Client.HttpClient.Do(r) require.NoError(t, err) assert.Equal(t, http.StatusFound, resp.StatusCode) - assert.Equal(t, "https://proxy.foo.bar//"+originURL, resp.Header.Get("Location")) + assert.Equal(t, "https://proxy.foo.bar/004afe2ef382eb5f30c4490f793f8a8c5b33d8a2/687474703a2f2f666f6f2e6261722f62617a2e676966", resp.Header.Get("Location")) } |