X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fweb%2Fmastodon_api%2Fmastodon_api_controller_test.exs;h=5293b9364ee375441a130f0f121e22c5c1718a87;hb=a7a40bb8f1eaf30f0f0d581089ff3ef45de4087c;hp=93b29dfaef8631567e4364f85f5b80a35e11b054;hpb=52200998c997576c9008cbe50b0a7b9f0e6134cc;p=akkoma

diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index 93b29dfae..5293b9364 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -6,6 +6,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   alias Pleroma.Web.{OStatus, CommonAPI}
 
   import Pleroma.Factory
+  import ExUnit.CaptureLog
 
   test "the home timeline", %{conn: conn} do
     user = insert(:user)
@@ -13,17 +14,19 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
     {:ok, _activity} = TwitterAPI.create_status(following, %{"status" => "test"})
 
-    conn = conn
-    |> assign(:user, user)
-    |> get("/api/v1/timelines/home")
+    conn =
+      conn
+      |> assign(:user, user)
+      |> get("/api/v1/timelines/home")
 
     assert length(json_response(conn, 200)) == 0
 
     {:ok, user} = User.follow(user, following)
 
-    conn = build_conn()
-    |> assign(:user, user)
-    |> get("/api/v1/timelines/home")
+    conn =
+      build_conn()
+      |> assign(:user, user)
+      |> get("/api/v1/timelines/home")
 
     assert [%{"content" => "test"}] = json_response(conn, 200)
   end
@@ -31,42 +34,57 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   test "the public timeline", %{conn: conn} do
     following = insert(:user)
 
-    {:ok, _activity} = TwitterAPI.create_status(following, %{"status" => "test"})
-    {:ok, [_activity]} = OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873")
+    capture_log(fn ->
+      {:ok, _activity} = TwitterAPI.create_status(following, %{"status" => "test"})
 
-    conn = conn
-    |> get("/api/v1/timelines/public", %{"local" => "False"})
+      {:ok, [_activity]} =
+        OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873")
 
-    assert length(json_response(conn, 200)) == 2
+      conn =
+        conn
+        |> get("/api/v1/timelines/public", %{"local" => "False"})
 
-    conn = build_conn()
-    |> get("/api/v1/timelines/public", %{"local" => "True"})
+      assert length(json_response(conn, 200)) == 2
 
-    assert [%{"content" => "test"}] = json_response(conn, 200)
+      conn =
+        build_conn()
+        |> get("/api/v1/timelines/public", %{"local" => "True"})
 
-    conn = build_conn()
-    |> get("/api/v1/timelines/public", %{"local" => "1"})
+      assert [%{"content" => "test"}] = json_response(conn, 200)
 
-    assert [%{"content" => "test"}] = json_response(conn, 200)
+      conn =
+        build_conn()
+        |> get("/api/v1/timelines/public", %{"local" => "1"})
+
+      assert [%{"content" => "test"}] = json_response(conn, 200)
+    end)
   end
 
   test "posting a status", %{conn: conn} do
     user = insert(:user)
 
-    conn = conn
-    |> assign(:user, user)
-    |> post("/api/v1/statuses", %{"status" => "cofe", "spoiler_text" => "2hu", "sensitive" => "false"})
+    conn =
+      conn
+      |> assign(:user, user)
+      |> post("/api/v1/statuses", %{
+        "status" => "cofe",
+        "spoiler_text" => "2hu",
+        "sensitive" => "false"
+      })
+
+    assert %{"content" => "cofe", "id" => id, "spoiler_text" => "2hu", "sensitive" => false} =
+             json_response(conn, 200)
 
-    assert %{"content" => "cofe", "id" => id, "spoiler_text" => "2hu", "sensitive" => false} = json_response(conn, 200)
     assert Repo.get(Activity, id)
   end
 
   test "posting a sensitive status", %{conn: conn} do
     user = insert(:user)
 
