diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-06-28 15:15:32 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-06-28 15:15:32 +0300 |
| commit | 452ca5250d7f7eeb51804d885122a60c8c4b84bf (patch) | |
| tree | 4214d18102740d89ce9ded259a2787b5fdb9f8d8 /test/web/admin_api/views | |
| parent | 0369a5db16c33e9fc9dafffaae1e3109d92b7468 (diff) | |
| download | pleroma-452ca5250d7f7eeb51804d885122a60c8c4b84bf.tar.gz pleroma-452ca5250d7f7eeb51804d885122a60c8c4b84bf.zip | |
Merge admin and mastodon user views for reports
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 |