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/support-conversations-pagination
[akkoma]
/
test
/
web
/
activity_pub
/
views
/
object_view_test.exs
diff --git
a/test/web/activity_pub/views/object_view_test.exs
b/test/web/activity_pub/views/object_view_test.exs
index 6784788cc2eae11fcc3b5752cfe42bb7e395c08d..6c006206bbad7094869ffb13878690f5381b5657 100644
(file)
--- a/
test/web/activity_pub/views/object_view_test.exs
+++ b/
test/web/activity_pub/views/object_view_test.exs
@@
-1,5
+1,5
@@
# 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.ObjectViewTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectViewTest do
@@
-37,9
+37,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectViewTest do
end
describe "note activity's `replies` collection rendering" do
end
describe "note activity's `replies` collection rendering" do
- clear_config([:activitypub, :note_replies_output_limit]) do
- Pleroma.Config.put([:activitypub, :note_replies_output_limit], 5)
- end
+ setup do: clear_config([:activitypub, :note_replies_output_limit], 5)
test "renders `replies` collection for a note activity" do
user = insert(:user)
test "renders `replies` collection for a note activity" do
user = insert(:user)
@@
-48,13
+46,11
@@
defmodule Pleroma.Web.ActivityPub.ObjectViewTest do
{:ok, self_reply1} =
CommonAPI.post(user, %{"status" => "self-reply 1", "in_reply_to_status_id" => activity.id})
{:ok, self_reply1} =
CommonAPI.post(user, %{"status" => "self-reply 1", "in_reply_to_status_id" => activity.id})
+ replies_uris = [self_reply1.object.data["id"]]
result = ObjectView.render("object.json", %{object: refresh_record(activity)})
result = ObjectView.render("object.json", %{object: refresh_record(activity)})
- replies_uris = [self_reply1.data["id"]]
- assert %{
- "type" => "Collection",
- "first" => %{"type" => "Collection", "items" => ^replies_uris}
- } = get_in(result, ["object", "replies"])
+ assert %{"type" => "Collection", "items" => ^replies_uris} =
+ get_in(result, ["object", "replies"])
end
end
end
end
@@
-63,7
+59,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectViewTest do
object = Object.normalize(note)
user = insert(:user)
object = Object.normalize(note)
user = insert(:user)
- {:ok, like_activity
, _} = CommonAPI.favorite(note.id, user
)
+ {:ok, like_activity
} = CommonAPI.favorite(user, note.id
)
result = ObjectView.render("object.json", %{object: like_activity})
result = ObjectView.render("object.json", %{object: like_activity})