projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copy emoji in the subject from parent post
[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..ea66c708fcd2f9313ac9b01a28019727502abad6 100644
(file)
--- a/
test/pleroma/web/mastodon_api/masto_fe_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/masto_fe_controller_test.exs
@@
-1,11
+1,10
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MastoFEControllerTest do
use Pleroma.Web.ConnCase
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MastoFEControllerTest do
use Pleroma.Web.ConnCase
- alias Pleroma.Config
alias Pleroma.User
import Pleroma.Factory
alias Pleroma.User
import Pleroma.Factory
@@
-55,7
+54,7
@@
defmodule Pleroma.Web.MastodonAPI.MastoFEControllerTest do
conn: conn,
path: path
} do
conn: conn,
path: path
} do
-
Config.put
([:instance, :public], false)
+
clear_config
([:instance, :public], false)
conn = get(conn, path)
conn = get(conn, path)
@@
-64,7
+63,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