projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into 'fix/2412-filters'
[akkoma]
/
test
/
pleroma
/
web
/
activity_pub
/
transmogrifier
/
announce_handling_test.exs
diff --git
a/test/pleroma/web/activity_pub/transmogrifier/announce_handling_test.exs
b/test/pleroma/web/activity_pub/transmogrifier/announce_handling_test.exs
index e895636b550097ecd53770d03c394e6fa7a2dc94..1886fea3f949d83844b601347ef175869ad8c5d7 100644
(file)
--- a/
test/pleroma/web/activity_pub/transmogrifier/announce_handling_test.exs
+++ b/
test/pleroma/web/activity_pub/transmogrifier/announce_handling_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.Transmogrifier.AnnounceHandlingTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.Transmogrifier.AnnounceHandlingTest do
@@
-36,7
+36,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.AnnounceHandlingTest do
end
test "it works for incoming announces with actor being inlined (kroeg)" do
end
test "it works for incoming announces with actor being inlined (kroeg)" do
- data = File.read!("test/fixtures/kroeg-announce-with-inline-actor.json") |>
Poi
son.decode!()
+ data = File.read!("test/fixtures/kroeg-announce-with-inline-actor.json") |>
Ja
son.decode!()
_user = insert(:user, local: false, ap_id: data["actor"]["id"])
other_user = insert(:user)
_user = insert(:user, local: false, ap_id: data["actor"]["id"])
other_user = insert(:user)
@@
-55,12
+55,16
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.AnnounceHandlingTest do
test "it works for incoming announces, fetching the announced object" do
data =
File.read!("test/fixtures/mastodon-announce.json")
test "it works for incoming announces, fetching the announced object" do
data =
File.read!("test/fixtures/mastodon-announce.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", "http://mastodon.example.org/users/admin/statuses/99541947525187367")
Tesla.Mock.mock(fn
%{method: :get} ->
|> Map.put("object", "http://mastodon.example.org/users/admin/statuses/99541947525187367")
Tesla.Mock.mock(fn
%{method: :get} ->
- %Tesla.Env{status: 200, body: File.read!("test/fixtures/mastodon-note-object.json")}
+ %Tesla.Env{
+ status: 200,
+ body: File.read!("test/fixtures/mastodon-note-object.json"),
+ headers: HttpRequestMock.activitypub_object_headers()
+ }
end)
_user = insert(:user, local: false, ap_id: data["actor"])
end)
_user = insert(:user, local: false, ap_id: data["actor"])
@@
-86,7
+90,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.AnnounceHandlingTest do
data =
File.read!("test/fixtures/mastodon-announce.json")
data =
File.read!("test/fixtures/mastodon-announce.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", activity.data["object"])
_user = insert(:user, local: false, ap_id: data["actor"])
|> Map.put("object", activity.data["object"])
_user = insert(:user, local: false, ap_id: data["actor"])
@@
-109,7
+113,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.AnnounceHandlingTest do
test "it works for incoming announces with an inlined activity" do
data =
File.read!("test/fixtures/mastodon-announce-private.json")
test "it works for incoming announces with an inlined activity" do
data =
File.read!("test/fixtures/mastodon-announce-private.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
_user =
insert(:user,
_user =
insert(:user,
@@
-126,7
+130,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.AnnounceHandlingTest do
assert data["id"] ==
"http://mastodon.example.org/users/admin/statuses/99542391527669785/activity"
assert data["id"] ==
"http://mastodon.example.org/users/admin/statuses/99542391527669785/activity"
- object = Object.normalize(data["object"])
+ object = Object.normalize(data["object"]
, fetch: false
)
assert object.data["id"] == "http://mastodon.example.org/@admin/99541947525187368"
assert object.data["content"] == "this is a private toot"
assert object.data["id"] == "http://mastodon.example.org/@admin/99541947525187368"
assert object.data["content"] == "this is a private toot"
@@
-140,11
+144,11
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.AnnounceHandlingTest do
data =
File.read!("test/fixtures/bogus-mastodon-announce.json")
data =
File.read!("test/fixtures/bogus-mastodon-announce.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
_user = insert(:user, local: false, ap_id: data["actor"])
_user = insert(:user, local: false, ap_id: data["actor"])
- assert {:error, e} = Transmogrifier.handle_incoming(data)
+ assert {:error,
_
e} = Transmogrifier.handle_incoming(data)
end
test "it does not clobber the addressing on announce activities" do
end
test "it does not clobber the addressing on announce activities" do
@@
-153,8
+157,8
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.AnnounceHandlingTest do
data =
File.read!("test/fixtures/mastodon-announce.json")
data =
File.read!("test/fixtures/mastodon-announce.json")
- |>
Poi
son.decode!()
- |> Map.put("object", Object.normalize(activity).data["id"])
+ |>
Ja
son.decode!()
+ |> Map.put("object", Object.normalize(activity
, fetch: false
).data["id"])
|> Map.put("to", ["http://mastodon.example.org/users/admin/followers"])
|> Map.put("cc", [])
|> Map.put("to", ["http://mastodon.example.org/users/admin/followers"])
|> Map.put("cc", [])