projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-streaming' into 'develop'
[akkoma]
/
test
/
web
/
federator_test.exs
diff --git
a/test/web/federator_test.exs
b/test/web/federator_test.exs
index 59e53bb039f576d626fca9970275a0f7680f4261..de90aa6e055af94b277cb8eded78a590c3104e47 100644
(file)
--- a/
test/web/federator_test.exs
+++ b/
test/web/federator_test.exs
@@
-29,7
+29,7
@@
defmodule Pleroma.Web.FederatorTest do
describe "Publish an activity" do
setup do
user = insert(:user)
describe "Publish an activity" do
setup do
user = insert(:user)
- {:ok, activity} = CommonAPI.post(user, %{
"status" =>
"HI"})
+ {:ok, activity} = CommonAPI.post(user, %{
status:
"HI"})
relay_mock = {
Pleroma.Web.ActivityPub.Relay,
relay_mock = {
Pleroma.Web.ActivityPub.Relay,
@@
-96,7
+96,7
@@
defmodule Pleroma.Web.FederatorTest do
Instances.set_consistently_unreachable(URI.parse(inbox2).host)
{:ok, _activity} =
Instances.set_consistently_unreachable(URI.parse(inbox2).host)
{:ok, _activity} =
- CommonAPI.post(user, %{
"status" =>
"HI @nick1@domain.com, @nick2@domain2.com!"})
+ CommonAPI.post(user, %{
status:
"HI @nick1@domain.com, @nick2@domain2.com!"})
expected_dt = NaiveDateTime.to_iso8601(dt)
expected_dt = NaiveDateTime.to_iso8601(dt)
@@
-130,6
+130,9
@@
defmodule Pleroma.Web.FederatorTest do
assert {:ok, job} = Federator.incoming_ap_doc(params)
assert {:ok, _activity} = ObanHelpers.perform(job)
assert {:ok, job} = Federator.incoming_ap_doc(params)
assert {:ok, _activity} = ObanHelpers.perform(job)
+
+ assert {:ok, job} = Federator.incoming_ap_doc(params)
+ assert {:error, :already_present} = ObanHelpers.perform(job)
end
test "rejects incoming AP docs with incorrect origin" do
end
test "rejects incoming AP docs with incorrect origin" do
@@
-148,7
+151,7
@@
defmodule Pleroma.Web.FederatorTest do
}
assert {:ok, job} = Federator.incoming_ap_doc(params)
}
assert {:ok, job} = Federator.incoming_ap_doc(params)
- assert
:error
= ObanHelpers.perform(job)
+ assert
{:error, :origin_containment_failed}
= ObanHelpers.perform(job)
end
test "it does not crash if MRF rejects the post" do
end
test "it does not crash if MRF rejects the post" do
@@
-164,7
+167,7
@@
defmodule Pleroma.Web.FederatorTest do
|> Poison.decode!()
assert {:ok, job} = Federator.incoming_ap_doc(params)
|> Poison.decode!()
assert {:ok, job} = Federator.incoming_ap_doc(params)
- assert
:error
= ObanHelpers.perform(job)
+ assert
{:error, _}
= ObanHelpers.perform(job)
end
end
end
end
end
end