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/twitter_api_test.exs | |
| 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/twitter_api_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 06ecd9e75..60daeec70 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -179,7 +179,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do followed = insert(:user) {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"user_id" => followed.id}) - assert user.following == [User.ap_followers(followed)] + assert User.ap_followers(followed) in user.following { :error, msg } = TwitterAPI.follow(user, %{"user_id" => followed.id}) assert msg == "Could not follow user: #{followed.nickname} is already on your list." @@ -190,7 +190,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do followed = insert(:user) {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname}) - assert user.following == [User.ap_followers(followed)] + assert User.ap_followers(followed) in user.following followed = User.get_by_ap_id(followed.ap_id) assert followed.info["follower_count"] == 1 |