projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add spec for AccountController.relationships
[akkoma]
/
test
/
user_test.exs
diff --git
a/test/user_test.exs
b/test/user_test.exs
index 119a36ec1da2a026d7cea247f711c1cbbf5adbc9..a00b1b5e21ef19330077cf0423ecdd2e70682d51 100644
(file)
--- a/
test/user_test.exs
+++ b/
test/user_test.exs
@@
-86,7
+86,7
@@
defmodule Pleroma.UserTest do
{:ok, user: insert(:user)}
end
{:ok, user: insert(:user)}
end
- test "outgoing_relations_ap_ids/1", %{user: user} do
+ test "outgoing_relations
hips
_ap_ids/1", %{user: user} do
rel_types = [:block, :mute, :notification_mute, :reblog_mute, :inverse_subscription]
ap_ids_by_rel =
rel_types = [:block, :mute, :notification_mute, :reblog_mute, :inverse_subscription]
ap_ids_by_rel =
@@
-124,10
+124,10
@@
defmodule Pleroma.UserTest do
assert ap_ids_by_rel[:inverse_subscription] ==
Enum.sort(Enum.map(User.subscriber_users(user), & &1.ap_id))
assert ap_ids_by_rel[:inverse_subscription] ==
Enum.sort(Enum.map(User.subscriber_users(user), & &1.ap_id))
- outgoing_relations
_ap_ids = User.outgoing_relation
s_ap_ids(user, rel_types)
+ outgoing_relations
hips_ap_ids = User.outgoing_relationship
s_ap_ids(user, rel_types)
assert ap_ids_by_rel ==
assert ap_ids_by_rel ==
- Enum.into(outgoing_relations_ap_ids, %{}, fn {k, v} -> {k, Enum.sort(v)} end)
+ Enum.into(outgoing_relations
hips
_ap_ids, %{}, fn {k, v} -> {k, Enum.sort(v)} end)
end
end
end
end
@@
-194,7
+194,8
@@
defmodule Pleroma.UserTest do
CommonAPI.follow(pending_follower, locked)
CommonAPI.follow(pending_follower, locked)
CommonAPI.follow(accepted_follower, locked)
CommonAPI.follow(pending_follower, locked)
CommonAPI.follow(pending_follower, locked)
CommonAPI.follow(accepted_follower, locked)
- Pleroma.FollowingRelationship.update(accepted_follower, locked, "accept")
+
+ Pleroma.FollowingRelationship.update(accepted_follower, locked, :follow_accept)
assert [^pending_follower] = User.get_follow_requests(locked)
end
assert [^pending_follower] = User.get_follow_requests(locked)
end
@@
-319,7
+320,7
@@
defmodule Pleroma.UserTest do
following_address: "http://localhost:4001/users/fuser2/following"
})
following_address: "http://localhost:4001/users/fuser2/following"
})
- {:ok, user} = User.follow(user, followed,
"accept"
)
+ {:ok, user} = User.follow(user, followed,
:follow_accept
)
{:ok, user, _activity} = User.unfollow(user, followed)
{:ok, user, _activity} = User.unfollow(user, followed)
@@
-332,7
+333,7
@@
defmodule Pleroma.UserTest do
followed = insert(:user)
user = insert(:user)
followed = insert(:user)
user = insert(:user)
- {:ok, user} = User.follow(user, followed,
"accept"
)
+ {:ok, user} = User.follow(user, followed,
:follow_accept
)
assert User.following(user) == [user.follower_address, followed.follower_address]
assert User.following(user) == [user.follower_address, followed.follower_address]
@@
-353,7
+354,7
@@
defmodule Pleroma.UserTest do
test "test if a user is following another user" do
followed = insert(:user)
user = insert(:user)
test "test if a user is following another user" do
followed = insert(:user)
user = insert(:user)
- User.follow(user, followed,
"accept"
)
+ User.follow(user, followed,
:follow_accept
)
assert User.following?(user, followed)
refute User.following?(followed, user)
assert User.following?(user, followed)
refute User.following?(followed, user)
@@
-1141,8
+1142,8
@@
defmodule Pleroma.UserTest do
object_two = insert(:note, user: follower)
activity_two = insert(:note_activity, user: follower, note: object_two)
object_two = insert(:note, user: follower)
activity_two = insert(:note_activity, user: follower, note: object_two)
- {:ok, like
, _} = CommonAPI.favorite(activity_two.id, user
)
- {:ok, like_two
, _} = CommonAPI.favorite(activity.id, follower
)
+ {:ok, like
} = CommonAPI.favorite(user, activity_two.id
)
+ {:ok, like_two
} = CommonAPI.favorite(follower, activity.id
)
{:ok, repeat, _} = CommonAPI.repeat(activity_two.id, user)
{:ok, job} = User.delete(user)
{:ok, repeat, _} = CommonAPI.repeat(activity_two.id, user)
{:ok, job} = User.delete(user)
@@
-1404,7
+1405,7
@@
defmodule Pleroma.UserTest do
bio = "A.k.a. @nick@domain.com"
expected_text =
bio = "A.k.a. @nick@domain.com"
expected_text =
- ~s(A.k.a. <span class="h-card"><a
data-user="#{remote_user.id}" class="u-url mention
" href="#{
+ ~s(A.k.a. <span class="h-card"><a
class="u-url mention" data-user="#{remote_user.id}
" href="#{
remote_user.ap_id
}" rel="ugc">@<span>nick@domain.com</span></a></span>)
remote_user.ap_id
}" rel="ugc">@<span>nick@domain.com</span></a></span>)