Merge branch 'feature/mastodon-api-fixes' into develop

[akkoma] / test / web / ostatus / ostatus_test.exs

diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs
index 8dd3c3b54c65d77a8cf50a772ad92c1636191246..95038b73ca328887205a88af10030fc480379d13 100644 (file)
--- a/test/web/ostatus/ostatus_test.exs
+++ b/test/web/ostatus/ostatus_test.exs
@@ -24,6 +24,7 @@ defmodule Pleroma.Web.OStatusTest do
     assert activity.data["object"]["published"] == "2017-04-23T14:51:03+00:00"
     assert activity.data["context"] == "tag:gs.example.org:4040,2017-04-23:objectType=thread:nonce=f09e22f58abd5c7b"
     assert "http://pleroma.example.org:4000/users/lain3" in activity.data["to"]
+    assert activity.data["object"]["emoji"] == %{ "marko" => "marko.png", "reimu" => "reimu.png" }
     assert activity.local == false
   end
 
@@ -182,6 +183,13 @@ defmodule Pleroma.Web.OStatusTest do
     refute favorited_activity.local
   end
 
+  test "handle conversation references" do
+    incoming = File.read!("test/fixtures/mastodon_conversation.xml")
+    {:ok, [activity]} = OStatus.handle_incoming(incoming)
+
+    assert activity.data["context"] == "tag:mastodon.social,2017-08-28:objectId=7876885:objectType=Conversation"
+  end
+
   test "handle incoming favorites with locally available object - GS, websub" do
     note_activity = insert(:note_activity)