projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into linkify
[akkoma]
/
test
/
web
/
activity_pub
/
views
/
user_view_test.exs
diff --git
a/test/web/activity_pub/views/user_view_test.exs
b/test/web/activity_pub/views/user_view_test.exs
index 3299be2d51530b1503ac6415f5f112128271b298..98c7c9d0966ab5c60b766b9c9dbeeb9863cf60d2 100644
(file)
--- a/
test/web/activity_pub/views/user_view_test.exs
+++ b/
test/web/activity_pub/views/user_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.UserViewTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.UserViewTest do
@@
-29,7
+29,7
@@
defmodule Pleroma.Web.ActivityPub.UserViewTest do
{:ok, user} =
insert(:user)
{:ok, user} =
insert(:user)
- |> User.up
grad
e_changeset(%{fields: fields})
+ |> User.up
dat
e_changeset(%{fields: fields})
|> User.update_and_set_cache()
assert %{
|> User.update_and_set_cache()
assert %{
@@
-38,7
+38,7
@@
defmodule Pleroma.Web.ActivityPub.UserViewTest do
end
test "Renders with emoji tags" do
end
test "Renders with emoji tags" do
- user = insert(:user, emoji:
[%{"bib" => "/test"}]
)
+ user = insert(:user, emoji:
%{"bib" => "/test"}
)
assert %{
"tag" => [
assert %{
"tag" => [
@@
-126,7
+126,7
@@
defmodule Pleroma.Web.ActivityPub.UserViewTest do
{:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
assert %{"totalItems" => 1} = UserView.render("followers.json", %{user: user})
user = Map.merge(user, %{hide_followers_count: true, hide_followers: true})
{:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
assert %{"totalItems" => 1} = UserView.render("followers.json", %{user: user})
user = Map.merge(user, %{hide_followers_count: true, hide_followers: true})
-
assert %{"totalItems" => 0} = UserView.render("followers.json", %{user: user}
)
+
refute UserView.render("followers.json", %{user: user}) |> Map.has_key?("totalItems"
)
end
test "sets correct totalItems when followers are hidden but the follower counter is not" do
end
test "sets correct totalItems when followers are hidden but the follower counter is not" do
@@
-159,34
+159,22
@@
defmodule Pleroma.Web.ActivityPub.UserViewTest do
end
end
end
end
- test "activity collection page aginates correctly" do
- user = insert(:user)
-
- posts =
- for i <- 0..25 do
- {:ok, activity} = CommonAPI.post(user, %{"status" => "post #{i}"})
- activity
- end
-
- # outbox sorts chronologically, newest first, with ten per page
- posts = Enum.reverse(posts)
+ describe "acceptsChatMessages" do
+ test "it returns this value if it is set" do
+ true_user = insert(:user, accepts_chat_messages: true)
+ false_user = insert(:user, accepts_chat_messages: false)
+ nil_user = insert(:user, accepts_chat_messages: nil)
- %{"next" => next_url} =
- UserView.render("activity_collection_page.json", %{
- iri: "#{user.ap_id}/outbox",
- activities: Enum.take(posts, 10)
- })
+ assert %{"capabilities" => %{"acceptsChatMessages" => true}} =
+ UserView.render("user.json", user: true_user)
- next_id = Enum.at(posts, 9).id
- assert next_url =~ next_id
+ assert %{"capabilities" => %{"acceptsChatMessages" => false}} =
+ UserView.render("user.json", user: false_user)
- %{"next" => next_url} =
- UserView.render("activity_collection_page.json", %{
- iri: "#{user.ap_id}/outbox",
- activities: Enum.take(Enum.drop(posts, 10), 10)
- })
-
- next_id = Enum.at(posts, 19).id
- assert next_url =~ next_id
+ refute Map.has_key?(
+ UserView.render("user.json", user: nil_user)["capabilities"],
+ "acceptsChatMessages"
+ )
+ end
end
end
end
end