1 files changed, 69 insertions, 10 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index e876b0af4..f506d56a1 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -81,7 +81,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     |> 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
@@ -263,7 +263,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
       assert [relationship] = json_response(conn, 200)
 
-      assert other_user.id == relationship["id"]
+      assert to_string(other_user.id) == relationship["id"]
     end
   end
 
@@ -274,7 +274,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     |> 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")
@@ -319,7 +319,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     |> 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
@@ -331,7 +331,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     |> 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
@@ -357,7 +357,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     |> 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
@@ -388,7 +388,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     |> 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
 
@@ -403,7 +403,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       |> 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
 
@@ -430,7 +430,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     |> get("/api/v1/accounts/search", %{"q" => "2hu"})
 
     assert [account] = json_response(conn, 200)
-    assert account["id"] == user_three.id
+    assert account["id"] == to_string(user_three.id)
   end
 
   test "search", %{conn: conn} do
@@ -447,7 +447,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     assert results = json_response(conn, 200)
 
     [account] = results["accounts"]
-    assert account["id"] == user_three.id
+    assert account["id"] == to_string(user_three.id)
 
     assert results["hashtags"] == []
 
@@ -455,6 +455,15 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     assert status["id"] == to_string(activity.id)
   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)
+
+    [status] = results["statuses"]
+    assert status["uri"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
+  end
+
   test "search fetches remote accounts", %{conn: conn} do
     conn = conn
     |> get("/api/v1/search", %{"q" => "shp@social.heldscal.la", "resolve" => "true"})
@@ -480,4 +489,54 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     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
+      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" 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" 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" 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
 end