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 global-status-expiration
[akkoma]
/
test
/
user_test.exs
diff --git
a/test/user_test.exs
b/test/user_test.exs
index 8055ebd08ebb24edffd582f64802b043cd2a5fda..d39787f35d5d00480b786e6619652295f610ee6e 100644
(file)
--- a/
test/user_test.exs
+++ b/
test/user_test.exs
@@
-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)
@@
-1404,7
+1404,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>)