-    conn = conn
-    |> assign(:user, user)
-    |> post("/api/v1/statuses", %{"status" => "cofe", "sensitive" => true})
+    conn =
+      conn
+      |> assign(:user, user)
+      |> post("/api/v1/statuses", %{"status" => "cofe", "sensitive" => true})
 
     assert %{"content" => "cofe", "id" => id, "sensitive" => true} = json_response(conn, 200)
     assert Repo.get(Activity, id)
@@ -77,9 +95,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
     {:ok, replied_to} = TwitterAPI.create_status(user, %{"status" => "cofe"})
 
-    conn = conn
-    |> assign(:user, user)
-    |> post("/api/v1/statuses", %{"status" => "xD", "in_reply_to_id" => replied_to.id})
+    conn =
+      conn
+      |> assign(:user, user)
+      |> post("/api/v1/statuses", %{"status" => "xD", "in_reply_to_id" => replied_to.id})
 
     assert %{"content" => "xD", "id" => id} = json_response(conn, 200)
 
@@ -92,9 +111,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   test "verify_credentials", %{conn: conn} do
     user = insert(:user)
 
-    conn = conn
-    |> assign(:user, user)
-    |> get("/api/v1/accounts/verify_credentials")
+    conn =
+      conn
+      |> assign(:user, user)
+      |> get("/api/v1/accounts/verify_credentials")
 
     assert %{"id" => id} = json_response(conn, 200)
     assert id == to_string(user.id)
@@ -103,8 +123,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   test "get a status", %{conn: conn} do
     activity = insert(:note_activity)
 
-    conn = conn
-    |> get("/api/v1/statuses/#{activity.id}")
+    conn =
+      conn
+      |> get("/api/v1/statuses/#{activity.id}")
 
     assert %{"id" => id} = json_response(conn, 200)
     assert id == to_string(activity.id)
@@ -115,9 +136,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       activity = insert(:note_activity)
       author = User.get_by_ap_id(activity.data["actor"])
 
-      conn = conn
-      |> assign(:user, author)
-      |> delete("/api/v1/statuses/#{activity.id}")
+      conn =
+        conn
+        |> assign(:user, author)
+        |> delete("/api/v1/statuses/#{activity.id}")
 
       assert %{} = json_response(conn, 200)
 
@@ -128,9 +150,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       activity = insert(:note_activity)
       user = insert(:user)
 
-      conn = conn
-      |> assign(:user, user)
-      |> delete("/api/v1/statuses/#{activity.id}")
+      conn =
+        conn
+        |> assign(:user, user)
+        |> delete("/api/v1/statuses/#{activity.id}")
 
       assert %{"error" => _} = json_response(conn, 403)
 
@@ -143,14 +166,19 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       user = insert(:user)
       other_user = insert(:user)
 
-      {:ok, activity} = TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
-      {:ok, [notification]} = Notification.create_notifications(activity)
+      {:ok, activity} =
+        TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
 
-      conn = conn
-      |> assign(:user, user)
-      |> get("/api/v1/notifications")
+      {:ok, [_notification]} = Notification.create_notifications(activity)
+
+      conn =
+        conn
+        |> assign(:user, user)
+        |> get("/api/v1/notifications")
+
+      expected_response =
+        "hi <span><a href=\"#{user.ap_id}\">@<span>#{user.nickname}</span></a></span>"
 
-      expected_response = "hi <span><a href=\"#{user.ap_id}\">@<span>#{user.nickname}</span></a></span>"
       assert [%{"status" => %{"content" => response}} | _rest] = json_response(conn, 200)
       assert response == expected_response
     end
@@ -159,14 +187,19 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       user = insert(:user)
       other_user = insert(:user)
 
-      {:ok, activity} = TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
+      {:ok, activity} =
+        TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
+
       {:ok, [notification]} = Notification.create_notifications(activity)
 
