diff options
| author | lain <lain@soykaf.club> | 2019-10-02 13:27:55 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-02 13:27:55 +0200 |
| commit | 557223b2b5b60956d3e1a19e9fdae9e9798c4fe2 (patch) | |
| tree | 71d711f8932a2bd952f9f54ccef1322c55aed1d7 /test/web/admin_api | |
| parent | 19bc0b8c79765dc485e081651a4e4c589d18b970 (diff) | |
| parent | 433f2c0f6854d2838819e08f0fb0a9e8cf058021 (diff) | |
| download | pleroma-557223b2b5b60956d3e1a19e9fdae9e9798c4fe2.tar.gz pleroma-557223b2b5b60956d3e1a19e9fdae9e9798c4fe2.zip | |
Merge remote-tracking branch 'origin/develop' into reactions
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})], |