Merge branch 'fix/twitterapi-follow-lists' into 'develop'

Fix follower/following lists.

Closes #29

See merge request pleroma/pleroma!41

1 files changed, 31 insertions, 1 deletions

diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 90d0fa654..39f1cdd4c 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -518,7 +518,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
   end
 
   describe "GET /api/statuses/friends" do
-    test "it returns a user's friends", %{conn: conn} do
+    test "it returns the logged in user's friends", %{conn: conn} do
       user = insert(:user)
       followed_one = insert(:user)
       followed_two = insert(:user)
@@ -533,6 +533,36 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
       assert MapSet.equal?(MapSet.new(json_response(conn, 200)), MapSet.new(UserView.render("index.json", %{users: [followed_one, followed_two], for: user})))
     end
+
+    test "it returns a given user's friends with user_id", %{conn: conn} do
+      user = insert(:user)
+      followed_one = insert(:user)
+      followed_two = insert(:user)
+      not_followed = insert(:user)
+
+      {:ok, user} = User.follow(user, followed_one)
+      {:ok, user} = User.follow(user, followed_two)
+
+      conn = conn
+      |> get("/api/statuses/friends", %{"user_id" => user.id})
+
+      assert MapSet.equal?(MapSet.new(json_response(conn, 200)), MapSet.new(UserView.render("index.json", %{users: [followed_one, followed_two], for: user})))
+    end
+
+    test "it returns a given user's friends with screen_name", %{conn: conn} do
+      user = insert(:user)
+      followed_one = insert(:user)
+      followed_two = insert(:user)
+      not_followed = insert(:user)
+
+      {:ok, user} = User.follow(user, followed_one)
+      {:ok, user} = User.follow(user, followed_two)
+
+      conn = conn
+      |> get("/api/statuses/friends", %{"screen_name" => user.nickname})
+
+      assert MapSet.equal?(MapSet.new(json_response(conn, 200)), MapSet.new(UserView.render("index.json", %{users: [followed_one, followed_two], for: user})))
+    end
   end
 
   describe "GET /friends/ids" do