pleroma

commit: d889c9ca709a085031ab2b7ebfe4755c7471991d
parent: 9cf4bfcd818b9631e4352cc30236ef541662c86b
Author: lain <lain@soykaf.club>
Date:   Wed,  1 Jul 2020 09:18:02 +0000

Merge branch 'revert-651f2695' into 'develop'

Revert "Merge branch 'avatar-removing' into 'develop'"

See merge request pleroma/pleroma!2710
Diffstat:
M
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
47
+++++++----------------------------------------

1 file changed, 7 insertions(+), 40 deletions(-)
diff --git a/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs b/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
@@ -216,20 +216,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
         filename: "an_image.jpg"
       }
 
-      res =
-        conn
-        |> patch("/api/v1/accounts/update_credentials", %{"avatar" => new_avatar})
+      conn = patch(conn, "/api/v1/accounts/update_credentials", %{"avatar" => new_avatar})
 
-      assert user_response = json_response_and_validate_schema(res, 200)
+      assert user_response = json_response_and_validate_schema(conn, 200)
       assert user_response["avatar"] != User.avatar_url(user)
-
-      # Also removes it
-      res =
-        conn
-        |> patch("/api/v1/accounts/update_credentials", %{"avatar" => nil})
-
-      assert user_response = json_response_and_validate_schema(res, 200)
-      assert user_response["avatar"] == User.avatar_url(user)
     end
 
     test "updates the user's banner", %{user: user, conn: conn} do
@@ -239,21 +229,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
         filename: "an_image.jpg"
       }
 
-      res =
-        conn
-        |> patch("/api/v1/accounts/update_credentials", %{"header" => new_header})
+      conn = patch(conn, "/api/v1/accounts/update_credentials", %{"header" => new_header})
 
-      assert user_response = json_response_and_validate_schema(res, 200)
+      assert user_response = json_response_and_validate_schema(conn, 200)
       assert user_response["header"] != User.banner_url(user)
-
-      # Also removes it
-
-      res =
-        conn
-        |> patch("/api/v1/accounts/update_credentials", %{"header" => nil})
-
-      assert user_response = json_response_and_validate_schema(res, 200)
-      assert user_response["header"] == User.banner_url(user)
     end
 
     test "updates the user's background", %{conn: conn} do
@@ -263,25 +242,13 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
         filename: "an_image.jpg"
       }
 
-      res =
-        conn
-        |> patch("/api/v1/accounts/update_credentials", %{
+      conn =
+        patch(conn, "/api/v1/accounts/update_credentials", %{
           "pleroma_background_image" => new_header
         })
 
-      assert user_response = json_response_and_validate_schema(res, 200)
+      assert user_response = json_response_and_validate_schema(conn, 200)
       assert user_response["pleroma"]["background_image"]
-
-      # Also removes it
-
-      res =
-        conn
-        |> patch("/api/v1/accounts/update_credentials", %{
-          "pleroma_background_image" => nil
-        })
-
-      assert user_response = json_response_and_validate_schema(res, 200)
-      refute user_response["pleroma"]["background_image"]
     end
 
     test "requires 'write:accounts' permission" do