diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-10 07:09:28 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-10 07:09:28 +0300 |
| commit | 648cc699e551324a067cd1b906df5f497ade5861 (patch) | |
| tree | 3ddcee32eb0b61770709422aaa266167a8254e28 /test/user_test.exs | |
| parent | 591f7015d91b383dae1ee29576d13c0fad65cad6 (diff) | |
| parent | c433ed9dbb1db9777f235527e06c9c8bec3b1436 (diff) | |
| download | pleroma-648cc699e551324a067cd1b906df5f497ade5861.tar.gz pleroma-648cc699e551324a067cd1b906df5f497ade5861.zip | |
Merge branch 'develop' into support/update_oban
Diffstat (limited to 'test/user_test.exs')
| -rw-r--r-- | test/user_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/user_test.exs b/test/user_test.exs index 8055ebd08..d39787f35 100644 --- 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) - {: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) @@ -1404,7 +1404,7 @@ defmodule Pleroma.UserTest do 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>) |