Merge branch 'develop' into 'fix/mrf-sample-doc'

[akkoma] / test / web / pleroma_api / controllers / pleroma_api_controller_test.exs

diff --git a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
index bc676c99a7e87eee77c62621d9db227547bd0e35..36868db38c9f96a28a8bd0ec2aa9865aea257e57 100644 (file)
--- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
+++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
@@ -14,7 +14,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
 
   import Pleroma.Factory
 
-  test "POST /api/v1/pleroma/statuses/:id/react_with_emoji", %{conn: conn} do
+  test "PUT /api/v1/pleroma/statuses/:id/reactions/:emoji", %{conn: conn} do
     user = insert(:user)
     other_user = insert(:user)
 
@@ -24,18 +24,19 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
       conn
       |> assign(:user, other_user)
       |> assign(:token, insert(:oauth_token, user: other_user, scopes: ["write:statuses"]))
-      |> post("/api/v1/pleroma/statuses/#{activity.id}/react_with_emoji", %{"emoji" => "☕"})
+      |> put("/api/v1/pleroma/statuses/#{activity.id}/reactions/☕")
       |> json_response(200)
 
+    # We return the status, but this our implementation detail.
     assert %{"id" => id} = result
     assert to_string(activity.id) == id
 
     assert result["pleroma"]["emoji_reactions"] == [
-             %{"emoji" => "☕", "count" => 1, "reacted" => true}
+             %{"name" => "☕", "count" => 1, "me" => true}
            ]
   end
 
-  test "POST /api/v1/pleroma/statuses/:id/unreact_with_emoji", %{conn: conn} do
+  test "DELETE /api/v1/pleroma/statuses/:id/reactions/:emoji", %{conn: conn} do
     user = insert(:user)
     other_user = insert(:user)
 
@@ -46,7 +47,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
       conn
       |> assign(:user, other_user)
       |> assign(:token, insert(:oauth_token, user: other_user, scopes: ["write:statuses"]))
-      |> post("/api/v1/pleroma/statuses/#{activity.id}/unreact_with_emoji", %{"emoji" => "☕"})
+      |> delete("/api/v1/pleroma/statuses/#{activity.id}/reactions/☕")
 
     assert %{"id" => id} = json_response(result, 200)
     assert to_string(activity.id) == id
@@ -56,28 +57,31 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
     assert object.data["reaction_count"] == 0
   end
 
-  test "GET /api/v1/pleroma/statuses/:id/emoji_reactions_by", %{conn: conn} do
+  test "GET /api/v1/pleroma/statuses/:id/reactions", %{conn: conn} do
     user = insert(:user)
     other_user = insert(:user)
+    doomed_user = insert(:user)
 
     {:ok, activity} = CommonAPI.post(user, %{"status" => "#cofe"})
 
     result =
       conn
-      |> get("/api/v1/pleroma/statuses/#{activity.id}/emoji_reactions_by")
+      |> get("/api/v1/pleroma/statuses/#{activity.id}/reactions")
       |> json_response(200)
 
     assert result == []
 
     {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, other_user, "🎅")
+    {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, doomed_user, "🎅")
+
+    User.perform(:delete, doomed_user)
 
     result =
       conn
-      |> get("/api/v1/pleroma/statuses/#{activity.id}/emoji_reactions_by")
+      |> get("/api/v1/pleroma/statuses/#{activity.id}/reactions")
       |> json_response(200)
 
-    [%{"emoji" => "🎅", "count" => 1, "accounts" => [represented_user], "reacted" => false}] =
-      result
+    [%{"name" => "🎅", "count" => 1, "accounts" => [represented_user], "me" => false}] = result
 
     assert represented_user["id"] == other_user.id
 
@@ -85,10 +89,10 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
       conn
       |> assign(:user, other_user)
       |> assign(:token, insert(:oauth_token, user: other_user, scopes: ["read:statuses"]))
-      |> get("/api/v1/pleroma/statuses/#{activity.id}/emoji_reactions_by")
+      |> get("/api/v1/pleroma/statuses/#{activity.id}/reactions")
       |> json_response(200)
 
-    assert [%{"emoji" => "🎅", "count" => 1, "accounts" => [_represented_user], "reacted" => true}] =
+    assert [%{"name" => "🎅", "count" => 1, "accounts" => [_represented_user], "me" => true}] =
              result
   end