diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-29 06:57:34 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-29 06:57:34 +0300 |
| commit | dfd2c741849e9afaf35e3ddbecbb50feb47f5d22 (patch) | |
| tree | 92d77142391ed6eab45a4bec792ed02be91fbe39 /test/web/media_proxy | |
| parent | edb659dc579fe56227adef0b0704ff13b6ef717e (diff) | |
| parent | 4e81b4b190161ebb0c496c682fa8e1e0c38a3903 (diff) | |
| download | pleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.tar.gz pleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.zip | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/web/media_proxy')
| -rw-r--r-- | test/web/media_proxy/media_proxy_controller_test.exs | 7 | ||||
| -rw-r--r-- | test/web/media_proxy/media_proxy_test.exs | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/test/web/media_proxy/media_proxy_controller_test.exs b/test/web/media_proxy/media_proxy_controller_test.exs index f035dfeee..da79d38a5 100644 --- a/test/web/media_proxy/media_proxy_controller_test.exs +++ b/test/web/media_proxy/media_proxy_controller_test.exs @@ -7,8 +7,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do import Mock alias Pleroma.Config - clear_config(:media_proxy) - clear_config([Pleroma.Web.Endpoint, :secret_key_base]) + setup do: clear_config(:media_proxy) + setup do: clear_config([Pleroma.Web.Endpoint, :secret_key_base]) test "it returns 404 when MediaProxy disabled", %{conn: conn} do Config.put([:media_proxy, :enabled], false) @@ -52,9 +52,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do url = Pleroma.Web.MediaProxy.encode_url("https://google.fn/test.png") invalid_url = String.replace(url, "test.png", "test-file.png") response = get(conn, invalid_url) - html = "<html><body>You are being <a href=\"#{url}\">redirected</a>.</body></html>" assert response.status == 302 - assert response.resp_body == html + assert redirected_to(response) == url end test "it performs ReverseProxy.call when signature valid", %{conn: conn} do diff --git a/test/web/media_proxy/media_proxy_test.exs b/test/web/media_proxy/media_proxy_test.exs index 8f5fcf2eb..69c2d5dae 100644 --- a/test/web/media_proxy/media_proxy_test.exs +++ b/test/web/media_proxy/media_proxy_test.exs @@ -8,8 +8,8 @@ defmodule Pleroma.Web.MediaProxyTest do import Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy.MediaProxyController - clear_config([:media_proxy, :enabled]) - clear_config(Pleroma.Upload) + setup do: clear_config([:media_proxy, :enabled]) + setup do: clear_config(Pleroma.Upload) describe "when enabled" do setup do |