projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix getting videos from peertube
[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..f00b0afb2a71786e6fee2521daf0c0f5cbd4943a 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
@@
-15,21
+15,22
@@
defmodule Pleroma.Web.AdminAPI.ReportViewTest do
user = insert(:user)
other_user = insert(:user)
user = insert(:user)
other_user = insert(:user)
- {:ok, activity} = CommonAPI.report(user, %{
"account_id" =>
other_user.id})
+ {:ok, activity} = CommonAPI.report(user, %{
account_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})
),
statuses: [],
Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: other_user})
),
statuses: [],
+ notes: [],
state: "open",
id: activity.id
}
state: "open",
id: activity.id
}
@@
-44,25
+45,28
@@
defmodule Pleroma.Web.AdminAPI.ReportViewTest do
test "includes reported statuses" do
user = insert(:user)
other_user = insert(:user)
test "includes reported statuses" do
user = insert(:user)
other_user = insert(:user)
- {:ok, activity} = CommonAPI.post(other_user, %{
"status" =>
"toot"})
+ {:ok, activity} = CommonAPI.post(other_user, %{
status:
"toot"})
{:ok, report_activity} =
{:ok, report_activity} =
- CommonAPI.report(user, %{"account_id" => other_user.id, "status_ids" => [activity.id]})
+ 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
}
@@
-77,7
+81,7
@@
defmodule Pleroma.Web.AdminAPI.ReportViewTest do
user = insert(:user)
other_user = insert(:user)
user = insert(:user)
other_user = insert(:user)
- {:ok, activity} = CommonAPI.report(user, %{
"account_id" =>
other_user.id})
+ {:ok, activity} = CommonAPI.report(user, %{
account_id:
other_user.id})
{:ok, activity} = CommonAPI.update_report_state(activity.id, "closed")
assert %{state: "closed"} =
{:ok, activity} = CommonAPI.update_report_state(activity.id, "closed")
assert %{state: "closed"} =
@@
-90,8
+94,8
@@
defmodule Pleroma.Web.AdminAPI.ReportViewTest do
{:ok, activity} =
CommonAPI.report(user, %{
{:ok, activity} =
CommonAPI.report(user, %{
-
"account_id" =>
other_user.id,
-
"comment" =>
"posts are too good for this instance"
+
account_id:
other_user.id,
+
comment:
"posts are too good for this instance"
})
assert %{content: "posts are too good for this instance"} =
})
assert %{content: "posts are too good for this instance"} =
@@
-104,8
+108,8
@@
defmodule Pleroma.Web.AdminAPI.ReportViewTest do
{:ok, activity} =
CommonAPI.report(user, %{
{:ok, activity} =
CommonAPI.report(user, %{
-
"account_id" =>
other_user.id,
-
"comment" =>
""
+
account_id:
other_user.id,
+
comment:
""
})
data = Map.put(activity.data, "content", "<script> alert('hecked :D:D:D:D:D:D:D') </script>")
})
data = Map.put(activity.data, "content", "<script> alert('hecked :D:D:D:D:D:D:D') </script>")
@@
-121,8
+125,8
@@
defmodule Pleroma.Web.AdminAPI.ReportViewTest do
{:ok, activity} =
CommonAPI.report(user, %{
{:ok, activity} =
CommonAPI.report(user, %{
-
"account_id" =>
other_user.id,
-
"comment" =>
""
+
account_id:
other_user.id,
+
comment:
""
})
Pleroma.User.delete(other_user)
})
Pleroma.User.delete(other_user)