diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-30 12:21:16 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-30 12:21:16 +0000 |
| commit | 905bb11747fb87f2ad960175e1fc73aa0e3657a0 (patch) | |
| tree | c92908b5d32c4f84f98807b655c726e0d5a88674 /test/web/admin_api | |
| parent | 3f0e276ac94589d860c7e4c95d3661fa494f4361 (diff) | |
| parent | c55facf78b6714947d8c5b02b76846f5f2ae7744 (diff) | |
| download | pleroma-905bb11747fb87f2ad960175e1fc73aa0e3657a0.tar.gz pleroma-905bb11747fb87f2ad960175e1fc73aa0e3657a0.zip | |
Merge branch 'split-masto-api/accounts' into 'develop'
Extract account actions from `MastodonAPIController` to `AccountController`
See merge request pleroma/pleroma!1731
Diffstat (limited to 'test/web/admin_api')
| -rw-r--r-- | test/web/admin_api/views/report_view_test.exs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/web/admin_api/views/report_view_test.exs b/test/web/admin_api/views/report_view_test.exs index 35b6947a0..475705857 100644 --- a/test/web/admin_api/views/report_view_test.exs +++ b/test/web/admin_api/views/report_view_test.exs @@ -21,12 +21,12 @@ defmodule Pleroma.Web.AdminAPI.ReportViewTest do content: nil, actor: Map.merge( - AccountView.render("account.json", %{user: user}), + AccountView.render("show.json", %{user: user}), Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: user}) ), account: Map.merge( - AccountView.render("account.json", %{user: other_user}), + AccountView.render("show.json", %{user: other_user}), Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: other_user}) ), statuses: [], @@ -53,12 +53,12 @@ defmodule Pleroma.Web.AdminAPI.ReportViewTest do content: nil, actor: Map.merge( - AccountView.render("account.json", %{user: user}), + AccountView.render("show.json", %{user: user}), Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: user}) ), account: Map.merge( - AccountView.render("account.json", %{user: other_user}), + AccountView.render("show.json", %{user: other_user}), Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: other_user}) ), statuses: [StatusView.render("show.json", %{activity: activity})], |