projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/store-statuses-data-inside-flag
[akkoma]
/
test
/
web
/
activity_pub
/
transmogrifier_test.exs
diff --git
a/test/web/activity_pub/transmogrifier_test.exs
b/test/web/activity_pub/transmogrifier_test.exs
index 6f7e1da1f65fc9eea293dd307efba4e0df3bf970..1069ade02a0e8751ba11502b1c6a6fd696073265 100644
(file)
--- a/
test/web/activity_pub/transmogrifier_test.exs
+++ b/
test/web/activity_pub/transmogrifier_test.exs
@@
-11,6
+11,7
@@
defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Transmogrifier
+ alias Pleroma.Web.AdminAPI.AccountView
alias Pleroma.Web.CommonAPI
import Mock
alias Pleroma.Web.CommonAPI
import Mock
@@
-1090,10
+1091,18
@@
defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
{:ok, activity} = CommonAPI.post(user, %{"status" => "test post"})
object = Object.normalize(activity)
{:ok, activity} = CommonAPI.post(user, %{"status" => "test post"})
object = Object.normalize(activity)
+ note_obj = %{
+ "type" => "Note",
+ "id" => activity.data["id"],
+ "content" => "test post",
+ "published" => object.data["published"],
+ "actor" => AccountView.render("show.json", %{user: user})
+ }
+
message = %{
"@context" => "https://www.w3.org/ns/activitystreams",
"cc" => [user.ap_id],
message = %{
"@context" => "https://www.w3.org/ns/activitystreams",
"cc" => [user.ap_id],
- "object" => [user.ap_id,
object.data["id"]
],
+ "object" => [user.ap_id,
activity
],
"type" => "Flag",
"content" => "blocked AND reported!!!",
"actor" => other_user.ap_id
"type" => "Flag",
"content" => "blocked AND reported!!!",
"actor" => other_user.ap_id
@@
-1101,7
+1110,7
@@
defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
assert {:ok, activity} = Transmogrifier.handle_incoming(message)
assert {:ok, activity} = Transmogrifier.handle_incoming(message)
- assert activity.data["object"] == [user.ap_id,
object.data["id"]
]
+ assert activity.data["object"] == [user.ap_id,
note_obj
]
assert activity.data["content"] == "blocked AND reported!!!"
assert activity.data["actor"] == other_user.ap_id
assert activity.data["cc"] == [user.ap_id]
assert activity.data["content"] == "blocked AND reported!!!"
assert activity.data["actor"] == other_user.ap_id
assert activity.data["cc"] == [user.ap_id]