-      conn = conn
-      |> assign(:user, user)
-      |> get("/api/v1/notifications/#{notification.id}")
+      conn =
+        conn
+        |> assign(:user, user)
+        |> get("/api/v1/notifications/#{notification.id}")
+
+      expected_response =
+        "hi <span><a href=\"#{user.ap_id}\">@<span>#{user.nickname}</span></a></span>"
 
-      expected_response = "hi <span><a href=\"#{user.ap_id}\">@<span>#{user.nickname}</span></a></span>"
       assert %{"status" => %{"content" => response}} = json_response(conn, 200)
       assert response == expected_response
     end
@@ -175,12 +208,15 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       user = insert(:user)
       other_user = insert(:user)
 
-      {:ok, activity} = TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
+      {:ok, activity} =
+        TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
+
       {:ok, [notification]} = Notification.create_notifications(activity)
 
-      conn = conn
-      |> assign(:user, user)
-      |> post("/api/v1/notifications/dismiss", %{"id" => notification.id})
+      conn =
+        conn
+        |> assign(:user, user)
+        |> post("/api/v1/notifications/dismiss", %{"id" => notification.id})
 
       assert %{} = json_response(conn, 200)
     end
@@ -189,18 +225,22 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       user = insert(:user)
       other_user = insert(:user)
 
-      {:ok, activity} = TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
-      {:ok, [notification]} = Notification.create_notifications(activity)
+      {:ok, activity} =
+        TwitterAPI.create_status(other_user, %{"status" => "hi @#{user.nickname}"})
 
-      conn = conn
-      |> assign(:user, user)
-      |> post("/api/v1/notifications/clear")
+      {:ok, [_notification]} = Notification.create_notifications(activity)
+
+      conn =
+        conn
+        |> assign(:user, user)
+        |> post("/api/v1/notifications/clear")
 
       assert %{} = json_response(conn, 200)
 
-      conn = build_conn()
-      |> assign(:user, user)
-      |> get("/api/v1/notifications")
+      conn =
+        build_conn()
+        |> assign(:user, user)
+        |> get("/api/v1/notifications")
 
       assert all = json_response(conn, 200)
       assert all == []
@@ -212,11 +252,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       activity = insert(:note_activity)
       user = insert(:user)
 
-      conn = conn
-      |> assign(:user, user)
-      |> post("/api/v1/statuses/#{activity.id}/reblog")
+      conn =
+        conn
+        |> assign(:user, user)
+        |> post("/api/v1/statuses/#{activity.id}/reblog")
+
+      assert %{"reblog" => %{"id" => id, "reblogged" => true, "reblogs_count" => 1}} =
+               json_response(conn, 200)
 
-      assert %{"reblog" => %{"id" => id, "reblogged" => true, "reblogs_count" => 1}} = json_response(conn, 200)
       assert to_string(activity.id) == id
     end
   end
@@ -226,11 +269,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       activity = insert(:note_activity)
       user = insert(:user)
 
-      conn = conn
-      |> assign(:user, user)
-      |> post("/api/v1/statuses/#{activity.id}/favourite")
+      conn =
+        conn
+        |> assign(:user, user)
+        |> post("/api/v1/statuses/#{activity.id}/favourite")
+
+      assert %{"id" => id, "favourites_count" => 1, "favourited" => true} =
+               json_response(conn, 200)
 
-      assert %{"id" => id, "favourites_count" => 1, "favourited" => true} = json_response(conn, 200)
       assert to_string(activity.id) == id
     end
   end
@@ -242,11 +288,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
       {:ok, _, _} = CommonAPI.favorite(activity.id, user)
 
-      conn = conn
-      |> assign(:user, user)
-      |> post("/api/v1/statuses/#{activity.id}/unfavourite")
+      conn =
+        conn
+        |> assign(:user, user)
+        |> post("/api/v1/statuses/#{activity.id}/unfavourite")
+
+      assert %{"id" => id, "favourites_count" => 0, "favourited" => false} =
+               json_response(conn, 200)
 
-      assert %{"id" => id, "favourites_count" => 0, "favourited" => false} = json_response(conn, 200)
       assert to_string(activity.id) == id
     end
   end
