projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: update obsolete test
[akkoma]
/
test
/
web
/
activity_pub
/
activity_pub_test.exs
diff --git
a/test/web/activity_pub/activity_pub_test.exs
b/test/web/activity_pub/activity_pub_test.exs
index 1e056b7eedac222eef7c9cc3d8ada54381aace3e..b41f6ab81e28a5a2b4111c090bf5d7459ad7bb68 100644
(file)
--- a/
test/web/activity_pub/activity_pub_test.exs
+++ b/
test/web/activity_pub/activity_pub_test.exs
@@
-10,6
+10,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.ActivityPub.Publisher
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.CommonAPI
@@
-963,12
+964,12
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
private_activity_1 = Activity.get_by_ap_id_with_object(private_activity_1.data["id"])
private_activity_1 = Activity.get_by_ap_id_with_object(private_activity_1.data["id"])
- assert [public_activity, private_activity_1, private_activity_3] ==
- activities
+ assert [public_activity, private_activity_1, private_activity_3] == activities
assert length(activities) == 3
assert length(activities) == 3
- activities = ActivityPub.contain_timeline(activities, user1)
+ activities =
+ ActivityPub.fetch_activities([user1.ap_id | user1.following], %{"user" => user1})
assert [public_activity, private_activity_1] == activities
assert length(activities) == 2
assert [public_activity, private_activity_1] == activities
assert length(activities) == 2
@@
-1057,7
+1058,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
actor = insert(:user)
inbox = "http://200.site/users/nick1/inbox"
actor = insert(:user)
inbox = "http://200.site/users/nick1/inbox"
- assert {:ok, _} =
ActivityPub
.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
+ assert {:ok, _} =
Publisher
.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
assert called(Instances.set_reachable(inbox))
end
assert called(Instances.set_reachable(inbox))
end
@@
-1070,7
+1071,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
inbox = "http://200.site/users/nick1/inbox"
assert {:ok, _} =
inbox = "http://200.site/users/nick1/inbox"
assert {:ok, _} =
-
ActivityPub
.publish_one(%{
+
Publisher
.publish_one(%{
inbox: inbox,
json: "{}",
actor: actor,
inbox: inbox,
json: "{}",
actor: actor,
@@
-1089,7
+1090,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
inbox = "http://200.site/users/nick1/inbox"
assert {:ok, _} =
inbox = "http://200.site/users/nick1/inbox"
assert {:ok, _} =
-
ActivityPub
.publish_one(%{
+
Publisher
.publish_one(%{
inbox: inbox,
json: "{}",
actor: actor,
inbox: inbox,
json: "{}",
actor: actor,
@@
-1107,8
+1108,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
actor = insert(:user)
inbox = "http://404.site/users/nick1/inbox"
actor = insert(:user)
inbox = "http://404.site/users/nick1/inbox"
- assert {:error, _} =
- ActivityPub.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
+ assert {:error, _} = Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
assert called(Instances.set_unreachable(inbox))
end
assert called(Instances.set_unreachable(inbox))
end
@@
-1120,8
+1120,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
actor = insert(:user)
inbox = "http://connrefused.site/users/nick1/inbox"
actor = insert(:user)
inbox = "http://connrefused.site/users/nick1/inbox"
- assert {:error, _} =
- ActivityPub.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
+ assert {:error, _} = Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
assert called(Instances.set_unreachable(inbox))
end
assert called(Instances.set_unreachable(inbox))
end
@@
-1133,7
+1132,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
actor = insert(:user)
inbox = "http://200.site/users/nick1/inbox"
actor = insert(:user)
inbox = "http://200.site/users/nick1/inbox"
- assert {:ok, _} =
ActivityPub
.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
+ assert {:ok, _} =
Publisher
.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
refute called(Instances.set_unreachable(inbox))
end
refute called(Instances.set_unreachable(inbox))
end
@@
-1146,7
+1145,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
inbox = "http://connrefused.site/users/nick1/inbox"
assert {:error, _} =
inbox = "http://connrefused.site/users/nick1/inbox"
assert {:error, _} =
-
ActivityPub
.publish_one(%{
+
Publisher
.publish_one(%{
inbox: inbox,
json: "{}",
actor: actor,
inbox: inbox,
json: "{}",
actor: actor,