X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fmastodon_api%2Fmastodon_api_controller_test.exs;h=e876b0af44b6cc375d9960c09d8dd619bbbe9ca6;hb=e6a78c6ed0925c27ea4d194c0e52ab07542c444e;hp=acdb08ac246f8c4deb9887c024596fcd434eb887;hpb=9168497f8fc051a12bf320bda9c762b96da2f27d;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 acdb08ac2..e876b0af4 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -2,7 +2,7 @@ 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
@@ -50,9 +50,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
     conn = conn
     |> assign(:user, user)
-    |> post("/api/v1/statuses", %{"status" => "cofe"})
+    |> post("/api/v1/statuses", %{"status" => "cofe", "spoiler_text" => "2hu"})
 
-    assert %{"content" => "cofe", "id" => id} = json_response(conn, 200)
+    assert %{"content" => "cofe", "id" => id, "spoiler_text" => "2hu"} = json_response(conn, 200)
     assert Repo.get(Activity, id)
   end
 
@@ -91,7 +91,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     |> get("/api/v1/statuses/#{activity.id}")
 
     assert %{"id" => id} = json_response(conn, 200)
-    assert id == activity.id
+    assert id == to_string(activity.id)
   end
 
   describe "deleting a status" do
@@ -122,6 +122,75 @@ 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 <a href=\"#{user.ap_id}\">@#{user.nickname}</a>"
+      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 <a href=\"#{user.ap_id}\">@#{user.nickname}</a>"
+      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)
@@ -132,7 +201,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       |> post("/api/v1/statuses/#{activity.id}/reblog")
 
       assert %{"id" => id, "reblogged" => true, "reblogs_count" => 1} = json_response(conn, 200)
-      assert activity.id == id
+      assert to_string(activity.id) == id
     end
   end
 
@@ -146,7 +215,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       |> post("/api/v1/statuses/#{activity.id}/favourite")
 
       assert %{"id" => id, "favourites_count" => 1, "favourited" => true} = json_response(conn, 200)
-      assert activity.id == id
+      assert to_string(activity.id) == id
     end
   end
 
@@ -162,7 +231,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       |> post("/api/v1/statuses/#{activity.id}/unfavourite")
 
       assert %{"id" => id, "favourites_count" => 0, "favourited" => false} = json_response(conn, 200)
-      assert activity.id == id
+      assert to_string(activity.id) == id
     end
   end
 
@@ -178,7 +247,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
       assert [%{"id" => id}] = json_response(conn, 200)
 
-      assert id == note_two.id
+      assert id == to_string(note_two.id)
     end
   end
 
@@ -238,7 +307,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
     assert [%{"id" => id}] = json_response(conn, 200)
 
-    assert id == activity.id
+    assert id == to_string(activity.id)
   end
 
   test "getting followers", %{conn: conn} do
@@ -291,11 +360,43 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     assert id == other_user.id
   end
 
-  test "unimplemented block/mute endpoints" do
+  test "blocking / unblocking a user", %{conn: conn} do
     user = insert(:user)
     other_user = insert(:user)
 
-    ["block", "unblock", "mute", "unmute"]
+    conn = conn
+    |> assign(:user, user)
+    |> post("/api/v1/accounts/#{other_user.id}/block")
+
+    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)
+  end
+
+  test "getting a list of blocks", %{conn: conn} do
+    user = insert(:user)
+    other_user = insert(:user)
+
+    {:ok, user} = User.block(user, other_user)
+
+    conn = conn
+    |> assign(:user, user)
+    |> get("/api/v1/blocks")
+
+    other_user_id = other_user.id
+    assert [%{"id" => ^other_user_id}] = json_response(conn, 200)
+  end
+
+  test "unimplemented mute endpoints" do
+    user = insert(:user)
+    other_user = insert(:user)
+
+    ["mute", "unmute"]
     |> Enum.each(fn(endpoint) ->
       conn = build_conn()
       |> assign(:user, user)
@@ -319,6 +420,19 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     end)
   end
 
+  test "account search", %{conn: conn} do
+    user = insert(:user)
+    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"})
+
+    assert [account] = json_response(conn, 200)
+    assert account["id"] == user_three.id
+  end
+
   test "search", %{conn: conn} do
     user = insert(:user)
     user_two = insert(:user, %{nickname: "shp@shitposter.club"})
@@ -338,7 +452,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     assert results["hashtags"] == []
 
     [status] = results["statuses"]
-    assert status["id"] == activity.id
+    assert status["id"] == to_string(activity.id)
   end
 
   test "search fetches remote accounts", %{conn: conn} do
@@ -364,6 +478,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     |> get("/api/v1/favourites")
 
     assert [status] = json_response(conn, 200)
-    assert status["id"] == activity.id
+    assert status["id"] == to_string(activity.id)
   end
 end