projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mongoose-secure' into 'develop'
[akkoma]
/
test
/
web
/
activity_pub
/
activity_pub_controller_test.exs
diff --git
a/test/web/activity_pub/activity_pub_controller_test.exs
b/test/web/activity_pub/activity_pub_controller_test.exs
index 2bd494a3748aa8a29a825ac4e0bfe5c4cb6434a5..fbacb399335cd5bc56e4e198504175a98f8776b5 100644
(file)
--- a/
test/web/activity_pub/activity_pub_controller_test.exs
+++ b/
test/web/activity_pub/activity_pub_controller_test.exs
@@
-26,12
+26,10
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
:ok
end
:ok
end
- clear_config([:instance, :federating]) do
- Config.put([:instance, :federating], true)
- end
+ setup do: clear_config([:instance, :federating], true)
describe "/relay" do
describe "/relay" do
- clear_config([:instance, :allow_relay])
+
setup do:
clear_config([:instance, :allow_relay])
test "with the relay active, it returns the relay user", %{conn: conn} do
res =
test "with the relay active, it returns the relay user", %{conn: conn} do
res =
@@
-1227,8
+1225,8
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
|> json_response(403)
end
|> json_response(403)
end
- clear_config([:media_proxy])
- clear_config([Pleroma.Upload])
+
setup do:
clear_config([:media_proxy])
+
setup do:
clear_config([Pleroma.Upload])
test "POST /api/ap/upload_media", %{conn: conn} do
user = insert(:user)
test "POST /api/ap/upload_media", %{conn: conn} do
user = insert(:user)
@@
-1250,7
+1248,9
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
assert object["name"] == desc
assert object["type"] == "Document"
assert object["actor"] == user.ap_id
assert object["name"] == desc
assert object["type"] == "Document"
assert object["actor"] == user.ap_id
- assert [%{"href" => object_href}] = object["url"]
+ assert [%{"href" => object_href, "mediaType" => object_mediatype}] = object["url"]
+ assert is_binary(object_href)
+ assert object_mediatype == "image/jpeg"
activity_request = %{
"@context" => "https://www.w3.org/ns/activitystreams",
activity_request = %{
"@context" => "https://www.w3.org/ns/activitystreams",
@@
-1274,11
+1274,19
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
assert activity_response["object"]
assert activity_response["actor"] == user.ap_id
assert activity_response["object"]
assert activity_response["actor"] == user.ap_id
- assert %Object{data: %{"attachment" => [attachment]}} = Object.normalize(activity_response["object"])
+ assert %Object{data: %{"attachment" => [attachment]}} =
+ Object.normalize(activity_response["object"])
+
assert attachment["type"] == "Document"
assert attachment["name"] == desc
assert attachment["type"] == "Document"
assert attachment["name"] == desc
- assert [%{"href" => attachment_href}] = attachment["url"]
- assert attachment_href == object_href
+
+ assert [
+ %{
+ "href" => ^object_href,
+ "type" => "Link",
+ "mediaType" => ^object_mediatype
+ }
+ ] = attachment["url"]
# Fails if unauthenticated
conn
# Fails if unauthenticated
conn