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/views | |
| 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/views')
| -rw-r--r-- | test/web/twitter_api/views/activity_view_test.exs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs index 7f2017d3c..5b2a7466b 100644 --- a/test/web/twitter_api/views/activity_view_test.exs +++ b/test/web/twitter_api/views/activity_view_test.exs @@ -18,7 +18,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do user = insert(:user) other_user = insert(:user, %{nickname: "shp"}) - {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"}) + {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!", "visibility" => "direct"}) result = ActivityView.render("activity.json", activity: activity) @@ -47,7 +47,8 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do "tags" => [], "text" => "Hey @shp!", "uri" => activity.data["object"]["id"], - "user" => UserView.render("show.json", %{user: user}) + "user" => UserView.render("show.json", %{user: user}), + "visibility" => "direct" } assert result == expected |