Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test

1 files changed, 23 insertions, 5 deletions

diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index e54177c94..6c48b5597 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -94,10 +94,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     end
 
     test "with credentials", %{conn: conn, user: current_user} do
-      {:ok, user} = UserBuilder.insert
+      user = insert(:user)
       activities = ActivityBuilder.insert_list(30, %{"to" => [User.ap_followers(user)]}, %{user: user})
       returned_activities = ActivityBuilder.insert_list(10, %{"to" => [User.ap_followers(user)]}, %{user: user})
-      {:ok, other_user} = UserBuilder.insert(%{ap_id: "glimmung", nickname: "nockame"})
+      other_user = insert(:user)
       ActivityBuilder.insert_list(10, %{}, %{user: other_user})
       since_id = List.last(activities).id
 
@@ -110,7 +110,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
       response = json_response(conn, 200)
 
       assert length(response) == 10
-      assert response == Enum.map(returned_activities, fn (activity) -> ActivityRepresenter.to_map(activity, %{user: user, for: current_user}) end)
+      assert response == Enum.map(returned_activities, fn (activity) -> ActivityRepresenter.to_map(activity, %{user: User.get_cached_by_ap_id(activity.data["actor"]), for: current_user}) end)
     end
   end
 
@@ -122,7 +122,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     end
 
     test "with credentials", %{conn: conn, user: current_user} do
-      {:ok, followed } = UserBuilder.insert(%{name: "some guy"})
+      followed = insert(:user)
 
       conn = conn
       |> with_credentials(current_user.nickname, "test")
@@ -142,7 +142,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     end
 
     test "with credentials", %{conn: conn, user: current_user} do
-      {:ok, followed } = UserBuilder.insert(%{name: "some guy"})
+      followed = insert(:user)
 
       {:ok, current_user} = User.follow(current_user, followed)
       assert current_user.following == [User.ap_followers(followed)]
@@ -163,6 +163,24 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
       assert json_response(conn, 200) == "ok"
   end
 
+  describe "POST /api/qvitter/update_avatar.json" do
+    setup [:valid_user]
+    test "without valid credentials", %{conn: conn} do
+      conn = post conn, "/api/qvitter/update_avatar.json"
+      assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
+    end
+
+    test "with credentials", %{conn: conn, user: current_user} do
+      conn = conn
+      |> with_credentials(current_user.nickname, "test")
+      |> post("/api/qvitter/update_avatar.json", %{img: Pleroma.Web.ActivityPub.ActivityPubTest.data_uri})
+
+      current_user = Repo.get(User, current_user.id)
+      assert is_map(current_user.avatar)
+      assert json_response(conn, 200) == UserRepresenter.to_map(current_user, %{for: current_user})
+    end
+  end
+
   describe "POST /api/favorites/create/:id" do
     setup [:valid_user]
     test "without valid credentials", %{conn: conn} do