summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/views
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-07-12 16:45:57 +0000
committerlambda <pleromagit@rogerbraun.net>2018-07-12 16:45:57 +0000
commitcbef1030b736636f9fb5a058b737f9308fefdd35 (patch)
tree9b8e79a6705ff4134af47fba32eaecd632ef1218 /test/web/twitter_api/views
parentfe4387077ad8845ef74c49338b7f492475697591 (diff)
parentb832df1e158aa945a3c481804da0a839f18d46c5 (diff)
downloadpleroma-cbef1030b736636f9fb5a058b737f9308fefdd35.tar.gz
pleroma-cbef1030b736636f9fb5a058b737f9308fefdd35.zip
Merge branch 'feature/message-summary' into 'develop'
message summary See merge request pleroma/pleroma!249
Diffstat (limited to 'test/web/twitter_api/views')
-rw-r--r--test/web/twitter_api/views/activity_view_test.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs
index 5b2a7466b..a101e4ae8 100644
--- a/test/web/twitter_api/views/activity_view_test.exs
+++ b/test/web/twitter_api/views/activity_view_test.exs
@@ -48,7 +48,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",
+ "summary" => nil
}
assert result == expected