diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-01-29 05:11:08 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-01-29 05:11:08 +0000 |
| commit | ebb3496386c1e195b48bcdc9d72c4c30e60fe340 (patch) | |
| tree | 47e7c0be6bcf4615e9dd3db7ad66a2f65757c69f /test/web/twitter_api | |
| parent | 009273fd6e4d14601ebd9f02f2fd797716f774ed (diff) | |
| parent | 61d6715714fe9c2ce6bf4fe6afc353f7fe5502a6 (diff) | |
| download | pleroma-ebb3496386c1e195b48bcdc9d72c4c30e60fe340.tar.gz pleroma-ebb3496386c1e195b48bcdc9d72c4c30e60fe340.zip | |
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
Rich Media support, part 2.
See merge request pleroma/pleroma!719
Diffstat (limited to 'test/web/twitter_api')
| -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 | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index ef0294140..ea5813733 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -164,6 +164,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do "possibly_sensitive" => true, "uri" => activity.data["object"]["id"], "visibility" => "direct", + "card" => nil, "summary" => "2hu :2hu:", "summary_html" => "2hu <img height=\"32px\" width=\"32px\" alt=\"2hu\" title=\"2hu\" src=\"corndog.png\" />" diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs index ba053d20d..4f854ecaa 100644 --- a/test/web/twitter_api/views/activity_view_test.exs +++ b/test/web/twitter_api/views/activity_view_test.exs @@ -148,7 +148,8 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do "text" => "Hey @shp!", "uri" => activity.data["object"]["id"], "user" => UserView.render("show.json", %{user: user}), - "visibility" => "direct" + "visibility" => "direct", + "card" => nil } assert result == expected |