diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-13 21:19:27 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-13 21:19:27 +0300 |
| commit | a16b3dbcbf19d584eaefbecbfb4ff34fa7b3743a (patch) | |
| tree | 33a566478405ab5da9e6cdb5f77bb59a3ff3be0c /test/user_test.exs | |
| parent | 2b7d7bbd2dc3121488592a958c29ba6a418e0104 (diff) | |
| parent | ef37774403ff5af69a637875240eec205b6f55a5 (diff) | |
| download | pleroma-a16b3dbcbf19d584eaefbecbfb4ff34fa7b3743a.tar.gz | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/user_test.exs')
| -rw-r--r-- | test/user_test.exs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/user_test.exs b/test/user_test.exs index 0479f294d..a00b1b5e2 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -194,7 +194,8 @@ defmodule Pleroma.UserTest do 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 @@ -319,7 +320,7 @@ defmodule Pleroma.UserTest do 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) @@ -332,7 +333,7 @@ defmodule Pleroma.UserTest do 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] @@ -353,7 +354,7 @@ defmodule Pleroma.UserTest do 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) @@ -1404,7 +1405,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>) |