diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-23 12:14:41 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-23 12:14:41 +0000 |
| commit | 5067b791a124960e3561ff77065a36d45abd2552 (patch) | |
| tree | 38cf094a6405c147fe5d8cff3be173f2379166d9 /test/web/mastodon_api | |
| parent | b624b7a150c813722c4ffe82112c03e246fb5760 (diff) | |
| parent | 2de208817c04d9a48aaf0fdaf887dd0e10d15907 (diff) | |
| download | pleroma-5067b791a124960e3561ff77065a36d45abd2552.tar.gz pleroma-5067b791a124960e3561ff77065a36d45abd2552.zip | |
Merge branch 'rename/pleroma_activity_consistency' into 'develop'
Consistent fonction names in Pleroma.Activity
See merge request pleroma/pleroma!690
Diffstat (limited to 'test/web/mastodon_api')
| -rw-r--r-- | test/web/mastodon_api/status_view_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index d30ae6149..e33479368 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -202,7 +202,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do "https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3" ) - %Activity{} = activity = Activity.get_create_activity_by_object_ap_id(object.data["id"]) + %Activity{} = activity = Activity.get_create_by_object_ap_id(object.data["id"]) represented = StatusView.render("status.json", %{for: user, activity: activity}) |