aboutsummaryrefslogtreecommitdiff
path: root/test/pleroma/web/admin_api
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-05-31 15:09:11 -0500
committerAlex Gleason <alex@alexgleason.me>2021-05-31 16:48:03 -0500
commit51a9f97e87823cbd9e92c375f4bc4c0bfa8b79db (patch)
tree5bdc8da18a07d4dfe7e6f05c435d078f45e4d0b7 /test/pleroma/web/admin_api
parent2e682788a30b225b67254e92d1807b317ede57f8 (diff)
downloadpleroma-51a9f97e87823cbd9e92c375f4bc4c0bfa8b79db.tar.gz
Deprecate Pleroma.Web.base_url/0
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
Diffstat (limited to 'test/pleroma/web/admin_api')
-rw-r--r--test/pleroma/web/admin_api/controllers/o_auth_app_controller_test.exs6
-rw-r--r--test/pleroma/web/admin_api/controllers/user_controller_test.exs4
2 files changed, 5 insertions, 5 deletions
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 8c7b63f34..d9b25719a 100644
--- 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
@@ -8,7 +8,7 @@ defmodule Pleroma.Web.AdminAPI.OAuthAppControllerTest do
import Pleroma.Factory
- alias Pleroma.Web
+ alias Pleroma.Web.Endpoint
setup do
admin = insert(:user, is_admin: true)
@@ -36,7 +36,7 @@ defmodule Pleroma.Web.AdminAPI.OAuthAppControllerTest do
end
test "success", %{conn: conn} do
- base_url = Web.base_url()
+ base_url = Endpoint.url()
app_name = "Trusted app"
response =
@@ -58,7 +58,7 @@ defmodule Pleroma.Web.AdminAPI.OAuthAppControllerTest do
end
test "with trusted", %{conn: conn} do
- base_url = Web.base_url()
+ base_url = Endpoint.url()
app_name = "Trusted app"
response =
diff --git a/test/pleroma/web/admin_api/controllers/user_controller_test.exs b/test/pleroma/web/admin_api/controllers/user_controller_test.exs
index beb8a5d58..af295be42 100644
--- a/test/pleroma/web/admin_api/controllers/user_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/user_controller_test.exs
@@ -14,9 +14,9 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
alias Pleroma.Repo
alias Pleroma.Tests.ObanHelpers
alias Pleroma.User
- alias Pleroma.Web
alias Pleroma.Web.ActivityPub.Relay
alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.Endpoint
alias Pleroma.Web.MediaProxy
setup_all do
@@ -403,7 +403,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
end
test "pagination works correctly with service users", %{conn: conn} do
- service1 = User.get_or_create_service_actor_by_ap_id(Web.base_url() <> "/meido", "meido")
+ service1 = User.get_or_create_service_actor_by_ap_id(Endpoint.url() <> "/meido", "meido")
insert_list(25, :user)