3 files changed, 13 insertions, 15 deletions
diff --git a/test/emails/user_email_test.exs b/test/emails/user_email_test.exs
index a75623bb4..c6044a8a5 100644
--- a/test/emails/user_email_test.exs
+++ b/test/emails/user_email_test.exs
@@ -31,7 +31,7 @@ defmodule Pleroma.Emails.UserEmailTest do
     assert email.to == [{"Jonh", "test@test.com"}]
 
     assert email.html_body =~
-             Router.Helpers.redirect_url(Endpoint, :registration_page, token.token)
+             Router.Helpers.frontend_url(Endpoint, :registration_page, token.token)
   end
 
   test "build account confirmation email" do
diff --git a/test/web/fallback_test.exs b/test/web/controllers/frontend/pleroma_controller_test.exs
index a65865860..7c91d4581 100644
--- a/test/web/fallback_test.exs
+++ b/test/web/controllers/frontend/pleroma_controller_test.exs
@@ -1,11 +1,11 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.FallbackTest do
+defmodule Pleroma.Web.Frontend.PleromaControllerTest do
   use Pleroma.Web.ConnCase
   import Pleroma.Factory
 
+  test "GET /pleroma/admin -> /pleroma/admin/", %{conn: conn} do
+    assert redirected_to(get(conn, "/pleroma/admin")) =~ "/pleroma/admin/"
+  end
+
   describe "neither preloaded data nor metadata attached to" do
     test "GET /registration/:token", %{conn: conn} do
       response = get(conn, "/registration/foo")
@@ -64,10 +64,6 @@ defmodule Pleroma.Web.FallbackTest do
            |> json_response(404) == %{"error" => "Not implemented"}
   end
 
-  test "GET /pleroma/admin -> /pleroma/admin/", %{conn: conn} do
-    assert redirected_to(get(conn, "/pleroma/admin")) =~ "/pleroma/admin/"
-  end
-
   test "OPTIONS /*path", %{conn: conn} do
     assert conn
            |> options("/foo")
diff --git a/test/web/feed/user_controller_test.exs b/test/web/feed/user_controller_test.exs
index fa2ed1ea5..5bbb90eb4 100644
--- a/test/web/feed/user_controller_test.exs
+++ b/test/web/feed/user_controller_test.exs
@@ -194,11 +194,13 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
         |> get("/users/#{user.nickname}")
         |> response(200)
 
-      assert response ==
-               Fallback.RedirectController.redirector_with_meta(
-                 conn,
-                 %{user: user}
-               ).resp_body
+      expected =
+        conn
+        |> Map.put(:params, %{user: user})
+        |> Pleroma.Web.FrontendController.call(:redirector_with_meta)
+        |> Map.get(:resp_body)
+
+      assert response == expected
     end
 
     test "with html format, it returns error when user is not found", %{conn: conn} do