X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Frepresenters%2Factivity_representer_test.exs;h=98a1705b09fd4bc4df9bd87be50a4023eacc3c2c;hb=e30752bc79d9e03a64c83a7990a7afdcb0176a07;hp=906f8dd98ea3e9a0128ff56cb90954df4acca869;hpb=fcf3128a5687d1ad7883772585933d8c475863db;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 906f8dd98..98a1705b0 100644
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -70,27 +70,28 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
}
}
- content_html = "Some content mentioning @shp"
+ content_html = "Some :2hu: content mentioning @shp"
content = HtmlSanitizeEx.strip_tags(content_html)
date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601
{:ok, convo_object} = Object.context_mapping("2hu") |> Repo.insert
-
+ to = [
+ User.ap_followers(user),
+ "https://www.w3.org/ns/activitystreams#Public",
+ mentioned_user.ap_id
+ ]
activity = %Activity{
id: 1,
data: %{
"type" => "Create",
"id" => "id",
- "to" => [
- User.ap_followers(user),
- "https://www.w3.org/ns/activitystreams#Public",
- mentioned_user.ap_id
- ],
+ "to" => to,
"actor" => User.ap_id(user),
"object" => %{
"published" => date,
"type" => "Note",
"content" => content_html,
+ "summary" => "2hu",
"inReplyToStatusId" => 213123,
"attachment" => [
object
@@ -99,21 +100,26 @@ 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"
},
- local: false
+ local: false,
+ recipients: to
}
+ expected_html = "2hu
alert('YAY')Some content mentioning @shp"
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,
@@ -129,9 +135,10 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"favorited" => false,
"repeated" => false,
"external_url" => "some url",
- "tags" => ["content", "mentioning", "nsfw"],
+ "tags" => ["nsfw", "content", "mentioning"],
"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,7 +148,7 @@ 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})
@@ -159,6 +166,6 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
assert map["is_post_verb"] == false
assert map["activity_type"] == "delete"
- assert map["id"] == object.data["id"]
+ assert map["uri"] == object.data["id"]
end
end