diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-20 07:27:10 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-20 07:27:10 +0000 |
| commit | 690085158184e6ab216ac11b316191a7cb5ebafc (patch) | |
| tree | 665e38138220ba7ec345a82c1d27123cc64ec3a7 /test/web/twitter_api/views | |
| parent | 52aa65fe6ebfd6730fa611e25dd0e9c0f7503654 (diff) | |
| parent | bd921ca5d7830efc9dde68b763412fdc03725adc (diff) | |
| download | pleroma-690085158184e6ab216ac11b316191a7cb5ebafc.tar.gz pleroma-690085158184e6ab216ac11b316191a7cb5ebafc.zip | |
Merge branch 'fix/self-follow' into 'develop'
Fix self follows to be more intuitive, fix minor websocket channel issue
See merge request pleroma/pleroma!26
Diffstat (limited to 'test/web/twitter_api/views')
| -rw-r--r-- | test/web/twitter_api/views/user_view_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs index 9f8e15574..18a19ef70 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -92,7 +92,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do end test "A user that follows you", %{user: user} do - {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]}) + follower = insert(:user) + {:ok, follower} = User.follow(follower, user) {:ok, user} = User.update_follower_count(user) image = "https://placehold.it/48x48" represented = %{ |