diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-25 03:11:19 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-25 03:11:19 +0000 |
| commit | a8137159c2363ec842b14f72288b26cf677f6f6a (patch) | |
| tree | dcb390d926a2b94085be706a183db77b95d61ab2 /test | |
| parent | 4b2a586942edd5510e1835d57149387292052523 (diff) | |
| parent | 9563f3766d45e6c95fe50e371bc0048d9f4a2452 (diff) | |
| download | pleroma-a8137159c2363ec842b14f72288b26cf677f6f6a.tar.gz pleroma-a8137159c2363ec842b14f72288b26cf677f6f6a.zip | |
Merge branch 'feature/in-reply-to-screen-name' into 'develop'
initial graph traversal support
Closes #68
See merge request pleroma/pleroma!387
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/twitter_api/representers/activity_representer_test.exs | 1 | ||||
| -rw-r--r-- | test/web/twitter_api/views/activity_view_test.exs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index 894d20049..ae6f62ed0 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -139,6 +139,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" => 213_123, + "in_reply_to_screen_name" => nil, "statusnet_conversation_id" => convo_object.id, "attachments" => [ ObjectRepresenter.to_map(object) diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs index b9a8efdad..3ab87d6fa 100644 --- a/test/web/twitter_api/views/activity_view_test.exs +++ b/test/web/twitter_api/views/activity_view_test.exs @@ -36,6 +36,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do "favorited" => false, "id" => activity.id, "in_reply_to_status_id" => nil, + "in_reply_to_screen_name" => nil, "is_local" => true, "is_post_verb" => true, "possibly_sensitive" => false, |