@@ -258,32 +307,53 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
       user = User.get_by_ap_id(note_two.data["actor"])
 
-      conn = conn
-      |> get("/api/v1/accounts/#{user.id}/statuses")
+      conn =
+        conn
+        |> get("/api/v1/accounts/#{user.id}/statuses")
 
       assert [%{"id" => id}] = json_response(conn, 200)
 
       assert id == to_string(note_two.id)
     end
 
+    test "unimplemented pinned statuses feature", %{conn: conn} do
+      note = insert(:note_activity)
+      user = User.get_by_ap_id(note.data["actor"])
+
+      conn =
+        conn
+        |> get("/api/v1/accounts/#{user.id}/statuses?pinned=true")
+
+      assert json_response(conn, 200) == []
+    end
+
     test "gets an users media", %{conn: conn} do
       note = insert(:note_activity)
       user = User.get_by_ap_id(note.data["actor"])
 
-      file = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg"}
-      media = TwitterAPI.upload(file, "json")
-      |> Poison.decode!
+      file = %Plug.Upload{
+        content_type: "image/jpg",
+        path: Path.absname("test/fixtures/image.jpg"),
+        filename: "an_image.jpg"
+      }
 
-      {:ok, image_post} = TwitterAPI.create_status(user, %{"status" => "cofe", "media_ids" => [media["media_id"]]})
+      media =
+        TwitterAPI.upload(file, "json")
+        |> Poison.decode!()
 
-      conn = conn
-      |> get("/api/v1/accounts/#{user.id}/statuses", %{"only_media" => "true"})
+      {:ok, image_post} =
+        TwitterAPI.create_status(user, %{"status" => "cofe", "media_ids" => [media["media_id"]]})
+
+      conn =
+        conn
+        |> get("/api/v1/accounts/#{user.id}/statuses", %{"only_media" => "true"})
 
       assert [%{"id" => id}] = json_response(conn, 200)
       assert id == to_string(image_post.id)
 
-      conn = build_conn()
-      |> get("/api/v1/accounts/#{user.id}/statuses", %{"only_media" => "1"})
+      conn =
+        build_conn()
+        |> get("/api/v1/accounts/#{user.id}/statuses", %{"only_media" => "1"})
 
       assert [%{"id" => id}] = json_response(conn, 200)
       assert id == to_string(image_post.id)
@@ -296,9 +366,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       other_user = insert(:user)
       {:ok, user} = User.follow(user, other_user)
 
-      conn = conn
-      |> assign(:user, user)
-      |> get("/api/v1/accounts/relationships", %{"id" => [other_user.id]})
+      conn =
+        conn
+        |> assign(:user, user)
+        |> get("/api/v1/accounts/relationships", %{"id" => [other_user.id]})
 
       assert [relationship] = json_response(conn, 200)
 
@@ -309,26 +380,33 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   test "account fetching", %{conn: conn} do
     user = insert(:user)
 
-    conn = conn
-    |> get("/api/v1/accounts/#{user.id}")
+    conn =
+      conn
+      |> get("/api/v1/accounts/#{user.id}")
 
     assert %{"id" => id} = json_response(conn, 200)
     assert id == to_string(user.id)
 
-    conn = build_conn()
-    |> get("/api/v1/accounts/-1")
+    conn =
+      build_conn()
+      |> get("/api/v1/accounts/-1")
 
     assert %{"error" => "Can't find user"} = json_response(conn, 404)
   end
 
   test "media upload", %{conn: conn} do
-    file = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg"}
+    file = %Plug.Upload{
+      content_type: "image/jpg",
+      path: Path.absname("test/fixtures/image.jpg"),
+      filename: "an_image.jpg"
+    }
 
     user = insert(:user)
 
-    conn = conn
-    |> assign(:user, user)
-    |> post("/api/v1/media", %{"file" => file})
+    conn =
+      conn
+      |> assign(:user, user)
+      |> post("/api/v1/media", %{"file" => file})
 
     assert media = json_response(conn, 200)
 
