summaryrefslogtreecommitdiff
path: root/test/web/media_proxy
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-03-16 15:31:31 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-03-16 15:31:31 +0400
commit421e35b578b3fc109f820f693e91139a3e3f8970 (patch)
tree37da58962582854597cd068c603b8ba23e10f7bb /test/web/media_proxy
parentd1c7f8e576e31487544b57d67802843b8ef38388 (diff)
parentc2527b8c63a4e35b121981efe2c39cc54c77648d (diff)
downloadpleroma-421e35b578b3fc109f820f693e91139a3e3f8970.tar.gz
pleroma-421e35b578b3fc109f820f693e91139a3e3f8970.zip
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'test/web/media_proxy')
-rw-r--r--test/web/media_proxy/media_proxy_controller_test.exs3
1 files changed, 1 insertions, 2 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..7ac7e4af1 100644
--- a/test/web/media_proxy/media_proxy_controller_test.exs
+++ b/test/web/media_proxy/media_proxy_controller_test.exs
@@ -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