diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-30 21:23:35 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-30 21:23:35 +0300 |
| commit | d2cb18b2a342b990cc47dfdc42adb843c3db1b5e (patch) | |
| tree | 2982108b486fe8361fba5f22c53491bb265924b4 /test/web/admin_api/views | |
| parent | 657277ffc0d3d25be4376ed629057a2d2cefb2e1 (diff) | |
| parent | 66380d36d540751f59445c8a65e9747ce5475ee5 (diff) | |
| download | pleroma-d2cb18b2a342b990cc47dfdc42adb843c3db1b5e.tar.gz pleroma-d2cb18b2a342b990cc47dfdc42adb843c3db1b5e.zip | |
Merge branch 'develop' into feature/digest-email
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 |