projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
[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 98dc78f467041e5cdc8166b219a8616770888e35..b3b573c9b87632dfae25af71955f00f3357427ac 100644
(file)
--- a/
test/web/activity_pub/relay_test.exs
+++ b/
test/web/activity_pub/relay_test.exs
@@
-1,12
+1,11
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.RelayTest do
use Pleroma.DataCase
alias Pleroma.Activity
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.RelayTest do
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
@@
-68,7
+67,7
@@
defmodule Pleroma.Web.ActivityPub.RelayTest do
end
describe "publish/1" do
end
describe "publish/1" do
- clear_config([:instance, :federating])
+
setup do:
clear_config([:instance, :federating])
test "returns error when activity not `Create` type" do
activity = insert(:like_activity)
test "returns error when activity not `Create` type" do
activity = insert(:like_activity)
@@
-89,22
+88,27
@@
defmodule Pleroma.Web.ActivityPub.RelayTest do
}
)
}
)
+ Tesla.Mock.mock(fn
+ %{method: :get, url: "http://mastodon.example.org/eee/99541947525187367"} ->
+ %Tesla.Env{status: 500, body: ""}
+ end)
+
assert capture_log(fn ->
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 activity.data["
to"] == [service_actor.follower_address
]
assert called(Pleroma.Web.Federator.publish(activity))
end
assert called(Pleroma.Web.Federator.publish(activity))
end
@@
-112,13
+116,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