diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 12:58:36 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 12:58:36 -0500 |
| commit | cafa4e4370c4d8bfa1cdbfbf8b74387b4fbee257 (patch) | |
| tree | 14e8058293bf6b0a6fb7ab84df7c92dbd2beb96b /api4 | |
| parent | bf1fdf92c71df29ddb7b0e31a00e218863c1158c (diff) | |
| parent | e43f381764bdf29117760b26c88fd37b716e67b2 (diff) | |
| download | chat-cafa4e4370c4d8bfa1cdbfbf8b74387b4fbee257.tar.gz chat-cafa4e4370c4d8bfa1cdbfbf8b74387b4fbee257.tar.bz2 chat-cafa4e4370c4d8bfa1cdbfbf8b74387b4fbee257.zip | |
Merge branch 'release-4.7-t3merge3'
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")) } |