X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fmastodon_api%2Fmastodon_api_controller_test.exs;h=8d79c96b1d558a329df2dfac7fb870716af7c141;hb=8b0c222b436d9473f868087fb4eaf78a0b1e7052;hp=d118026eb3b4d521c1d8bf59fd98e13912d1c6fc;hpb=fa1f11e8e9c31b0ed2857ca3c3feb78552ed54d0;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 d118026eb..8d79c96b1 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -2,10 +2,11 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   use Pleroma.Web.ConnCase
 
   alias Pleroma.Web.TwitterAPI.TwitterAPI
-  alias Pleroma.{Repo, User, Activity}
+  alias Pleroma.{Repo, User, Activity, Notification}
   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,28 +34,93 @@ 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")
+      {: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"})
+
+      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"})
+    idempotency_key = "Pikachu rocks!"
+
+    conn_one =
+      conn
+      |> assign(:user, user)
+      |> put_req_header("idempotency-key", idempotency_key)
+      |> post("/api/v1/statuses", %{
+        "status" => "cofe",
+        "spoiler_text" => "2hu",
+        "sensitive" => "false"
+      })
+
+    {:ok, ttl} = Cachex.ttl(:idempotency_cache, idempotency_key)
+    # Six hours
+    assert ttl > :timer.seconds(6 * 60 * 60 - 1)
+
+    assert %{"content" => "cofe", "id" => id, "spoiler_text" => "2hu", "sensitive" => false} =
+             json_response(conn_one, 200)
 
-    assert %{"content" => "cofe", "id" => id, "spoiler_text" => "2hu"} = json_response(conn, 200)
+    assert Repo.get(Activity, id)
+
+    conn_two =
+      conn
+      |> assign(:user, user)
+      |> put_req_header("idempotency-key", idempotency_key)
+      |> post("/api/v1/statuses", %{
+        "status" => "cofe",
+        "spoiler_text" => "2hu",
+        "sensitive" => "false"
+      })
+
+    assert %{"id" => second_id} = json_response(conn_two, 200)
+
+    assert id == second_id
+
+    conn_three =
+      conn
+      |> assign(:user, user)
+      |> post("/api/v1/statuses", %{
+        "status" => "cofe",
+        "spoiler_text" => "2hu",
+        "sensitive" => "false"
+      })
+
+    assert %{"id" => third_id} = json_response(conn_three, 200)
+
+    refute id == third_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})
+
+    assert %{"content" => "cofe", "id" => id, "sensitive" => true} = json_response(conn, 200)
     assert Repo.get(Activity, id)
   end
 
@@ -61,9 +129,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)
 
@@ -76,19 +145,21 @@ 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 == user.id
+    assert id == to_string(user.id)
   end
 
   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)
@@ -99,9 +170,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)
 
@@ -112,9 +184,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)
 
@@ -122,16 +195,123 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     end
   end
 
+  describe "notifications" do
+    test "list of notifications", %{conn: conn} 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)
+
+      conn =
+        conn
+        |> assign(:user, user)
+        |> get("/api/v1/notifications")
+
+      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
+
+    test "getting a single notification", %{conn: conn} 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)
+
+      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>"
+
+      assert %{"status" => %{"content" => response}} = json_response(conn, 200)
+      assert response == expected_response
+    end
+
+    test "dismissing a single notification", %{conn: conn} 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)
+
+      conn =
+        conn
+        |> assign(:user, user)
+        |> post("/api/v1/notifications/dismiss", %{"id" => notification.id})
+
+      assert %{} = json_response(conn, 200)
+    end
+
+    test "clearing all notifications", %{conn: conn} 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)
+
+      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")
+
+      assert all = json_response(conn, 200)
+      assert all == []
+    end
+  end
+
   describe "reblogging" do
     test "reblogs and returns the reblogged status", %{conn: conn} 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 to_string(activity.id) == id
