diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-07 01:20:50 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-07 01:20:50 +0300 |
| commit | 01fe5abad1a98b98a0dd5e3c04bf65809389fd78 (patch) | |
| tree | b829b75c225b8ffbacd22884693a622dc7584a70 /test/web/twitter_api/twitter_api_test.exs | |
| parent | b1b1a270e8f17b76d08771ca1e4025b1d227da05 (diff) | |
| parent | 62cdf701f47352004c293c3ca049d232b3d16af7 (diff) | |
| download | pleroma-01fe5abad1a98b98a0dd5e3c04bf65809389fd78.tar.gz pleroma-01fe5abad1a98b98a0dd5e3c04bf65809389fd78.zip | |
Resolve conflicts
Diffstat (limited to 'test/web/twitter_api/twitter_api_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index d601c8f1f..475531a09 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -116,8 +116,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do {:ok, user, followed, _activity} = TwitterAPI.follow(user, %{"user_id" => followed.id}) 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." + {:ok, _, _, _} = TwitterAPI.follow(user, %{"user_id" => followed.id}) end test "Follow another user using screen_name" do @@ -132,8 +131,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do followed = User.get_cached_by_ap_id(followed.ap_id) assert followed.info.follower_count == 1 - {:error, msg} = TwitterAPI.follow(user, %{"screen_name" => followed.nickname}) - assert msg == "Could not follow user: #{followed.nickname} is already on your list." + {:ok, _, _, _} = TwitterAPI.follow(user, %{"screen_name" => followed.nickname}) end test "Unfollow another user using user_id" do |