projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
masto_fe_controller_test.exs
diff --git
a/test/pleroma/web/mastodon_api/masto_fe_controller_test.exs
b/test/pleroma/web/mastodon_api/masto_fe_controller_test.exs
index ed8add8d21077961bdcc3446f6a542f5680fe033..b9cd050df38b85ab8dcf0a3d59a94cf363f77e2f 100644
(file)
--- a/
test/pleroma/web/mastodon_api/masto_fe_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/masto_fe_controller_test.exs
@@
-64,7
+64,8
@@
defmodule Pleroma.Web.MastodonAPI.MastoFEControllerTest do
end
test "does not redirect logged in users to the login page", %{conn: conn, path: path} do
end
test "does not redirect logged in users to the login page", %{conn: conn, path: path} do
- token = insert(:oauth_token, scopes: ["read"])
+ {:ok, app} = Pleroma.Web.MastodonAPI.AuthController.local_mastofe_app()
+ token = insert(:oauth_token, app: app, scopes: ["read"])
conn =
conn
conn =
conn