@@ -338,15 +416,20 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   test "hashtag timeline", %{conn: conn} do
     following = insert(:user)
 
-    {:ok, activity} = TwitterAPI.create_status(following, %{"status" => "test #2hu"})
-    {:ok, [_activity]} = OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873")
+    capture_log(fn ->
+      {:ok, activity} = TwitterAPI.create_status(following, %{"status" => "test #2hu"})
 
-    conn = conn
-    |> get("/api/v1/timelines/tag/2hu")
+      {:ok, [_activity]} =
+        OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873")
 
-    assert [%{"id" => id}] = json_response(conn, 200)
+      conn =
+        conn
+        |> get("/api/v1/timelines/tag/2hu")
 
-    assert id == to_string(activity.id)
+      assert [%{"id" => id}] = json_response(conn, 200)
+
+      assert id == to_string(activity.id)
+    end)
   end
 
   test "getting followers", %{conn: conn} do
@@ -354,8 +437,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     other_user = insert(:user)
     {:ok, user} = User.follow(user, other_user)
 
-    conn = conn
-    |> get("/api/v1/accounts/#{other_user.id}/followers")
+    conn =
+      conn
+      |> get("/api/v1/accounts/#{other_user.id}/followers")
 
     assert [%{"id" => id}] = json_response(conn, 200)
     assert id == to_string(user.id)
@@ -366,8 +450,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     other_user = insert(:user)
     {:ok, user} = User.follow(user, other_user)
 
-    conn = conn
-    |> get("/api/v1/accounts/#{user.id}/following")
+    conn =
+      conn
+      |> get("/api/v1/accounts/#{user.id}/following")
 
     assert [%{"id" => id}] = json_response(conn, 200)
     assert id == to_string(other_user.id)
@@ -377,23 +462,28 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     user = insert(:user)
     other_user = insert(:user)
 
-    conn = conn
-    |> assign(:user, user)
-    |> post("/api/v1/accounts/#{other_user.id}/follow")
+    conn =
+      conn
+      |> assign(:user, user)
+      |> post("/api/v1/accounts/#{other_user.id}/follow")
 
-    assert %{"id" => id, "following" => true} = json_response(conn, 200)
+    assert %{"id" => _id, "following" => true} = json_response(conn, 200)
 
     user = Repo.get(User, user.id)
-    conn = build_conn()
-    |> assign(:user, user)
-    |> post("/api/v1/accounts/#{other_user.id}/unfollow")
 
-    assert %{"id" => id, "following" => false} = json_response(conn, 200)
+    conn =
+      build_conn()
+      |> assign(:user, user)
+      |> post("/api/v1/accounts/#{other_user.id}/unfollow")
+
+    assert %{"id" => _id, "following" => false} = json_response(conn, 200)
 
     user = Repo.get(User, user.id)
-    conn = build_conn()
-    |> assign(:user, user)
-    |> post("/api/v1/follows", %{"uri" => other_user.nickname})
+
+    conn =
+      build_conn()
+      |> assign(:user, user)
+      |> post("/api/v1/follows", %{"uri" => other_user.nickname})
 
     assert %{"id" => id} = json_response(conn, 200)
     assert id == to_string(other_user.id)
@@ -403,18 +493,21 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     user = insert(:user)
     other_user = insert(:user)
 
-    conn = conn
-    |> assign(:user, user)
-    |> post("/api/v1/accounts/#{other_user.id}/block")
+    conn =
+      conn
+      |> assign(:user, user)
+      |> post("/api/v1/accounts/#{other_user.id}/block")
 
-    assert %{"id" => id, "blocking" => true} = json_response(conn, 200)
+    assert %{"id" => _id, "blocking" => true} = json_response(conn, 200)
 
     user = Repo.get(User, user.id)
