diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-28 10:32:03 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-28 10:36:04 +0300 |
| commit | 1053319cd64a0eab40fab6dc9ce3a1b78711069b (patch) | |
| tree | 3d613f7c6129f667ea16aedfe46259d9ca6bde29 /test/web/admin_api | |
| parent | 73ae38ca04df02656bfb239ceba4ffe64879e927 (diff) | |
| parent | 50ab06435353144582f6afbf37402aef13c2b3f1 (diff) | |
| download | pleroma-1053319cd64a0eab40fab6dc9ce3a1b78711069b.tar.gz pleroma-1053319cd64a0eab40fab6dc9ce3a1b78711069b.zip | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
Diffstat (limited to 'test/web/admin_api')
| -rw-r--r-- | test/web/admin_api/views/report_view_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/admin_api/views/report_view_test.exs b/test/web/admin_api/views/report_view_test.exs index 40df01101..35b6947a0 100644 --- a/test/web/admin_api/views/report_view_test.exs +++ b/test/web/admin_api/views/report_view_test.exs @@ -61,7 +61,7 @@ defmodule Pleroma.Web.AdminAPI.ReportViewTest do AccountView.render("account.json", %{user: other_user}), Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: other_user}) ), - statuses: [StatusView.render("status.json", %{activity: activity})], + statuses: [StatusView.render("show.json", %{activity: activity})], state: "open", id: report_activity.id } |