projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
[akkoma]
/
test
/
web
/
activity_pub
/
relay_test.exs
diff --git
a/test/web/activity_pub/relay_test.exs
b/test/web/activity_pub/relay_test.exs
index 9e16e39c445afd311e4d856e86d79e9a6e6497e9..dbee8a0f48122df39087a0ed391754505c51cfce 100644
(file)
--- a/
test/web/activity_pub/relay_test.exs
+++ b/
test/web/activity_pub/relay_test.exs
@@
-6,7
+6,6
@@
defmodule Pleroma.Web.ActivityPub.RelayTest do
use Pleroma.DataCase
alias Pleroma.Activity
use Pleroma.DataCase
alias Pleroma.Activity
- alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Relay
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Relay
@@
-95,21
+94,20
@@
defmodule Pleroma.Web.ActivityPub.RelayTest do
end)
assert capture_log(fn ->
end)
assert capture_log(fn ->
- assert Relay.publish(activity) == {:error,
nil
}
- end) =~ "[error] error:
nil
"
+ assert Relay.publish(activity) == {:error,
false
}
+ end) =~ "[error] error:
false
"
end
test_with_mock "returns announce activity and publish to federate",
Pleroma.Web.Federator,
[:passthrough],
[] do
end
test_with_mock "returns announce activity and publish to federate",
Pleroma.Web.Federator,
[:passthrough],
[] do
-
Pleroma.Config.put
([:instance, :federating], true)
+
clear_config
([:instance, :federating], true)
service_actor = Relay.get_actor()
note = insert(:note_activity)
service_actor = Relay.get_actor()
note = insert(:note_activity)
- assert {:ok, %Activity{} = activity
, %Object{} = obj
} = Relay.publish(note)
+ assert {:ok, %Activity{} = activity} = Relay.publish(note)
assert activity.data["type"] == "Announce"
assert activity.data["actor"] == service_actor.ap_id
assert activity.data["type"] == "Announce"
assert activity.data["actor"] == service_actor.ap_id
- assert activity.data["object"] == obj.data["id"]
assert called(Pleroma.Web.Federator.publish(activity))
end
assert called(Pleroma.Web.Federator.publish(activity))
end
@@
-117,13
+115,12
@@
defmodule Pleroma.Web.ActivityPub.RelayTest do
Pleroma.Web.Federator,
[:passthrough],
[] do
Pleroma.Web.Federator,
[:passthrough],
[] do
-
Pleroma.Config.put
([:instance, :federating], false)
+
clear_config
([:instance, :federating], false)
service_actor = Relay.get_actor()
note = insert(:note_activity)
service_actor = Relay.get_actor()
note = insert(:note_activity)
- assert {:ok, %Activity{} = activity
, %Object{} = obj
} = Relay.publish(note)
+ assert {:ok, %Activity{} = activity} = Relay.publish(note)
assert activity.data["type"] == "Announce"
assert activity.data["actor"] == service_actor.ap_id
assert activity.data["type"] == "Announce"
assert activity.data["actor"] == service_actor.ap_id
- assert activity.data["object"] == obj.data["id"]
refute called(Pleroma.Web.Federator.publish(activity))
end
end
refute called(Pleroma.Web.Federator.publish(activity))
end
end