diff options
| author | Francis Dinh <normandy@firemail.cc> | 2018-05-20 19:17:15 -0400 |
|---|---|---|
| committer | Francis Dinh <normandy@firemail.cc> | 2018-05-20 19:17:15 -0400 |
| commit | 1afd6d37bd2febb58ee09d273b9c7d690022d3c3 (patch) | |
| tree | 8be53801457cae7e31f7efdb501b81974ca3b36f /test/web/twitter_api/representers | |
| parent | d46393f6efd6475bb20b6a12a7c6ebf800f6c5b5 (diff) | |
| parent | 961f1312571843209487cc1caa9355fa6552d965 (diff) | |
| download | pleroma-1afd6d37bd2febb58ee09d273b9c7d690022d3c3.tar.gz pleroma-1afd6d37bd2febb58ee09d273b9c7d690022d3c3.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
Fixed some conflicts in transmogrifier.ex
Diffstat (limited to 'test/web/twitter_api/representers')
| -rw-r--r-- | test/web/twitter_api/representers/activity_representer_test.exs | 3 |
1 files changed, 2 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 bb47d4409..16c6e7b0d 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -154,7 +154,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do "tags" => ["nsfw", "content", "mentioning"], "activity_type" => "post", "possibly_sensitive" => true, - "uri" => activity.data["object"]["id"] + "uri" => activity.data["object"]["id"], + "visibility" => "direct" } assert ActivityRepresenter.to_map(activity, %{ |