X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Frepresenters%2Factivity_representer_test.exs;h=64e7f0641b33148ef1a8de95fbd16569031a5f73;hb=16f8406eb60562b961536ecfabecde8e15160aa6;hp=a9129bcccd1bb1ae30fd3290e7d20639109ce91a;hpb=60c60de330fe8fe03594da89831351099c8c9037;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 a9129bccc..64e7f0641 100644
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -45,8 +45,11 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
test "an activity" do
{:ok, user} = UserBuilder.insert
- {:ok, mentioned_user } = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
- {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
+ # {:ok, mentioned_user } = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
+ mentioned_user = insert(:user, %{nickname: "shp"})
+
+ # {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
+ follower = insert(:user, %{following: [User.ap_followers(user)]})
object = %Object{
data: %{
@@ -62,10 +65,12 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
}
}
- content_html = "Some content mentioning @shp"
+ content_html = "Some 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
+
activity = %Activity{
id: 1,
data: %{
@@ -81,14 +86,15 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"type" => "Note",
"content" => content_html,
"inReplyToStatusId" => 213123,
- "statusnetConversationId" => 4711,
"attachment" => [
object
],
"like_count" => 5,
- "announcement_count" => 3
+ "announcement_count" => 3,
+ "context" => "2hu"
},
- "published" => date
+ "published" => date,
+ "context" => "2hu"
}
}
@@ -103,7 +109,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"is_post_verb" => true,
"created_at" => "Tue May 24 13:26:08 +0000 2016",
"in_reply_to_status_id" => 213123,
- "statusnet_conversation_id" => 4711,
+ "statusnet_conversation_id" => convo_object.id,
"attachments" => [
ObjectRepresenter.to_map(object)
],