diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-09-30 19:10:54 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-09-30 19:10:54 +0700 |
| commit | e7aef27c0011d3fd0b569ebdb9196a1e011eae5d (patch) | |
| tree | 2cfe7b23d75256ccde619b6cc1b4b6a9f813dfc8 /test/web/admin_api | |
| parent | 3f0e276ac94589d860c7e4c95d3661fa494f4361 (diff) | |
| download | pleroma-e7aef27c0011d3fd0b569ebdb9196a1e011eae5d.tar.gz | |
Fix merge
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})], |