diff options
| author | lain <lain@soykaf.club> | 2019-05-15 17:47:29 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-05-15 17:47:29 +0200 |
| commit | f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9 (patch) | |
| tree | 3c208baf52e27859491cce07954ac9b1198cbc8f /test/web/twitter_api/views | |
| parent | 786f2c7a849bc4fa2bd4aac18de59ef6b2ed18c5 (diff) | |
| parent | 62516be9c462ca206163eaf7822f9ee5c2470453 (diff) | |
| download | pleroma-f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9.tar.gz pleroma-f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9.zip | |
Merge remote-tracking branch 'origin/develop' into conversations-import
Diffstat (limited to 'test/web/twitter_api/views')
| -rw-r--r-- | test/web/twitter_api/views/activity_view_test.exs | 4 |
1 files changed, 2 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 1aa533b48..43bd77f78 100644 --- a/test/web/twitter_api/views/activity_view_test.exs +++ b/test/web/twitter_api/views/activity_view_test.exs @@ -295,8 +295,8 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do "id" => announce.id, "is_local" => true, "is_post_verb" => false, - "statusnet_html" => "shp retweeted a status.", - "text" => "shp retweeted a status.", + "statusnet_html" => "shp repeated a status.", + "text" => "shp repeated a status.", "uri" => "tag:#{announce.data["id"]}:objectType=note", "user" => UserView.render("show.json", user: other_user), "retweeted_status" => ActivityView.render("activity.json", activity: activity), |