diff options
Diffstat (limited to 'test/web/admin_api')
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 39 | 
1 files changed, 19 insertions, 20 deletions
| diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index fa0cb71bf..9634ad7c5 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -8,7 +8,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do    describe "/api/pleroma/admin/user" do      test "Delete" do -      admin = insert(:user, info: %{"is_admin" => true}) +      admin = insert(:user, info: %{is_admin: true})        user = insert(:user)        conn = @@ -21,7 +21,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do      end      test "Create" do -      admin = insert(:user, info: %{"is_admin" => true}) +      admin = insert(:user, info: %{is_admin: true})        conn =          build_conn() @@ -39,7 +39,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do    describe "/api/pleroma/admin/permission_group" do      test "GET is giving user_info" do -      admin = insert(:user, info: %{"is_admin" => true}) +      admin = insert(:user, info: %{is_admin: true})        conn =          build_conn() @@ -47,33 +47,30 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do          |> put_req_header("accept", "application/json")          |> get("/api/pleroma/admin/permission_group/#{admin.nickname}") -      assert json_response(conn, 200) == admin.info +      assert json_response(conn, 200) == %{ +               "is_admin" => true, +               "is_moderator" => false +             }      end      test "/:right POST, can add to a permission group" do -      admin = insert(:user, info: %{"is_admin" => true}) +      admin = insert(:user, info: %{is_admin: true})        user = insert(:user) -      user_info = -        user.info -        |> Map.put("is_admin", true) -        conn =          build_conn()          |> assign(:user, admin)          |> put_req_header("accept", "application/json")          |> post("/api/pleroma/admin/permission_group/#{user.nickname}/admin") -      assert json_response(conn, 200) == user_info +      assert json_response(conn, 200) == %{ +               "is_admin" => true +             }      end      test "/:right DELETE, can remove from a permission group" do -      admin = insert(:user, info: %{"is_admin" => true}) -      user = insert(:user, info: %{"is_admin" => true}) - -      user_info = -        user.info -        |> Map.put("is_admin", false) +      admin = insert(:user, info: %{is_admin: true}) +      user = insert(:user, info: %{is_admin: true})        conn =          build_conn() @@ -81,12 +78,14 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do          |> put_req_header("accept", "application/json")          |> delete("/api/pleroma/admin/permission_group/#{user.nickname}/admin") -      assert json_response(conn, 200) == user_info +      assert json_response(conn, 200) == %{ +               "is_admin" => false +             }      end    end    test "/api/pleroma/admin/invite_token" do -    admin = insert(:user, info: %{"is_admin" => true}) +    admin = insert(:user, info: %{is_admin: true})      conn =        build_conn() @@ -98,8 +97,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do    end    test "/api/pleroma/admin/password_reset" do -    admin = insert(:user, info: %{"is_admin" => true}) -    user = insert(:user, info: %{"is_admin" => true}) +    admin = insert(:user, info: %{is_admin: true}) +    user = insert(:user)      conn =        build_conn() | 
