diff options
author | kaniini <ariadne@dereferenced.org> | 2019-09-27 04:37:48 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-09-27 04:37:48 +0000 |
commit | 91e2bcf218e0bfda7a1f1e355754147099063356 (patch) | |
tree | 6d791b64c4b6e8cfb35a19f057e7f65c150feff1 /test/web/admin_api | |
parent | eb9aa7aa1095de150d036839c78c402019efb4b1 (diff) | |
parent | 5ea5c58a85b7be56370b151ce8977982d47fde8c (diff) | |
download | pleroma-91e2bcf218e0bfda7a1f1e355754147099063356.tar.gz pleroma-91e2bcf218e0bfda7a1f1e355754147099063356.zip |
Merge branch 'refactor/status-controller' into 'develop'
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
Diffstat (limited to 'test/web/admin_api')
-rw-r--r-- | test/web/admin_api/views/report_view_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/admin_api/views/report_view_test.exs b/test/web/admin_api/views/report_view_test.exs index 40df01101..35b6947a0 100644 --- a/test/web/admin_api/views/report_view_test.exs +++ b/test/web/admin_api/views/report_view_test.exs @@ -61,7 +61,7 @@ defmodule Pleroma.Web.AdminAPI.ReportViewTest do AccountView.render("account.json", %{user: other_user}), Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: other_user}) ), - statuses: [StatusView.render("status.json", %{activity: activity})], + statuses: [StatusView.render("show.json", %{activity: activity})], state: "open", id: report_activity.id } |