projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/2.4.1' into chores/2.4.1-develop
[akkoma]
/
test
/
pleroma
/
web
/
admin_api
/
controllers
/
o_auth_app_controller_test.exs
diff --git
a/test/pleroma/web/admin_api/controllers/o_auth_app_controller_test.exs
b/test/pleroma/web/admin_api/controllers/o_auth_app_controller_test.exs
index ed7c4172c65b8fbeb3eceea58d2bce5319bfd3fd..d9b25719a0bd1c56afaefe38533b19702f434004 100644
(file)
--- a/
test/pleroma/web/admin_api/controllers/o_auth_app_controller_test.exs
+++ b/
test/pleroma/web/admin_api/controllers/o_auth_app_controller_test.exs
@@
-1,5
+1,5
@@
# 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.AdminAPI.OAuthAppControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.OAuthAppControllerTest do
@@
-8,8
+8,7
@@
defmodule Pleroma.Web.AdminAPI.OAuthAppControllerTest do
import Pleroma.Factory
import Pleroma.Factory
- alias Pleroma.Config
- alias Pleroma.Web
+ alias Pleroma.Web.Endpoint
setup do
admin = insert(:user, is_admin: true)
setup do
admin = insert(:user, is_admin: true)
@@
-37,7
+36,7
@@
defmodule Pleroma.Web.AdminAPI.OAuthAppControllerTest do
end
test "success", %{conn: conn} do
end
test "success", %{conn: conn} do
- base_url =
Web.base_
url()
+ base_url =
Endpoint.
url()
app_name = "Trusted app"
response =
app_name = "Trusted app"
response =
@@
-59,7
+58,7
@@
defmodule Pleroma.Web.AdminAPI.OAuthAppControllerTest do
end
test "with trusted", %{conn: conn} do
end
test "with trusted", %{conn: conn} do
- base_url =
Web.base_
url()
+ base_url =
Endpoint.
url()
app_name = "Trusted app"
response =
app_name = "Trusted app"
response =