diff options
author | lain <lain@soykaf.club> | 2020-03-15 19:15:20 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-03-15 19:15:20 +0000 |
commit | fa4ec17c841a65eccacdc35c98b6c047549b305b (patch) | |
tree | 3ad0309f22b8cb7183cc73b0f2869b5db8e2351d /test/web/media_proxy | |
parent | d84670b9e15e15797c985269664cdf081237eac4 (diff) | |
parent | ecb7809e92b8ee6ac8f4b4a812673684e762c215 (diff) | |
download | pleroma-fa4ec17c841a65eccacdc35c98b6c047549b305b.tar.gz pleroma-fa4ec17c841a65eccacdc35c98b6c047549b305b.zip |
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
[#1560] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
Diffstat (limited to 'test/web/media_proxy')
-rw-r--r-- | test/web/media_proxy/media_proxy_controller_test.exs | 3 |
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 |