X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Ftwitter_api_controller_test.exs;h=170dda145e6f83502f147305433558036daad98d;hb=5bfb7b4ce6c23f84c27643e9871b78b867f86b7e;hp=90d0fa65475c46e2785da116ca428a4826ea32de;hpb=d7da3ca05d87ce7c0c799031c00dd1a80aba9c18;p=akkoma

diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 90d0fa654..170dda145 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -2,9 +2,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
   use Pleroma.Web.ConnCase
   alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
   alias Pleroma.Builders.{ActivityBuilder, UserBuilder}
-  alias Pleroma.{Repo, Activity, User, Object}
+  alias Pleroma.{Repo, Activity, User, Object, Notification}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.TwitterAPI.UserView
+  alias Pleroma.Web.TwitterAPI.NotificationView
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.TwitterAPI.TwitterAPI
 
@@ -12,13 +13,15 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
   describe "POST /api/account/verify_credentials" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
-      conn = post conn, "/api/account/verify_credentials.json"
+      conn = post(conn, "/api/account/verify_credentials.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
     test "with credentials", %{conn: conn, user: user} do
-      conn = conn
+      conn =
+        conn
         |> with_credentials(user.nickname, "test")
         |> post("/api/account/verify_credentials.json")
 
@@ -29,13 +32,15 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
   describe "POST /api/account/most_recent_notification" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
-      conn = post conn, "/api/account/most_recent_notification.json"
+      conn = post(conn, "/api/account/most_recent_notification.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
     test "with credentials", %{conn: conn, user: user} do
-      conn = conn
+      conn =
+        conn
         |> with_credentials(user.nickname, "test")
         |> post("/api/account/most_recent_notification.json", %{id: "200"})
 
@@ -47,8 +52,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
   describe "POST /statuses/update.json" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
-      conn = post conn, "/api/statuses/update.json"
+      conn = post(conn, "/api/statuses/update.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
@@ -56,30 +62,36 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
       conn_with_creds = conn |> with_credentials(user.nickname, "test")
       request_path = "/api/statuses/update.json"
 
-      error_response = %{"request" => request_path,
-                         "error" => "Client must provide a 'status' parameter with a value."}
+      error_response = %{
+        "request" => request_path,
+        "error" => "Client must provide a 'status' parameter with a value."
+      }
+
       conn = conn_with_creds |> post(request_path)
       assert json_response(conn, 400) == error_response
 
-      conn = conn_with_creds |> post(request_path, %{ status: "" })
+      conn = conn_with_creds |> post(request_path, %{status: ""})
       assert json_response(conn, 400) == error_response
 
-      conn = conn_with_creds |> post(request_path, %{ status: " " })
+      conn = conn_with_creds |> post(request_path, %{status: " "})
       assert json_response(conn, 400) == error_response
 
-      conn =  conn_with_creds |> post(request_path, %{ status: "Nice meme." })
-      assert json_response(conn, 200) == ActivityRepresenter.to_map(Repo.one(Activity), %{user: user})
+      conn = conn_with_creds |> post(request_path, %{status: "Nice meme."})
+
+      assert json_response(conn, 200) ==
+               ActivityRepresenter.to_map(Repo.one(Activity), %{user: user})
     end
   end
 
   describe "GET /statuses/public_timeline.json" do
     test "returns statuses", %{conn: conn} do
-      {:ok, user} = UserBuilder.insert
+      {:ok, user} = UserBuilder.insert()
       activities = ActivityBuilder.insert_list(30, %{}, %{user: user})
       ActivityBuilder.insert_list(10, %{}, %{user: user})
       since_id = List.last(activities).id
 
-      conn = conn
+      conn =
+        conn
         |> get("/api/statuses/public_timeline.json", %{since_id: since_id})
 
       response = json_response(conn, 200)
@@ -90,12 +102,13 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
   describe "GET /statuses/show/:id.json" do
     test "returns one status", %{conn: conn} do
-      {:ok, user} = UserBuilder.insert
-      {:ok, activity} = ActivityBuilder.insert(%{}, %{user: user})
+      user = insert(:user)
+      {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey!"})
       actor = Repo.get_by!(User, ap_id: activity.data["actor"])
 
-      conn = conn
-      |> get("/api/statuses/show/#{activity.id}.json")
+      conn =
+        conn
+        |> get("/api/statuses/show/#{activity.id}.json")
 
       response = json_response(conn, 200)
 
@@ -107,8 +120,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     test "gets user with screen_name", %{conn: conn} do
       user = insert(:user)
 
-      conn = conn
-      |> get("/api/users/show.json", %{"screen_name" => user.nickname})
+      conn =
+        conn
+        |> get("/api/users/show.json", %{"screen_name" => user.nickname})
 
       response = json_response(conn, 200)
 
@@ -118,8 +132,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     test "gets user with user_id", %{conn: conn} do
       user = insert(:user)
 
-      conn = conn
-      |> get("/api/users/show.json", %{"user_id" => user.id})
+      conn =
+        conn
+        |> get("/api/users/show.json", %{"user_id" => user.id})
 
       response = json_response(conn, 200)
 
@@ -132,9 +147,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
       {:ok, logged_in, user, _activity} = TwitterAPI.follow(logged_in, %{"user_id" => user.id})
 
-      conn = conn
-      |> with_credentials(logged_in.nickname, "test")
-      |> get("/api/users/show.json", %{"user_id" => user.id})
+      conn =
+        conn
+        |> with_credentials(logged_in.nickname, "test")
+        |> get("/api/users/show.json", %{"user_id" => user.id})
 
       response = json_response(conn, 200)
 
@@ -144,14 +160,14 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
   describe "GET /statusnet/conversation/:id.json" do
     test "returns the statuses in the conversation", %{conn: conn} do
-      {:ok, _user} = UserBuilder.insert
-      {:ok, _activity} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
+      {:ok, _user} = UserBuilder.insert()
+      {:ok, activity} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
       {:ok, _activity_two} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
       {:ok, _activity_three} = ActivityBuilder.insert(%{"type" => "Create", "context" => "3hu"})
 
-      {:ok, object} = Object.context_mapping("2hu") |> Repo.insert
-      conn = conn
-      |> get("/api/statusnet/conversation/#{object.id}.json")
+      conn =
+        conn
+        |> get("/api/statusnet/conversation/#{activity.data["context_id"]}.json")
 
       response = json_response(conn, 200)
 
@@ -161,58 +177,118 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
   describe "GET /statuses/friends_timeline.json" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
-      conn = get conn, "/api/statuses/friends_timeline.json"
+      conn = get(conn, "/api/statuses/friends_timeline.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
     test "with credentials", %{conn: conn, user: current_user} do
       user = insert(:user)
-      activities = ActivityBuilder.insert_list(30, %{"to" => [User.ap_followers(user)]}, %{user: user})
-      returned_activities = ActivityBuilder.insert_list(10, %{"to" => [User.ap_followers(user)]}, %{user: user})
+
+      activities =
+        ActivityBuilder.insert_list(30, %{"to" => [User.ap_followers(user)]}, %{user: user})
+
+      returned_activities =
+        ActivityBuilder.insert_list(10, %{"to" => [User.ap_followers(user)]}, %{user: user})
+
       other_user = insert(:user)
       ActivityBuilder.insert_list(10, %{}, %{user: other_user})
       since_id = List.last(activities).id
 
-      current_user = Ecto.Changeset.change(current_user, following: [User.ap_followers(user)]) |> Repo.update!
+      current_user =
+        Ecto.Changeset.change(current_user, following: [User.ap_followers(user)])
+        |> Repo.update!()
 
-      conn = conn
+      conn =
+        conn
         |> with_credentials(current_user.nickname, "test")
         |> get("/api/statuses/friends_timeline.json", %{since_id: since_id})
 
       response = json_response(conn, 200)
 
       assert length(response) == 10
-      assert response == Enum.map(returned_activities, fn (activity) -> ActivityRepresenter.to_map(activity, %{user: User.get_cached_by_ap_id(activity.data["actor"]), for: current_user}) end)
+
+      assert response ==
+               Enum.map(returned_activities, fn activity ->
+                 ActivityRepresenter.to_map(activity, %{
+                   user: User.get_cached_by_ap_id(activity.data["actor"]),
+                   for: current_user
+                 })
+               end)
     end
   end
 
   describe "GET /statuses/mentions.json" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
-      conn = get conn, "/api/statuses/mentions.json"
+      conn = get(conn, "/api/statuses/mentions.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
     test "with credentials", %{conn: conn, user: current_user} do
-      {:ok, activity} = ActivityBuilder.insert(%{"to" => [current_user.ap_id]}, %{user: current_user})
+      {:ok, activity} =
+        ActivityBuilder.insert(%{"to" => [current_user.ap_id]}, %{user: current_user})
 
-      conn = conn
+      conn =
+        conn
         |> with_credentials(current_user.nickname, "test")
         |> get("/api/statuses/mentions.json")
 
       response = json_response(conn, 200)
 
       assert length(response) == 1
-      assert Enum.at(response, 0) == ActivityRepresenter.to_map(activity, %{user: current_user, mentioned: [current_user]})
+
+      assert Enum.at(response, 0) ==
+               ActivityRepresenter.to_map(activity, %{
+                 user: current_user,
+                 mentioned: [current_user]
+               })
+    end
+  end
+
+  describe "GET /api/qvitter/statuses/notifications.json" do
+    setup [:valid_user]
+
+    test "without valid credentials", %{conn: conn} do
+      conn = get(conn, "/api/qvitter/statuses/notifications.json")
+      assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
+    end
+
+    test "with credentials", %{conn: conn, user: current_user} do
+      other_user = insert(:user)
+
+      {:ok, activity} =
+        ActivityBuilder.insert(%{"to" => [current_user.ap_id]}, %{user: other_user})
+
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> get("/api/qvitter/statuses/notifications.json")
+
+      response = json_response(conn, 200)
+
+      assert length(response) == 1
+
+      assert response ==
+               NotificationView.render("notification.json", %{
+                 notifications: Notification.for_user(current_user),
+                 for: current_user
+               })
     end
   end
 
   describe "GET /statuses/user_timeline.json" do
     setup [:valid_user]
+
     test "without any params", %{conn: conn} do
       conn = get(conn, "/api/statuses/user_timeline.json")
-      assert json_response(conn, 400) == %{"error" => "You need to specify screen_name or user_id", "request" => "/api/statuses/user_timeline.json"}
+
+      assert json_response(conn, 400) == %{
+               "error" => "You need to specify screen_name or user_id",
+               "request" => "/api/statuses/user_timeline.json"
+             }
     end
 
     test "with user_id", %{conn: conn} do
@@ -237,9 +313,11 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
     test "with credentials", %{conn: conn, user: current_user} do
       {:ok, activity} = ActivityBuilder.insert(%{"id" => 1}, %{user: current_user})
-      conn = conn
-      |> with_credentials(current_user.nickname, "test")
-      |> get("/api/statuses/user_timeline.json")
+
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> get("/api/statuses/user_timeline.json")
 
       response = json_response(conn, 200)
 
@@ -250,9 +328,11 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     test "with credentials with user_id", %{conn: conn, user: current_user} do
       user = insert(:user)
       {:ok, activity} = ActivityBuilder.insert(%{"id" => 1}, %{user: user})
-      conn = conn
-      |> with_credentials(current_user.nickname, "test")
-      |> get("/api/statuses/user_timeline.json", %{"user_id" => user.id})
+
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> get("/api/statuses/user_timeline.json", %{"user_id" => user.id})
 
       response = json_response(conn, 200)
 
@@ -263,9 +343,11 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     test "with credentials screen_name", %{conn: conn, user: current_user} do
       user = insert(:user)
       {:ok, activity} = ActivityBuilder.insert(%{"id" => 1}, %{user: user})
-      conn = conn
-      |> with_credentials(current_user.nickname, "test")
-      |> get("/api/statuses/user_timeline.json", %{"screen_name" => user.nickname})
+
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> get("/api/statuses/user_timeline.json", %{"screen_name" => user.nickname})
 
       response = json_response(conn, 200)
 
@@ -276,28 +358,33 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
   describe "POST /friendships/create.json" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
-      conn = post conn, "/api/friendships/create.json"
+      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
       followed = insert(:user)
 
-      conn = conn
-      |> with_credentials(current_user.nickname, "test")
-      |> post("/api/friendships/create.json", %{user_id: followed.id})
+      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 User.ap_followers(followed) in current_user.following
-      assert json_response(conn, 200) == UserView.render("show.json", %{user: followed, for: current_user})
+
+      assert json_response(conn, 200) ==
+               UserView.render("show.json", %{user: followed, for: current_user})
     end
   end
 
   describe "POST /friendships/destroy.json" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
-      conn = post conn, "/api/friendships/destroy.json"
+      conn = post(conn, "/api/friendships/destroy.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
@@ -308,40 +395,48 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
       assert User.ap_followers(followed) in current_user.following
       ActivityPub.follow(current_user, followed)
 
-      conn = conn
-      |> with_credentials(current_user.nickname, "test")
-      |> post("/api/friendships/destroy.json", %{user_id: followed.id})
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> post("/api/friendships/destroy.json", %{user_id: followed.id})
 
       current_user = Repo.get(User, current_user.id)
       assert current_user.following == [current_user.ap_id]
-      assert json_response(conn, 200) == UserView.render("show.json", %{user: followed, for: current_user})
+
+      assert json_response(conn, 200) ==
+               UserView.render("show.json", %{user: followed, for: current_user})
     end
   end
 
   describe "POST /blocks/create.json" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
-      conn = post conn, "/api/blocks/create.json"
+      conn = post(conn, "/api/blocks/create.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
     test "with credentials", %{conn: conn, user: current_user} do
       blocked = insert(:user)
 
-      conn = conn
-      |> with_credentials(current_user.nickname, "test")
-      |> post("/api/blocks/create.json", %{user_id: blocked.id})
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> post("/api/blocks/create.json", %{user_id: blocked.id})
 
       current_user = Repo.get(User, current_user.id)
       assert User.blocks?(current_user, blocked)
-      assert json_response(conn, 200) == UserView.render("show.json", %{user: blocked, for: current_user})
+
+      assert json_response(conn, 200) ==
+               UserView.render("show.json", %{user: blocked, for: current_user})
     end
   end
 
   describe "POST /blocks/destroy.json" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
-      conn = post conn, "/api/blocks/destroy.json"
+      conn = post(conn, "/api/blocks/destroy.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
@@ -351,55 +446,66 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
       {:ok, current_user} = User.block(current_user, blocked)
       assert User.blocks?(current_user, blocked)
 
-      conn = conn
-      |> with_credentials(current_user.nickname, "test")
-      |> post("/api/blocks/destroy.json", %{user_id: blocked.id})
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> post("/api/blocks/destroy.json", %{user_id: blocked.id})
 
       current_user = Repo.get(User, current_user.id)
       assert current_user.info["blocks"] == []
-      assert json_response(conn, 200) == UserView.render("show.json", %{user: blocked, for: current_user})
+
+      assert json_response(conn, 200) ==
+               UserView.render("show.json", %{user: blocked, for: current_user})
     end
   end
 
   describe "GET /help/test.json" do
     test "returns \"ok\"", %{conn: conn} do
-      conn = get conn, "/api/help/test.json"
+      conn = get(conn, "/api/help/test.json")
       assert json_response(conn, 200) == "ok"
     end
   end
 
   describe "POST /api/qvitter/update_avatar.json" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
-      conn = post conn, "/api/qvitter/update_avatar.json"
+      conn = post(conn, "/api/qvitter/update_avatar.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
     test "with credentials", %{conn: conn, user: current_user} do
-      conn = conn
-      |> with_credentials(current_user.nickname, "test")
-      |> post("/api/qvitter/update_avatar.json", %{img: Pleroma.Web.ActivityPub.ActivityPubTest.data_uri})
+      avatar_image = File.read!("test/fixtures/avatar_data_uri")
+
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> post("/api/qvitter/update_avatar.json", %{img: avatar_image})
 
       current_user = Repo.get(User, current_user.id)
       assert is_map(current_user.avatar)
-      assert json_response(conn, 200) == UserView.render("show.json", %{user: current_user, for: current_user})
+
+      assert json_response(conn, 200) ==
+               UserView.render("show.json", %{user: current_user, for: current_user})
     end
   end
 
   describe "POST /api/favorites/create/:id" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
       note_activity = insert(:note_activity)
-      conn = post conn, "/api/favorites/create/#{note_activity.id}.json"
+      conn = post(conn, "/api/favorites/create/#{note_activity.id}.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
     test "with credentials", %{conn: conn, user: current_user} do
       note_activity = insert(:note_activity)
 
-      conn = conn
-      |> with_credentials(current_user.nickname, "test")
-      |> post("/api/favorites/create/#{note_activity.id}.json")
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> post("/api/favorites/create/#{note_activity.id}.json")
 
       assert json_response(conn, 200)
     end
@@ -407,9 +513,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
   describe "POST /api/favorites/destroy/:id" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
       note_activity = insert(:note_activity)
-      conn = post conn, "/api/favorites/destroy/#{note_activity.id}.json"
+      conn = post(conn, "/api/favorites/destroy/#{note_activity.id}.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
@@ -418,9 +525,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
       object = Object.get_by_ap_id(note_activity.data["object"]["id"])
       ActivityPub.like(current_user, object)
 
-      conn = conn
-      |> with_credentials(current_user.nickname, "test")
-      |> post("/api/favorites/destroy/#{note_activity.id}.json")
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> post("/api/favorites/destroy/#{note_activity.id}.json")
 
       assert json_response(conn, 200)
     end
@@ -428,9 +536,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
   describe "POST /api/statuses/retweet/:id" do
     setup [:valid_user]
+
     test "without valid credentials", %{conn: conn} do
       note_activity = insert(:note_activity)
-      conn = post conn, "/api/statuses/retweet/#{note_activity.id}.json"
+      conn = post(conn, "/api/statuses/retweet/#{note_activity.id}.json")
       assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
     end
 
@@ -439,12 +548,16 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
       request_path = "/api/statuses/retweet/#{note_activity.id}.json"
 
-      response = conn
-      |> with_credentials(current_user.nickname, "test")
-      |> post(request_path)
+      response =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> post(request_path)
+
       activity = Repo.get(Activity, note_activity.id)
       activity_user = Repo.get_by(User, ap_id: note_activity.data["actor"])
-      assert json_response(response, 200) == ActivityRepresenter.to_map(activity, %{user: activity_user, for: current_user})
+
+      assert json_response(response, 200) ==
+               ActivityRepresenter.to_map(activity, %{user: activity_user, for: current_user})
     end
   end
 
@@ -459,8 +572,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
         "confirm" => "bear"
       }
 
-      conn = conn
-      |> post("/api/account/register", data)
+      conn =
+        conn
+        |> post("/api/account/register", data)
 
       user = json_response(conn, 200)
 
@@ -477,8 +591,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
         "confirm" => "bear"
       }
 
-      conn = conn
-      |> post("/api/account/register", data)
+      conn =
+        conn
+        |> post("/api/account/register", data)
 
       errors = json_response(conn, 400)
 
@@ -491,9 +606,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
       user = insert(:user)
       other_user = insert(:user)
 
-      conn = conn
-      |> assign(:user, user)
-      |> get("/api/externalprofile/show", %{profileurl: other_user.ap_id})
+      conn =
+        conn
+        |> assign(:user, user)
+        |> get("/api/externalprofile/show", %{profileurl: other_user.ap_id})
 
       assert json_response(conn, 200) == UserView.render("show.json", %{user: other_user})
     end
@@ -504,34 +620,82 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
       user = insert(:user)
       follower_one = insert(:user)
       follower_two = insert(:user)
-      not_follower = insert(:user)
+      _not_follower = insert(:user)
 
       {:ok, follower_one} = User.follow(follower_one, user)
       {:ok, follower_two} = User.follow(follower_two, user)
 
-      conn = conn
-      |> assign(:user, user)
-      |> get("/api/statuses/followers")
+      conn =
+        conn
+        |> assign(:user, user)
+        |> get("/api/statuses/followers")
 
-      assert json_response(conn, 200) == UserView.render("index.json", %{users: [follower_one, follower_two], for: user})
+      expected = UserView.render("index.json", %{users: [follower_one, follower_two], for: user})
+      result = json_response(conn, 200)
+      assert Enum.sort(expected) == Enum.sort(result)
     end
   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)
-      not_followed = insert(:user)
+      _not_followed = insert(:user)
 
       {:ok, user} = User.follow(user, followed_one)
       {:ok, user} = User.follow(user, followed_two)
 
-      conn = conn
-      |> assign(:user, user)
-      |> get("/api/statuses/friends")
+      conn =
+        conn
+        |> assign(:user, user)
+        |> get("/api/statuses/friends")
+
+      expected = UserView.render("index.json", %{users: [followed_one, followed_two], for: user})
+      result = json_response(conn, 200)
+      assert Enum.sort(expected) == Enum.sort(result)
+    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)
 
-      assert MapSet.equal?(MapSet.new(json_response(conn, 200)), MapSet.new(UserView.render("index.json", %{users: [followed_one, followed_two], for: user})))
+      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
 
@@ -540,27 +704,36 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
       user = insert(:user)
       followed_one = insert(:user)
       followed_two = insert(:user)
-      not_followed = insert(:user)
+      _not_followed = insert(:user)
 
       {:ok, user} = User.follow(user, followed_one)
       {:ok, user} = User.follow(user, followed_two)
 
-      conn = conn
-      |> assign(:user, user)
-      |> get("/api/friends/ids")
+      conn =
+        conn
+        |> assign(:user, user)
+        |> get("/api/friends/ids")
 
       expected = [followed_one.id, followed_two.id]
-      assert MapSet.equal?(MapSet.new(Poison.decode!(json_response(conn, 200))), MapSet.new(expected))
+
+      assert MapSet.equal?(
+               MapSet.new(Poison.decode!(json_response(conn, 200))),
+               MapSet.new(expected)
+             )
     end
   end
 
   describe "POST /api/account/update_profile.json" do
-    test "it updates a user's profile" do
+    test "it updates a user's profile", %{conn: conn} do
       user = insert(:user)
 
-      conn = conn
-      |> assign(:user, user)
-      |> post("/api/account/update_profile.json", %{"name" => "new name", "description" => "new description"})
+      conn =
+        conn
+        |> assign(:user, user)
+        |> post("/api/account/update_profile.json", %{
+          "name" => "new name",
+          "description" => "new description"
+        })
 
       user = Repo.get!(User, user.id)
       assert user.name == "new name"
@@ -588,8 +761,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
       {:ok, activity} = CommonAPI.post(user, %{"status" => "This is about 2hu"})
       {:ok, _} = CommonAPI.post(user_two, %{"status" => "This isn't"})
 
-      conn = conn
-      |> get("/api/search.json", %{"q" => "2hu", "page" => "1", "rpp" => "1"})
+      conn =
+        conn
+        |> get("/api/search.json", %{"q" => "2hu", "page" => "1", "rpp" => "1"})
 
       assert [status] = json_response(conn, 200)
       assert status["id"] == activity.id
@@ -597,18 +771,62 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
   end
 
   describe "GET /api/statusnet/tags/timeline/:tag.json" do
-    test "it returns the tags timeline" do
+    test "it returns the tags timeline", %{conn: conn} do
       user = insert(:user)
       user_two = insert(:user, %{nickname: "shp@shitposter.club"})
 
       {:ok, activity} = CommonAPI.post(user, %{"status" => "This is about #2hu"})
       {:ok, _} = CommonAPI.post(user_two, %{"status" => "This isn't"})
 
-      conn = conn
-      |> get("/api/statusnet/tags/timeline/2hu.json")
+      conn =
+        conn
+        |> get("/api/statusnet/tags/timeline/2hu.json")
 
       assert [status] = json_response(conn, 200)
       assert status["id"] == activity.id
     end
   end
+
+  test "Convert newlines to <br> in bio", %{conn: conn} do
+    user = insert(:user)
+
+    conn =
+      conn
+      |> assign(:user, user)
+      |> post("/api/account/update_profile.json", %{
+        "description" => "Hello,\r\nWorld! I\n am a test."
+      })
+
+    user = Repo.get!(User, user.id)
+    assert user.bio == "Hello,<br>World! I<br> am a test."
+  end
+
+  describe "POST /api/pleroma/delete_account" do
+    setup [:valid_user]
+
+    test "without credentials", %{conn: conn} do
+      conn = post(conn, "/api/pleroma/delete_account")
+      assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
+    end
+
+    test "with credentials and invalid password", %{conn: conn, user: current_user} do
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> post("/api/pleroma/delete_account", %{"password" => "hi"})
+
+      assert json_response(conn, 200) == %{"error" => "Invalid password."}
+    end
+
+    test "with credentials and valid password", %{conn: conn, user: current_user} do
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> post("/api/pleroma/delete_account", %{"password" => "test"})
+
+      assert json_response(conn, 200) == %{"status" => "success"}
+      fetched_user = Repo.get(User, current_user.id)
+      assert fetched_user.info == %{"deactivated" => true}
+    end
+  end
 end