projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize...
[akkoma]
/
test
/
pleroma
/
moderation_log_test.exs
diff --git
a/test/pleroma/moderation_log_test.exs
b/test/pleroma/moderation_log_test.exs
index fe705def17c648a20b7a0d4b100dbb4971bbca2e..d1e0e1e6b33a626a120662e156f1848055e639d9 100644
(file)
--- a/
test/pleroma/moderation_log_test.exs
+++ b/
test/pleroma/moderation_log_test.exs
@@
-6,7
+6,7
@@
defmodule Pleroma.ModerationLogTest do
alias Pleroma.Activity
alias Pleroma.ModerationLog
alias Pleroma.Activity
alias Pleroma.ModerationLog
- use Pleroma.DataCase
+ use Pleroma.DataCase
, async: true
import Pleroma.Factory
import Pleroma.Factory
@@
-182,12
+182,14
@@
defmodule Pleroma.ModerationLogTest do
end
test "logging report update", %{moderator: moderator} do
end
test "logging report update", %{moderator: moderator} do
+ user = insert(:user)
+
report = %Activity{
id: "9m9I1F4p8ftrTP6QTI",
data: %{
"type" => "Flag",
"state" => "resolved",
report = %Activity{
id: "9m9I1F4p8ftrTP6QTI",
data: %{
"type" => "Flag",
"state" => "resolved",
- "actor" =>
"http://localhost:4000/users/max"
+ "actor" =>
user.ap_id
}
}
}
}
@@
-195,13
+197,14
@@
defmodule Pleroma.ModerationLogTest do
ModerationLog.insert_log(%{
actor: moderator,
action: "report_update",
ModerationLog.insert_log(%{
actor: moderator,
action: "report_update",
- subject: report
+ subject: report,
+ subject_actor: user
})
log = Repo.one(ModerationLog)
assert log.data["message"] ==
})
log = Repo.one(ModerationLog)
assert log.data["message"] ==
- "@#{moderator.nickname} updated report ##{report.id} with 'resolved' state"
+ "@#{moderator.nickname} updated report ##{report.id}
(on user @#{user.nickname})
with 'resolved' state"
end
test "logging report response", %{moderator: moderator} do
end
test "logging report response", %{moderator: moderator} do