Merge branch 'runtime-router' 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 b0812763971bd54e53176b5eb5a1e6ce3c112fa3..31554a07d101e48a8ef7795edef929271ed08569 100644 (file)
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@@ -7,14 +7,33 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
   alias Pleroma.Web.CommonAPI
   import Pleroma.Factory
 
+  test "a note with null content" do
+    note = insert(:note_activity)
+
+    data =
+      note.data
+      |> put_in(["object", "content"], nil)
+
+    note =
+      note
+      |> Map.put(:data, data)
+
+    user = User.get_cached_by_ap_id(note.data["actor"])
+
+    status = StatusView.render("status.json", %{activity: note})
+
+    assert status.content == ""
+  end
+
   test "a note activity" do
     note = insert(:note_activity)
     user = User.get_cached_by_ap_id(note.data["actor"])
 
     status = StatusView.render("status.json", %{activity: note})
 
-    created_at = (note.data["object"]["published"] || "")
-    |> String.replace(~r/\.\d+Z/, ".000Z")
+    created_at =
+      (note.data["object"]["published"] || "")
+      |> String.replace(~r/\.\d+Z/, ".000Z")
 
     expected = %{
       id: to_string(note.id),
@@ -27,6 +46,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
       content: HtmlSanitizeEx.basic_html(note.data["object"]["content"]),
       created_at: created_at,
       reblogs_count: 0,
+      replies_count: 0,
       favourites_count: 0,
       reblogged: false,
       favourited: false,
@@ -46,7 +66,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
         %{
           shortcode: "2hu",
           url: "corndog.png",
-          static_url: "corndog.png"
+          static_url: "corndog.png",
+          visible_in_picker: false
         }
       ]
     }
@@ -57,9 +78,17 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
   test "a reply" do
     note = insert(:note_activity)
     user = insert(:user)
-    {:ok, activity} = CommonAPI.post(user, %{"status" => "he", "in_reply_to_status_id" => note.id})
 
-    assert activity.data["object"]["inReplyTo"] == note.data["object"]["id"]
+    {:ok, activity} =
+      CommonAPI.post(user, %{"status" => "he", "in_reply_to_status_id" => note.id})
+
+    status = StatusView.render("status.json", %{activity: activity})
+
+    assert status.in_reply_to_id == to_string(note.id)
+
+    [status] = StatusView.render("index.json", %{activities: [activity], as: :activity})
+
+    assert status.in_reply_to_id == to_string(note.id)
   end
 
   test "contains mentions" do
@@ -93,7 +122,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
       url: "someurl",
       remote_url: "someurl",
       preview_url: "someurl",
-      text_url: "someurl"
+      text_url: "someurl",
+      description: nil
     }
 
     assert expected == StatusView.render("attachment.json", %{attachment: object})