diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-29 00:12:09 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-29 00:12:09 +0000 |
| commit | d1549a6375a1c5a4a4915241df266665b7d99360 (patch) | |
| tree | 47409c02a5cdeb270126a42f6cd6b113d2ade4c6 /test/web/admin_api/views | |
| parent | f375c2fd700d09da8de831b955731acbb604cf79 (diff) | |
| parent | 90927e6a9a7b29f3a12335fd8b7ba899dcc0dffd (diff) | |
| download | pleroma-d1549a6375a1c5a4a4915241df266665b7d99360.tar.gz pleroma-d1549a6375a1c5a4a4915241df266665b7d99360.zip | |
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346
Diffstat (limited to 'test/web/admin_api/views')
| -rw-r--r-- | test/web/admin_api/views/report_view_test.exs | 24 |
1 files changed, 20 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 f35f36cac..75d8bb4b5 100644 --- a/test/web/admin_api/views/report_view_test.exs +++ b/test/web/admin_api/views/report_view_test.exs @@ -18,8 +18,16 @@ defmodule Pleroma.Web.AdminAPI.ReportViewTest do expected = %{ content: nil, - actor: AccountView.render("account.json", %{user: user}), - account: AccountView.render("account.json", %{user: other_user}), + actor: + Map.merge( + AccountView.render("account.json", %{user: user}), + Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: user}) + ), + account: + Map.merge( + AccountView.render("account.json", %{user: other_user}), + Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: other_user}) + ), statuses: [], state: "open", id: activity.id @@ -42,8 +50,16 @@ defmodule Pleroma.Web.AdminAPI.ReportViewTest do expected = %{ content: nil, - actor: AccountView.render("account.json", %{user: user}), - account: AccountView.render("account.json", %{user: other_user}), + actor: + Map.merge( + AccountView.render("account.json", %{user: user}), + Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: user}) + ), + account: + Map.merge( + AccountView.render("account.json", %{user: other_user}), + Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: other_user}) + ), statuses: [StatusView.render("status.json", %{activity: activity})], state: "open", id: report_activity.id |