-    conn = build_conn()
-    |> assign(:user, user)
-    |> post("/api/v1/accounts/#{other_user.id}/unblock")
 
-    assert %{"id" => id, "blocking" => false} = json_response(conn, 200)
+    conn =
+      build_conn()
+      |> assign(:user, user)
+      |> post("/api/v1/accounts/#{other_user.id}/unblock")
+
+    assert %{"id" => _id, "blocking" => false} = json_response(conn, 200)
   end
 
   test "getting a list of blocks", %{conn: conn} do
@@ -423,9 +516,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
     {:ok, user} = User.block(user, other_user)
 
-    conn = conn
-    |> assign(:user, user)
-    |> get("/api/v1/blocks")
+    conn =
+      conn
+      |> assign(:user, user)
+      |> get("/api/v1/blocks")
 
     other_user_id = to_string(other_user.id)
     assert [%{"id" => ^other_user_id}] = json_response(conn, 200)
@@ -436,10 +530,11 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     other_user = insert(:user)
 
     ["mute", "unmute"]
-    |> Enum.each(fn(endpoint) ->
-      conn = build_conn()
-      |> assign(:user, user)
-      |> post("/api/v1/accounts/#{other_user.id}/#{endpoint}")
+    |> Enum.each(fn endpoint ->
+      conn =
+        build_conn()
+        |> assign(:user, user)
+        |> post("/api/v1/accounts/#{other_user.id}/#{endpoint}")
 
       assert %{"id" => id} = json_response(conn, 200)
       assert id == to_string(other_user.id)
@@ -450,10 +545,11 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     user = insert(:user)
 
     ["blocks", "domain_blocks", "mutes", "follow_requests"]
-    |> Enum.each(fn(endpoint) ->
-      conn = build_conn()
-      |> assign(:user, user)
-      |> get("/api/v1/#{endpoint}")
+    |> Enum.each(fn endpoint ->
+      conn =
+        build_conn()
+        |> assign(:user, user)
+        |> get("/api/v1/#{endpoint}")
 
       assert [] = json_response(conn, 200)
     end)
@@ -461,12 +557,13 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
   test "account search", %{conn: conn} do
     user = insert(:user)
-    user_two = insert(:user, %{nickname: "shp@shitposter.club"})
+    _user_two = insert(:user, %{nickname: "shp@shitposter.club"})
     user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu"})
 
-    conn = conn
-    |> assign(:user, user)
-    |> get("/api/v1/accounts/search", %{"q" => "2hu"})
+    conn =
+      conn
+      |> assign(:user, user)
+      |> get("/api/v1/accounts/search", %{"q" => "2hu"})
 
     assert [account] = json_response(conn, 200)
     assert account["id"] == to_string(user_three.id)
@@ -478,10 +575,18 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu"})
 
     {:ok, activity} = CommonAPI.post(user, %{"status" => "This is about 2hu"})
+
+    {:ok, _activity} =
+      CommonAPI.post(user, %{
+        "status" => "This is about 2hu, but private",
+        "visibility" => "private"
+      })
+
     {:ok, _} = CommonAPI.post(user_two, %{"status" => "This isn't"})
 
-    conn = conn
-    |> get("/api/v1/search", %{"q" => "2hu"})
+    conn =
+      conn
+      |> get("/api/v1/search", %{"q" => "2hu"})
 
     assert results = json_response(conn, 200)
 
@@ -495,17 +600,22 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   end
 
   test "search fetches remote statuses", %{conn: conn} do
-    conn = conn
-    |> get("/api/v1/search", %{"q" => "https://shitposter.club/notice/2827873"})
-    assert results = json_response(conn, 200)
+    capture_log(fn ->
+      conn =
+        conn
+        |> get("/api/v1/search", %{"q" => "https://shitposter.club/notice/2827873"})
 
-    [status] = results["statuses"]
-    assert status["uri"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
+      assert results = json_response(conn, 200)
+
+      [status] = results["statuses"]
+      assert status["uri"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
+    end)
   end
 
   test "search fetches remote accounts", %{conn: conn} do
-    conn = conn
-    |> get("/api/v1/search", %{"q" => "shp@social.heldscal.la", "resolve" => "true"})
+    conn =
+      conn
+      |> get("/api/v1/search", %{"q" => "shp@social.heldscal.la", "resolve" => "true"})
 
     assert results = json_response(conn, 200)
     [account] = results["accounts"]
@@ -521,65 +631,78 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
     {:ok, _, _} = CommonAPI.favorite(activity.id, user)
 
-    conn = conn
-    |> assign(:user, user)
-    |> get("/api/v1/favourites")
+    conn =
+      conn
+      |> assign(:user, user)
+      |> get("/api/v1/favourites")
 
     assert [status] = json_response(conn, 200)
     assert status["id"] == to_string(activity.id)
   end
 
   describe "updating credentials" do
-    test "updates the user's bio" do
+    test "updates the user's bio", %{conn: conn} do
       user = insert(:user)
 
-      conn = conn
-      |> assign(:user, user)
-      |> patch("/api/v1/accounts/update_credentials", %{"note" => "I drink #cofe"})
+      conn =
+        conn
+        |> assign(:user, user)
+        |> patch("/api/v1/accounts/update_credentials", %{"note" => "I drink #cofe"})
 
       assert user = json_response(conn, 200)
       assert user["note"] == "I drink #cofe"
     end
 
-    test "updates the user's name" do
+    test "updates the user's name", %{conn: conn} do
       user = insert(:user)
 
-      conn = conn
-      |> assign(:user, user)
-      |> patch("/api/v1/accounts/update_credentials", %{"display_name" => "markorepairs"})
+      conn =
+        conn
+        |> assign(:user, user)
+        |> patch("/api/v1/accounts/update_credentials", %{"display_name" => "markorepairs"})
 
       assert user = json_response(conn, 200)
       assert user["display_name"] == "markorepairs"
     end
 
-    test "updates the user's avatar" do
+    test "updates the user's avatar", %{conn: conn} do
       user = insert(:user)
 
-      new_avatar = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg"}
+      new_avatar = %Plug.Upload{
+        content_type: "image/jpg",
+        path: Path.absname("test/fixtures/image.jpg"),
+        filename: "an_image.jpg"
+      }
 
-      conn = conn
-      |> assign(:user, user)
-      |> patch("/api/v1/accounts/update_credentials", %{"avatar" => new_avatar})
+      conn =
+        conn
+        |> assign(:user, user)
+        |> patch("/api/v1/accounts/update_credentials", %{"avatar" => new_avatar})
 
       assert user = json_response(conn, 200)
       assert user["avatar"] != "https://placehold.it/48x48"
     end
 
-    test "updates the user's banner" do
+    test "updates the user's banner", %{conn: conn} do
       user = insert(:user)
 
-      new_header = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg"}
+      new_header = %Plug.Upload{
+        content_type: "image/jpg",
+        path: Path.absname("test/fixtures/image.jpg"),
+        filename: "an_image.jpg"
+      }
 
-      conn = conn
-      |> assign(:user, user)
-      |> patch("/api/v1/accounts/update_credentials", %{"header" => new_header})
+      conn =
+        conn
+        |> assign(:user, user)
+        |> patch("/api/v1/accounts/update_credentials", %{"header" => new_header})
 
       assert user = json_response(conn, 200)
       assert user["header"] != "https://placehold.it/700x335"
     end
   end
 
-  test "get instance information" do
+  test "get instance information", %{conn: conn} do
     insert(:user, %{local: true})
     user = insert(:user, %{local: true})
     insert(:user, %{local: false})
@@ -588,8 +711,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
     Pleroma.Stats.update_stats()
 
-    conn = conn
-    |> get("/api/v1/instance")
+    conn =
+      conn
+      |> get("/api/v1/instance")
 
     assert result = json_response(conn, 200)