X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Ftwitter_api_controller_test.exs;h=798309f7d2505fc631f8273e3a3ef72754ff8179;hb=d761b1543af537fb6f1013c0930449c7c6a26941;hp=4450bd5e521eab723c3e9ee1aa27a9a9ecf52f68;hpb=201804b83634714b51e577ac6aea8a07ba10656e;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 4450bd5e5..798309f7d 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -5,6 +5,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
   alias Pleroma.{Repo, Activity, User, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.TwitterAPI.UserView
+  alias Pleroma.Web.CommonAPI
 
   import Pleroma.Factory
 
@@ -24,6 +25,24 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     end
   end
 
+  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"
+      assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
+    end
+
+    test "with credentials", %{conn: conn, user: user} do
+      conn = conn
+        |> with_credentials(user.nickname, "test")
+        |> post("/api/account/most_recent_notification.json", %{id: "200"})
+
+      assert json_response(conn, 200)
+      user = User.get_by_nickname(user.nickname)
+      assert user.info["most_recent_notification"] == 200
+    end
+  end
+
   describe "POST /statuses/update.json" do
     setup [:valid_user]
     test "without valid credentials", %{conn: conn} do
@@ -336,13 +355,6 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
 
       request_path = "/api/statuses/retweet/#{note_activity.id}.json"
 
-      user = Repo.get_by(User, ap_id: note_activity.data["actor"])
-      response = conn
-      |> with_credentials(user.nickname, "test")
-      |> post(request_path)
-      assert json_response(response, 400) == %{"error" => "You cannot repeat your own notice.",
-                                               "request" => request_path}
-
       response = conn
       |> with_credentials(current_user.nickname, "test")
       |> post(request_path)
@@ -393,11 +405,65 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
   describe "GET /api/externalprofile/show" do
     test "it returns the user", %{conn: conn} do
       user = insert(:user)
+      other_user = insert(:user)
 
       conn = conn
-      |> get("/api/externalprofile/show", %{profileurl: user.ap_id})
+      |> assign(:user, user)
+      |> get("/api/externalprofile/show", %{profileurl: other_user.ap_id})
 
-      assert json_response(conn, 200) == UserView.render("show.json", %{user: user})
+      assert json_response(conn, 200) == UserView.render("show.json", %{user: other_user})
+    end
+  end
+
+  describe "GET /api/statuses/followers" do
+    test "it returns a user's followers", %{conn: conn} do
+      user = insert(:user)
+      follower_one = insert(:user)
+      follower_two = 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")
+
+      assert json_response(conn, 200) == UserView.render("index.json", %{users: [follower_one, follower_two], for: user})
+    end
+  end
+
+  describe "GET /api/statuses/friends" do
+    test "it returns a user's friends", %{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
+      |> assign(:user, user)
+      |> get("/api/statuses/friends")
+
+      assert json_response(conn, 200) == UserView.render("index.json", %{users: [followed_one, followed_two], for: user})
+    end
+  end
+
+  describe "POST /api/account/update_profile.json" do
+    test "it updates a user's profile" do
+      user = insert(:user)
+
+      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"
+      assert user.bio == "new description"
+
+      assert json_response(conn, 200) == UserView.render("user.json", %{user: user, for: user})
     end
   end
 
@@ -410,4 +476,36 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     header_content = "Basic " <> Base.encode64("#{username}:#{password}")
     put_req_header(conn, "authorization", header_content)
   end
+
+  describe "GET /api/search.json" do
+    test "it returns search results", %{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/search.json", %{"q" => "2hu", "page" => "1", "rpp" => "1"})
+
+      assert [status] = json_response(conn, 200)
+      assert status["id"] == activity.id
+    end
+  end
+
+  describe "GET /api/statusnet/tags/timeline/:tag.json" do
+    test "it returns the tags timeline" 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")
+
+      assert [status] = json_response(conn, 200)
+      assert status["id"] == activity.id
+    end
+  end
 end