projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'object-age-fix' into 'develop'
[akkoma]
/
test
/
web
/
federator_test.exs
diff --git
a/test/web/federator_test.exs
b/test/web/federator_test.exs
index da844c24c2a7a8598a884685dbd039636c667b5b..592fdccd19168a86f3c42ff95f448a5c13df977a 100644
(file)
--- a/
test/web/federator_test.exs
+++ b/
test/web/federator_test.exs
@@
-23,13
+23,13
@@
defmodule Pleroma.Web.FederatorTest do
setup_all do: clear_config([:instance, :federating], true)
setup do: clear_config([:instance, :allow_relay])
setup_all do: clear_config([:instance, :federating], true)
setup do: clear_config([:instance, :allow_relay])
- setup do: clear_config([:
instance, :rewrite_policy
])
+ setup do: clear_config([:
mrf, :policies
])
setup do: clear_config([:mrf_keyword])
describe "Publish an activity" do
setup do
user = insert(:user)
setup do: clear_config([:mrf_keyword])
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,
@@
-78,7
+78,7
@@
defmodule Pleroma.Web.FederatorTest do
local: false,
nickname: "nick1@domain.com",
ap_id: "https://domain.com/users/nick1",
local: false,
nickname: "nick1@domain.com",
ap_id: "https://domain.com/users/nick1",
-
source_data: %{"inbox" => inbox1}
,
+
inbox: inbox1
,
ap_enabled: true
})
ap_enabled: true
})
@@
-86,7
+86,7
@@
defmodule Pleroma.Web.FederatorTest do
local: false,
nickname: "nick2@domain2.com",
ap_id: "https://domain2.com/users/nick2",
local: false,
nickname: "nick2@domain2.com",
ap_id: "https://domain2.com/users/nick2",
-
source_data: %{"inbox" => inbox2}
,
+
inbox: inbox2
,
ap_enabled: true
})
ap_enabled: true
})
@@
-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,14
+151,14
@@
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
Pleroma.Config.put([:mrf_keyword, :reject], ["lain"])
Pleroma.Config.put(
end
test "it does not crash if MRF rejects the post" do
Pleroma.Config.put([:mrf_keyword, :reject], ["lain"])
Pleroma.Config.put(
- [:
instance, :rewrite_policy
],
+ [:
mrf, :policies
],
Pleroma.Web.ActivityPub.MRF.KeywordPolicy
)
Pleroma.Web.ActivityPub.MRF.KeywordPolicy
)
@@
-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