X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Frepresenters%2Factivity_representer_test.exs;h=385bf8e841b0e35425188359639fcbfa2eb36a57;hb=26ccb768d39515faa3b1db7f1371ecf2517eb6bf;hp=4f090ee8eda575d63d58a0a533525e0d4ac008c7;hpb=678f572144bfd861793c0b72061b04cdb9b7c991;p=akkoma

diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs
index 4f090ee8e..385bf8e84 100644
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -70,7 +70,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
       }
     }
 
-    content_html = "<script>alert('YAY')</script>Some content mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>"
+    content_html = "<script>alert('YAY')</script>Some :2hu: content mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>"
     content = HtmlSanitizeEx.strip_tags(content_html)
     date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601
 
@@ -91,6 +91,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
           "published" => date,
           "type" => "Note",
           "content" => content_html,
+          "summary" => "2hu",
           "inReplyToStatusId" => 213123,
           "attachment" => [
             object
@@ -99,7 +100,10 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
           "like_count" => 5,
           "announcement_count" => 3,
           "context" => "2hu",
-          "tag" => ["content", "mentioning", "nsfw"]
+          "tag" => ["content", "mentioning", "nsfw"],
+          "emoji" => %{
+            "2hu" => "corndog.png"
+          }
         },
         "published" => date,
         "context" => "2hu"
@@ -107,13 +111,14 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
       local: false
     }
 
+    expected_html = "<span>2hu</span><br />alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{mentioned_user.ap_id}\">@shp</a>"
 
     expected_status = %{
       "id" => activity.id,
       "user" => UserView.render("show.json", %{user: user, for: follower}),
       "is_local" => false,
-      "statusnet_html" => HtmlSanitizeEx.basic_html(content_html),
-      "text" => content,
+      "statusnet_html" => expected_html,
+      "text" => "2hu" <> content,
       "is_post_verb" => true,
       "created_at" => "Tue May 24 13:26:08 +0000 2016",
       "in_reply_to_status_id" => 213123,
@@ -131,7 +136,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
       "external_url" => "some url",
       "tags" => ["content", "mentioning", "nsfw"],
       "activity_type" => "post",
-      "possibly_sensitive" => true
+      "possibly_sensitive" => true,
+      "uri" => activity.data["object"]["id"]
     }
 
     assert ActivityRepresenter.to_map(activity, %{user: user, for: follower, mentioned: [mentioned_user]}) == expected_status
@@ -141,11 +147,24 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
     follower = insert(:user)
     followed = insert(:user)
 
-    {:ok, follow} = ActivityPub.follow(follower, followed)
+    {:ok, _follow} = ActivityPub.follow(follower, followed)
     {:ok, unfollow} = ActivityPub.unfollow(follower, followed)
 
     map = ActivityRepresenter.to_map(unfollow, %{user: follower})
     assert map["is_post_verb"] == false
     assert map["activity_type"] == "undo"
   end
+
+  test "a delete activity" do
+    object = insert(:note)
+    user = User.get_by_ap_id(object.data["actor"])
+
+    {:ok, delete} = ActivityPub.delete(object)
+
+    map = ActivityRepresenter.to_map(delete, %{user: user})
+
+    assert map["is_post_verb"] == false
+    assert map["activity_type"] == "delete"
+    assert map["uri"] == object.data["id"]
+  end
 end