summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-10-28 18:08:51 +0000
committerfeld <feld@feld.me>2020-10-28 18:08:51 +0000
commit25832534cd57f8b114e7834bb19acec68faf2ce0 (patch)
tree9920450dcb2d3deb4155d36a41fe629034a9bc0e /test/support
parent342c2e1bc0055b71a9772ef031eab3e8bc88d29b (diff)
parentda4a1e57b11d5600788b90f21d18bbcd97f6849f (diff)
downloadpleroma-25832534cd57f8b114e7834bb19acec68faf2ce0.tar.gz
pleroma-25832534cd57f8b114e7834bb19acec68faf2ce0.zip
Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
OStatus / Static FE access control fixes See merge request pleroma/pleroma!3053
Diffstat (limited to 'test/support')
-rw-r--r--test/support/conn_case.ex22
1 files changed, 0 insertions, 22 deletions
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index 9316a82e4..47cb65a80 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -112,28 +112,6 @@ defmodule Pleroma.Web.ConnCase do
defp json_response_and_validate_schema(conn, _status) do
flunk("Response schema not found for #{conn.method} #{conn.request_path} #{conn.status}")
end
-
- defp ensure_federating_or_authenticated(conn, url, user) do
- initial_setting = Config.get([:instance, :federating])
- on_exit(fn -> Config.put([:instance, :federating], initial_setting) end)
-
- Config.put([:instance, :federating], false)
-
- conn
- |> get(url)
- |> response(403)
-
- conn
- |> assign(:user, user)
- |> get(url)
- |> response(200)
-
- Config.put([:instance, :federating], true)
-
- conn
- |> get(url)
- |> response(200)
- end
end
end