diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-10-09 11:26:10 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-10-09 11:26:10 -0500 |
commit | 04b514c567aa664d2606313d17be69e665a7f1af (patch) | |
tree | 13f46fd39d8a90837b031b1081b7e20696d6823a /test/web/mastodon_api/controllers/auth_controller_test.exs | |
parent | 55562ca9362d66553ea3638c91174bbeb6c637f1 (diff) | |
parent | d239bd3ca4348d38c12ab54c7e2e9cb2b825cc3c (diff) | |
download | pleroma-04b514c567aa664d2606313d17be69e665a7f1af.tar.gz pleroma-04b514c567aa664d2606313d17be69e665a7f1af.zip |
Merge branch 'develop' into feature/gen-magic
Diffstat (limited to 'test/web/mastodon_api/controllers/auth_controller_test.exs')
-rw-r--r-- | test/web/mastodon_api/controllers/auth_controller_test.exs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/test/web/mastodon_api/controllers/auth_controller_test.exs b/test/web/mastodon_api/controllers/auth_controller_test.exs index 4fa95fce1..bf2438fe2 100644 --- a/test/web/mastodon_api/controllers/auth_controller_test.exs +++ b/test/web/mastodon_api/controllers/auth_controller_test.exs @@ -61,7 +61,7 @@ defmodule Pleroma.Web.MastodonAPI.AuthControllerTest do end test "it returns 204", %{conn: conn} do - assert json_response(conn, :no_content) + assert empty_json_response(conn) end test "it creates a PasswordResetToken record for user", %{user: user} do @@ -91,7 +91,7 @@ defmodule Pleroma.Web.MastodonAPI.AuthControllerTest do assert conn |> post("/auth/password?nickname=#{user.nickname}") - |> json_response(:no_content) + |> empty_json_response() ObanHelpers.perform_all() token_record = Repo.get_by(Pleroma.PasswordResetToken, user_id: user.id) @@ -112,7 +112,7 @@ defmodule Pleroma.Web.MastodonAPI.AuthControllerTest do assert conn |> post("/auth/password?nickname=#{user.nickname}") - |> json_response(:no_content) + |> empty_json_response() end end @@ -125,24 +125,21 @@ defmodule Pleroma.Web.MastodonAPI.AuthControllerTest do test "it returns 204 when user is not found", %{conn: conn, user: user} do conn = post(conn, "/auth/password?email=nonexisting_#{user.email}") - assert conn - |> json_response(:no_content) + assert empty_json_response(conn) end test "it returns 204 when user is not local", %{conn: conn, user: user} do {:ok, user} = Repo.update(Ecto.Changeset.change(user, local: false)) conn = post(conn, "/auth/password?email=#{user.email}") - assert conn - |> json_response(:no_content) + assert empty_json_response(conn) end test "it returns 204 when user is deactivated", %{conn: conn, user: user} do {:ok, user} = Repo.update(Ecto.Changeset.change(user, deactivated: true, local: true)) conn = post(conn, "/auth/password?email=#{user.email}") - assert conn - |> json_response(:no_content) + assert empty_json_response(conn) end end |