Merge branch 'feature/follow-import' into 'develop'

[akkoma] / test / web / mastodon_api / status_view_test.exs

diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
index caa2c9d83187f3c62c1a2e606a79aabc3e83e949..0d396f3b8418a97988b8473631afb3ce96007e24 100644 (file)
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@@ -17,7 +17,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
     |> String.replace(~r/\.\d+Z/, ".000Z")
 
     expected = %{
-      id: note.id,
+      id: to_string(note.id),
       uri: note.data["object"]["id"],
       url: note.data["object"]["id"],
       account: AccountView.render("account.json", %{user: user}),
@@ -32,7 +32,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
       favourited: false,
       muted: false,
       sensitive: false,
-      spoiler_text: "",
+      spoiler_text: note.data["object"]["summary"],
       visibility: "public",
       media_attachments: [],
       mentions: [],
@@ -56,7 +56,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
 
   test "contains mentions" do
     incoming = File.read!("test/fixtures/incoming_reply_mastodon.xml")
-    user = insert(:user, %{ap_id: "https://pleroma.soykaf.com/users/lain"})
+    # a user with this ap id might be in the cache.
+    recipient = "https://pleroma.soykaf.com/users/lain"
+    user = User.get_cached_by_ap_id(recipient) || insert(:user, %{ap_id: recipient})
 
     {:ok, [activity]} = OStatus.handle_incoming(incoming)
 
@@ -78,7 +80,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
     }
 
     expected = %{
-      id: 1638338801,
+      id: "1638338801",
       type: "image",
       url: "someurl",
       remote_url: "someurl",
@@ -90,7 +92,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
 
     # If theres a "id", use that instead of the generated one
     object = Map.put(object, "id", 2)
-    assert %{id: 2} = StatusView.render("attachment.json", %{attachment: object})
+    assert %{id: "2"} = StatusView.render("attachment.json", %{attachment: object})
   end
 
   test "a reblog" do
@@ -101,7 +103,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
 
     represented = StatusView.render("status.json", %{for: user, activity: reblog})
 
-    assert represented[:id] == reblog.id
-    assert represented[:reblog][:id] == activity.id
+    assert represented[:id] == to_string(reblog.id)
+    assert represented[:reblog][:id] == to_string(activity.id)
+    assert represented[:emojis] == []
   end
 end