Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name

1 files changed, 15 insertions, 6 deletions

diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 3a1745a1b..8b4e0b1d8 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -166,16 +166,25 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert msg == "Could not follow user: #{followed.nickname} is already on your list."
   end
 
-  test "Unfollow another user" do
-    followed = insert(:user)
-    user = insert(:user, %{following: [User.ap_followers(followed)]})
+  test "Unfollow another user using user_id" do
+    unfollowed = insert(:user)
+    user = insert(:user, %{following: [User.ap_followers(unfollowed)]})
+
+    {:ok, user, unfollowed } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
+    assert user.following == []
 
-    { :ok, user, _followed } = TwitterAPI.unfollow(user, followed.id)
+    { :error, msg } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
+    assert msg == "Not subscribed!"
+  end
 
-    user = Repo.get(User, user.id)
+  test "Unfollow another user using screen_name" do
+    unfollowed = insert(:user)
+    user = insert(:user, %{following: [User.ap_followers(unfollowed)]})
 
+    {:ok, user, unfollowed } = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname})
     assert user.following == []
-    { :error, msg } = TwitterAPI.unfollow(user, followed.id)
+
+    { :error, msg } = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname})
     assert msg == "Not subscribed!"
   end