3 files changed, 42 insertions, 0 deletions
diff --git a/test/user_test.exs b/test/user_test.exs
index 30e414437..e39c0be31 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -23,4 +23,15 @@ defmodule Pleroma.UserTest do
 
     assert expected_followers_collection == User.ap_followers(user)
   end
+
+  test "follow takes a user and an id and tries to follow another user" do
+    { :ok, user } = UserBuilder.insert
+    { :ok, following } = UserBuilder.insert(%{nickname: "guy"})
+
+    {:ok, user } = User.follow(user, following)
+
+    user = Repo.get(User, user.id)
+
+    assert user.following == [User.ap_followers(following)]
+  end
 end
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 86c03c652..a504393be 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -79,6 +79,26 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     end
   end
 
+  describe "POST /friendships/create.json" do
+    setup [:valid_user]
+    test "without valid credentials", %{conn: conn} do
+      conn = post conn, "/api/friendships/create.json"
+      assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
+    end
+
+    test "with credentials", %{conn: conn, user: current_user} do
+      {:ok, followed } = UserBuilder.insert(%{name: "some guy"})
+
+      conn = conn
+      |> with_credentials(current_user.nickname, "test")
+      |> post("/api/friendships/create.json", %{user_id: followed.id})
+
+      current_user = Repo.get(User, current_user.id)
+      assert current_user.following == [User.ap_followers(followed)]
+      assert json_response(conn, 200) == UserRepresenter.to_map(followed)
+    end
+  end
+
   defp valid_user(_context) do
     { :ok, user } = UserBuilder.insert(%{nickname: "lambda", ap_id: "lambda"})
     [user: user]
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 5c78790af..c9f79d2ff 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -40,4 +40,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert length(statuses) == 1
     assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: activity_user})
   end
+
+  test "Follow another user" do
+    { :ok, user } = UserBuilder.insert
+    { :ok, following } = UserBuilder.insert(%{nickname: "guy"})
+
+    {:ok, user, following } = TwitterAPI.follow(user, following.id)
+
+    user = Repo.get(User, user.id)
+
+    assert user.following == [User.ap_followers(following)]
+  end
 end