projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
test
/
user_test.exs
diff --git
a/test/user_test.exs
b/test/user_test.exs
index 119a36ec1da2a026d7cea247f711c1cbbf5adbc9..0479f294d2fff5d66dc2072e0116bf68b6c0024a 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
@@
-1141,8
+1141,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)