summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-10-28 18:08:51 +0000
committerrinpatch <rinpatch@sdf.org>2020-11-05 16:23:56 +0300
commit48f7e12e6c139e9cfc8e68b4eaf1695019c9d246 (patch)
tree156bc91c4e5d2a96a22fbe7454ec106949b8148f /test/support
parent86b4149a1350b23a122f3ea8e2ef79ab3e8785e1 (diff)
downloadpleroma-48f7e12e6c139e9cfc8e68b4eaf1695019c9d246.tar.gz
pleroma-48f7e12e6c139e9cfc8e68b4eaf1695019c9d246.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