X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fadmin_api%2Fadmin_api_controller_test.exs;h=2a8791b83502c08f1b8ea85634d669ddc53392a1;hb=9c1b36856b97a7f86e60ad23ef374449c1910c7a;hp=cedc907ec0ceda08d7f4f5746ed99dce7e551b7d;hpb=7895ee37fae82de26b3c06e69a96788d8c88d139;p=akkoma

diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs
index cedc907ec..2a8791b83 100644
--- a/test/web/admin_api/admin_api_controller_test.exs
+++ b/test/web/admin_api/admin_api_controller_test.exs
@@ -80,17 +80,16 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
       user = insert(:user)
       follower = insert(:user)
 
-      conn =
-        build_conn()
-        |> assign(:user, admin)
-        |> put_req_header("accept", "application/json")
-        |> post("/api/pleroma/admin/user/follow", %{
-          "follower" => follower.nickname,
-          "followed" => user.nickname
-        })
+      build_conn()
+      |> assign(:user, admin)
+      |> put_req_header("accept", "application/json")
+      |> post("/api/pleroma/admin/user/follow", %{
+        "follower" => follower.nickname,
+        "followed" => user.nickname
+      })
 
-      user = Repo.get(User, user.id)
-      follower = Repo.get(User, follower.id)
+      user = User.get_by_id(user.id)
+      follower = User.get_by_id(follower.id)
 
       assert User.following?(follower, user)
     end
@@ -104,17 +103,16 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
 
       User.follow(follower, user)
 
-      conn =
-        build_conn()
-        |> assign(:user, admin)
-        |> put_req_header("accept", "application/json")
-        |> post("/api/pleroma/admin/user/unfollow", %{
-          "follower" => follower.nickname,
-          "followed" => user.nickname
-        })
+      build_conn()
+      |> assign(:user, admin)
+      |> put_req_header("accept", "application/json")
+      |> post("/api/pleroma/admin/user/unfollow", %{
+        "follower" => follower.nickname,
+        "followed" => user.nickname
+      })
 
-      user = Repo.get(User, user.id)
-      follower = Repo.get(User, follower.id)
+      user = User.get_by_id(user.id)
+      follower = User.get_by_id(follower.id)
 
       refute User.following?(follower, user)
     end
@@ -319,7 +317,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
       refute token_record.used
 
       Swoosh.TestAssertions.assert_email_sent(
-        Pleroma.UserEmail.user_invitation_email(
+        Pleroma.Emails.UserEmail.user_invitation_email(
           user,
           token_record,
           recipient_email,