Replace UserRepresenter with UserView

[akkoma] / test / web / twitter_api / twitter_api_controller_test.exs

diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 6c249be7d619a0807437b3ce5e795f080cc6e46f..5ccced73941a40314e2ed3532fddc002fa3ad7f7 100644 (file)
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -1,9 +1,10 @@
 defmodule Pleroma.Web.TwitterAPI.ControllerTest do
   use Pleroma.Web.ConnCase
-  alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter}
+  alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
   alias Pleroma.Builders.{ActivityBuilder, UserBuilder}
   alias Pleroma.{Repo, Activity, User, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.TwitterAPI.UserView
 
   import Pleroma.Factory
 
@@ -19,7 +20,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
         |> with_credentials(user.nickname, "test")
         |> post("/api/account/verify_credentials.json")
 
-      assert json_response(conn, 200) == UserRepresenter.to_map(user)
+      assert json_response(conn, 200) == UserView.render("show.json", %{user: user})
     end
   end
 
@@ -84,12 +85,13 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
   describe "GET /statusnet/conversation/:id.json" do
     test "returns the statuses in the conversation", %{conn: conn} do
       {:ok, _user} = UserBuilder.insert
-      {:ok, _activity} = ActivityBuilder.insert(%{"statusnetConversationId" => 1, "context" => "2hu"})
-      {:ok, _activity_two} = ActivityBuilder.insert(%{"statusnetConversationId" => 1,"context" => "2hu"})
+      {:ok, _activity} = ActivityBuilder.insert(%{"context" => "2hu"})
+      {:ok, _activity_two} = ActivityBuilder.insert(%{"context" => "2hu"})
       {:ok, _activity_three} = ActivityBuilder.insert(%{"context" => "3hu"})
 
+      {:ok, object} = Object.context_mapping("2hu") |> Repo.insert
       conn = conn
-      |> get("/api/statusnet/conversation/1.json")
+      |> get("/api/statusnet/conversation/#{object.id}.json")
 
       response = json_response(conn, 200)
 
@@ -228,7 +230,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
       current_user = Repo.get(User, current_user.id)
       assert current_user.following == [User.ap_followers(followed)]
-      assert json_response(conn, 200) == UserRepresenter.to_map(followed, %{for: current_user})
+      assert json_response(conn, 200) == UserView.render("show.json", %{user: followed, for: current_user})
     end
   end
 
@@ -244,6 +246,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
       {:ok, current_user} = User.follow(current_user, followed)
       assert current_user.following == [User.ap_followers(followed)]
+      ActivityPub.follow(current_user, followed)
 
       conn = conn
       |> with_credentials(current_user.nickname, "test")
@@ -251,7 +254,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
       current_user = Repo.get(User, current_user.id)
       assert current_user.following == []
-      assert json_response(conn, 200) == UserRepresenter.to_map(followed, %{for: current_user})
+      assert json_response(conn, 200) == UserView.render("show.json", %{user: followed, for: current_user})
     end
   end
 
@@ -276,7 +279,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
       current_user = Repo.get(User, current_user.id)
       assert is_map(current_user.avatar)
-      assert json_response(conn, 200) == UserRepresenter.to_map(current_user, %{for: current_user})
+      assert json_response(conn, 200) == UserView.render("show.json", %{user: current_user, for: current_user})
     end
   end
 
@@ -366,7 +369,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
       user = json_response(conn, 200)
 
       fetched_user = Repo.get_by(User, nickname: "lain")
-      assert user == UserRepresenter.to_map(fetched_user)
+      assert user == UserView.render("show.json", %{user: fetched_user})
     end
 
     test "it returns errors on a problem", %{conn: conn} do
@@ -387,6 +390,17 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     end
   end
 
+  describe "GET /api/externalprofile/show" do
+    test "it returns the user", %{conn: conn} do
+      user = insert(:user)
+
+      conn = conn
+      |> get("/api/externalprofile/show", %{profileurl: user.ap_id})
+
+      assert json_response(conn, 200) == UserView.render("show.json", %{user: user})
+    end
+  end
+
   defp valid_user(_context) do
     user = insert(:user)
     [user: user]
@@ -396,10 +410,4 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     header_content = "Basic " <> Base.encode64("#{username}:#{password}")
     put_req_header(conn, "authorization", header_content)
   end
-
-  setup do
-    Supervisor.terminate_child(Pleroma.Supervisor, ConCache)
-    Supervisor.restart_child(Pleroma.Supervisor, ConCache)
-    :ok
-  end
 end