X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fmastodon_api%2Fstatus_view_test.exs;h=b9c019206c9034c1bf817d87b84194cc0643b65d;hb=0fe165165f971e66be8870bfa3fc7dc95049b2d2;hp=69d86ea8235155d54ab5887378e025bde30b9cf7;hpb=44295dd49ad004b8c7a289387e913b1234ad1e61;p=akkoma

diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
index 69d86ea82..b9c019206 100644
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@@ -13,8 +13,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
 
     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 +28,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 +48,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
         %{
           shortcode: "2hu",
           url: "corndog.png",
-          static_url: "corndog.png"
+          static_url: "corndog.png",
+          visible_in_picker: false
         }
       ]
     }
@@ -54,9 +57,27 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
     assert status == expected
   end
 
+  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})
+
+    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
     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 = insert(:user, %{ap_id: recipient})
 
     {:ok, [activity]} = OStatus.handle_incoming(incoming)
 
@@ -78,19 +99,20 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
     }
 
     expected = %{
-      id: 1638338801,
+      id: "1638338801",
       type: "image",
       url: "someurl",
       remote_url: "someurl",
       preview_url: "someurl",
-      text_url: "someurl"
+      text_url: "someurl",
+      description: nil
     }
 
     assert expected == StatusView.render("attachment.json", %{attachment: object})
 
     # 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
@@ -103,5 +125,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
 
     assert represented[:id] == to_string(reblog.id)
     assert represented[:reblog][:id] == to_string(activity.id)
+    assert represented[:emojis] == []
   end
 end