aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-07-29 16:17:23 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-29 16:17:23 +0000
commit8be01540948ff62460a5c21663dfff6c358002a1 (patch)
treefa4a0e1b5becd57da5d7bc3ae9566443a7ab557e /test
parent1f7c8d96151a0e59b6a2ea2275b36e313bddbcbc (diff)
parentc0e258cf21395fa2d5338ee238e4fcf4f3b3bf30 (diff)
downloadpleroma-8be01540948ff62460a5c21663dfff6c358002a1.tar.gz
Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'
Redirect not logged-in users to the MastoFE login page on private instances Closes #1045 See merge request pleroma/pleroma!1503
Diffstat (limited to 'test')
-rw-r--r--test/web/mastodon_api/mastodon_api_controller_test.exs15
1 files changed, 15 insertions, 0 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index d7f92fac2..66016c886 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -3154,6 +3154,21 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert redirected_to(conn) == "/web/login"
end
+ test "redirects not logged-in users to the login page on private instances", %{
+ conn: conn,
+ path: path
+ } do
+ is_public = Pleroma.Config.get([:instance, :public])
+ Pleroma.Config.put([:instance, :public], false)
+
+ conn = get(conn, path)
+
+ assert conn.status == 302
+ assert redirected_to(conn) == "/web/login"
+
+ Pleroma.Config.put([:instance, :public], is_public)
+ end
+
test "does not redirect logged in users to the login page", %{conn: conn, path: path} do
token = insert(:oauth_token)