From: lain <lain@soykaf.club>
Date: Tue, 11 Aug 2020 09:18:56 +0000 (+0000)
Subject: Merge branch '204-fix' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=686002164a5ab63ccb22cff015faf87f8f7fc9ec;hp=-c;p=akkoma

Merge branch '204-fix' into 'develop'

Fix 500 errors when returning :no_content, fixes #2029

Closes #2029

See merge request pleroma/pleroma!2856
---

686002164a5ab63ccb22cff015faf87f8f7fc9ec
diff --combined test/web/admin_api/controllers/admin_api_controller_test.exs
index 7f0f02605,e63268831..eca9272e0
--- a/test/web/admin_api/controllers/admin_api_controller_test.exs
+++ b/test/web/admin_api/controllers/admin_api_controller_test.exs
@@@ -439,7 -439,7 +439,7 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
        user1: user1,
        user2: user2
      } do
-       assert json_response(conn, :no_content)
+       assert empty_json_response(conn)
        assert User.get_cached_by_id(user1.id).tags == ["x", "foo", "bar"]
        assert User.get_cached_by_id(user2.id).tags == ["y", "foo", "bar"]
  
@@@ -457,7 -457,7 +457,7 @@@
      end
  
      test "it does not modify tags of not specified users", %{conn: conn, user3: user3} do
-       assert json_response(conn, :no_content)
+       assert empty_json_response(conn)
        assert User.get_cached_by_id(user3.id).tags == ["unchanged"]
      end
    end
@@@ -485,7 -485,7 +485,7 @@@
        user1: user1,
        user2: user2
      } do
-       assert json_response(conn, :no_content)
+       assert empty_json_response(conn)
        assert User.get_cached_by_id(user1.id).tags == []
        assert User.get_cached_by_id(user2.id).tags == ["y"]
  
@@@ -503,7 -503,7 +503,7 @@@
      end
  
      test "it does not modify tags of not specified users", %{conn: conn, user3: user3} do
-       assert json_response(conn, :no_content)
+       assert empty_json_response(conn)
        assert User.get_cached_by_id(user3.id).tags == ["unchanged"]
      end
    end
@@@ -1164,27 -1164,6 +1164,27 @@@
               }
      end
  
 +    test "`active` filters out users pending approval", %{token: token} do
 +      insert(:user, approval_pending: true)
 +      %{id: user_id} = insert(:user, approval_pending: false)
 +      %{id: admin_id} = token.user
 +
 +      conn =
 +        build_conn()
 +        |> assign(:user, token.user)
 +        |> assign(:token, token)
 +        |> get("/api/pleroma/admin/users?filters=active")
 +
 +      assert %{
 +               "count" => 2,
 +               "page_size" => 50,
 +               "users" => [
 +                 %{"id" => ^admin_id},
 +                 %{"id" => ^user_id}
 +               ]
 +             } = json_response(conn, 200)
 +    end
 +
      test "it works with multiple filters" do
        admin = insert(:user, nickname: "john", is_admin: true)
        token = insert(:oauth_admin_token, user: admin)
@@@ -1777,7 -1756,7 +1777,7 @@@
        conn =
          patch(conn, "/api/pleroma/admin/users/force_password_reset", %{nicknames: [user.nickname]})
  
-       assert json_response(conn, 204) == ""
+       assert empty_json_response(conn) == ""
  
        ObanHelpers.perform_all()