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 issue/1276
[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 d920b969a8569989751ed458291671e72b618465..4645eb39d9e1159dda48f0b07eb2d39cfcb57089 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
@@
-746,7
+747,10
@@
defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
|> Poison.decode!()
|> Map.put("actor", ap_id)
|> Poison.decode!()
|> Map.put("actor", ap_id)
- assert :error == Transmogrifier.handle_incoming(data)
+ assert capture_log(fn ->
+ assert :error == Transmogrifier.handle_incoming(data)
+ end) =~ "Object containment failed"
+
assert User.get_cached_by_ap_id(ap_id)
end
assert User.get_cached_by_ap_id(ap_id)
end
@@
-1109,10
+1113,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
.data["id"]],
"type" => "Flag",
"content" => "blocked AND reported!!!",
"actor" => other_user.ap_id
"type" => "Flag",
"content" => "blocked AND reported!!!",
"actor" => other_user.ap_id
@@
-1120,7
+1132,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]
@@
-1428,7
+1440,9
@@
defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
"type" => "Announce"
}
"type" => "Announce"
}
- :error = Transmogrifier.handle_incoming(data)
+ assert capture_log(fn ->
+ :error = Transmogrifier.handle_incoming(data)
+ end) =~ "Object containment failed"
end
test "it rejects activities which reference objects that have an incorrect attribution (variant 1)" do
end
test "it rejects activities which reference objects that have an incorrect attribution (variant 1)" do
@@
-1441,7
+1455,9
@@
defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
"type" => "Announce"
}
"type" => "Announce"
}
- :error = Transmogrifier.handle_incoming(data)
+ assert capture_log(fn ->
+ :error = Transmogrifier.handle_incoming(data)
+ end) =~ "Object containment failed"
end
test "it rejects activities which reference objects that have an incorrect attribution (variant 2)" do
end
test "it rejects activities which reference objects that have an incorrect attribution (variant 2)" do
@@
-1454,7
+1470,9
@@
defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
"type" => "Announce"
}
"type" => "Announce"
}
- :error = Transmogrifier.handle_incoming(data)
+ assert capture_log(fn ->
+ :error = Transmogrifier.handle_incoming(data)
+ end) =~ "Object containment failed"
end
end
end
end
@@
-1757,7
+1775,9
@@
defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
describe "get_obj_helper/2" do
test "returns nil when cannot normalize object" do
describe "get_obj_helper/2" do
test "returns nil when cannot normalize object" do
- refute Transmogrifier.get_obj_helper("test-obj-id")
+ assert capture_log(fn ->
+ refute Transmogrifier.get_obj_helper("test-obj-id")
+ end) =~ "Unsupported URI scheme"
end
test "returns {:ok, %Object{}} for success case" do
end
test "returns {:ok, %Object{}} for success case" do