projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'static-accept-missing' into 'develop'
[akkoma]
/
test
/
web
/
admin_api
/
views
/
report_view_test.exs
diff --git
a/test/web/admin_api/views/report_view_test.exs
b/test/web/admin_api/views/report_view_test.exs
index 40df011015d8a2350e0c97986e4856c699f8c56f..5db6629f2298f0a629dfdd341b82fa2e20cd2c9d 100644
(file)
--- a/
test/web/admin_api/views/report_view_test.exs
+++ b/
test/web/admin_api/views/report_view_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ReportViewTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ReportViewTest do
@@
-21,15
+21,16
@@
defmodule Pleroma.Web.AdminAPI.ReportViewTest do
content: nil,
actor:
Map.merge(
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(
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: [],
Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: other_user})
),
statuses: [],
+ notes: [],
state: "open",
id: activity.id
}
state: "open",
id: activity.id
}
@@
-49,20
+50,23
@@
defmodule Pleroma.Web.AdminAPI.ReportViewTest do
{:ok, report_activity} =
CommonAPI.report(user, %{"account_id" => other_user.id, "status_ids" => [activity.id]})
{:ok, report_activity} =
CommonAPI.report(user, %{"account_id" => other_user.id, "status_ids" => [activity.id]})
+ other_user = Pleroma.User.get_by_id(other_user.id)
+
expected = %{
content: nil,
actor:
Map.merge(
expected = %{
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(
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})
),
Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: other_user})
),
- statuses: [StatusView.render("s
tatus
.json", %{activity: activity})],
+ statuses: [StatusView.render("s
how
.json", %{activity: activity})],
state: "open",
state: "open",
+ notes: [],
id: report_activity.id
}
id: report_activity.id
}