projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ConnecitonPool deadlocking after reaching the connection limit
[akkoma]
/
test
/
tasks
/
relay_test.exs
diff --git
a/test/tasks/relay_test.exs
b/test/tasks/relay_test.exs
index 6782888545a58f6af3cb14643a09a6b366f28b4d..79ab72002fb4229a14ac127796d3a406fe235213 100644
(file)
--- a/
test/tasks/relay_test.exs
+++ b/
test/tasks/relay_test.exs
@@
-10,6
+10,8
@@
defmodule Mix.Tasks.Pleroma.RelayTest do
alias Pleroma.Web.ActivityPub.Utils
use Pleroma.DataCase
alias Pleroma.Web.ActivityPub.Utils
use Pleroma.DataCase
+ import Pleroma.Factory
+
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
@@
-46,7
+48,8
@@
defmodule Mix.Tasks.Pleroma.RelayTest do
describe "running unfollow" do
test "relay is unfollowed" do
describe "running unfollow" do
test "relay is unfollowed" do
- target_instance = "http://mastodon.example.org/users/admin"
+ user = insert(:user)
+ target_instance = user.ap_id
Mix.Tasks.Pleroma.Relay.run(["follow", target_instance])
Mix.Tasks.Pleroma.Relay.run(["follow", target_instance])
@@
-62,16
+65,16
@@
defmodule Mix.Tasks.Pleroma.RelayTest do
[undo_activity] =
ActivityPub.fetch_activities([], %{
[undo_activity] =
ActivityPub.fetch_activities([], %{
-
"type" =>
"Undo",
-
"actor_id" =>
follower_id,
-
"limit" =>
1,
-
"skip_preload" =>
true,
-
"invisible_actors" =>
true
+
type:
"Undo",
+
actor_id:
follower_id,
+
limit:
1,
+
skip_preload:
true,
+
invisible_actors:
true
})
assert undo_activity.data["type"] == "Undo"
assert undo_activity.data["actor"] == local_user.ap_id
})
assert undo_activity.data["type"] == "Undo"
assert undo_activity.data["actor"] == local_user.ap_id
- assert undo_activity.data["object"]
== cancelled_activity.data
+ assert undo_activity.data["object"]
["id"] == cancelled_activity.data["id"]
refute "#{target_instance}/followers" in User.following(local_user)
end
end
refute "#{target_instance}/followers" in User.following(local_user)
end
end