+    end
+  end
+
+  describe "unreblogging" do
+    test "unreblogs and returns the unreblogged status", %{conn: conn} do
+      activity = insert(:note_activity)
+      user = insert(:user)
+
+      {:ok, _, _} = CommonAPI.repeat(activity.id, user)
+
+      conn =
+        conn
+        |> assign(:user, user)
+        |> post("/api/v1/statuses/#{activity.id}/unreblog")
+
+      assert %{"id" => id, "reblogged" => false, "reblogs_count" => 0} = json_response(conn, 200)
 
-      assert %{"id" => id, "reblogged" => true, "reblogs_count" => 1} = json_response(conn, 200)
       assert to_string(activity.id) == id
     end
   end
@@ -141,11 +321,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
@@ -157,11 +340,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
@@ -173,13 +359,57 @@ 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!()
+
+      {: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"})
+
+      assert [%{"id" => id}] = json_response(conn, 200)
+      assert id == to_string(image_post.id)
+    end
   end
 
   describe "user relationships" do
@@ -188,39 +418,47 @@ 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)
 
-      assert other_user.id == relationship["id"]
+      assert to_string(other_user.id) == relationship["id"]
     end
   end
 
   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 == user.id
+    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)
 
@@ -230,15 +468,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
@@ -246,11 +489,12 @@ 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 = user.id
+    assert id == to_string(user.id)
   end
 
   test "getting following", %{conn: conn} do
@@ -258,55 +502,64 @@ 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 = other_user.id
+    assert id == to_string(other_user.id)
   end
 
   test "following / unfollowing a user", %{conn: conn} 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 == other_user.id
+    assert id == to_string(other_user.id)
   end
 
   test "blocking / unblocking a user", %{conn: conn} 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
@@ -315,11 +568,12 @@ 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 = other_user.id
+    other_user_id = to_string(other_user.id)
     assert [%{"id" => ^other_user_id}] = json_response(conn, 200)
   end
 
@@ -328,13 +582,14 @@ 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 == other_user.id
+      assert id == to_string(other_user.id)
     end)
   end
 
@@ -342,10 +597,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)
@@ -356,12 +612,26 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     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"})
+    results =
+      conn
+      |> assign(:user, user)
+      |> get("/api/v1/accounts/search", %{"q" => "shp"})
+      |> json_response(200)
+
+    result_ids = for result <- results, do: result["acct"]
+
+    assert user_two.nickname in result_ids
+    assert user_three.nickname in result_ids
+
+    results =
+      conn
+      |> assign(:user, user)
+      |> get("/api/v1/accounts/search", %{"q" => "2hu"})
+      |> json_response(200)
 
-    assert [account] = json_response(conn, 200)
-    assert account["id"] == user_three.id
+    result_ids = for result <- results, do: result["acct"]
+
+    assert user_three.nickname in result_ids
   end
 
   test "search", %{conn: conn} do
@@ -370,15 +640,23 @@ 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)
 
-    [account] = results["accounts"]
-    assert account["id"] == user_three.id
+    [account | _] = results["accounts"]
+    assert account["id"] == to_string(user_three.id)
 
     assert results["hashtags"] == []
 
@@ -386,9 +664,23 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     assert status["id"] == to_string(activity.id)
   end
 
+  test "search fetches remote statuses", %{conn: conn} do
+    capture_log(fn ->
+      conn =
+        conn
+        |> get("/api/v1/search", %{"q" => "https://shitposter.club/notice/2827873"})
+
+      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"]
@@ -404,11 +696,93 @@ 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", %{conn: conn} do
+      user = insert(:user)
+
+      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", %{conn: conn} do
+      user = insert(:user)
+
+      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", %{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"
+      }
+
+      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", %{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"
+      }
+
+      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", %{conn: conn} do
+    insert(:user, %{local: true})
+    user = insert(:user, %{local: true})
+    insert(:user, %{local: false})
+
+    {:ok, _} = TwitterAPI.create_status(user, %{"status" => "cofe"})
+
+    Pleroma.Stats.update_stats()
+
+    conn =
+      conn
+      |> get("/api/v1/instance")
+
+    assert result = json_response(conn, 200)
+
+    assert result["stats"]["user_count"] == 2
+    assert result["stats"]["status_count"] == 1
+  end
 end