summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/twitter_api_controller_test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-07-19 16:55:10 -0500
committerMark Felder <feld@FreeBSD.org>2019-07-19 16:55:10 -0500
commit9169f331b6d481a0aa2b0bfe91500d695fb1b6d6 (patch)
tree734ce297aef5a2482c88cdc7d03914943ba4cf28 /test/web/twitter_api/twitter_api_controller_test.exs
parent46c7c53fbbfd9919d429ba15988af0da9e22d444 (diff)
parentc1c64d6d06fb7307245880d6605d9d9153a4784f (diff)
downloadpleroma-9169f331b6d481a0aa2b0bfe91500d695fb1b6d6.tar.gz
pleroma-9169f331b6d481a0aa2b0bfe91500d695fb1b6d6.zip
Merge branch 'develop' into feature/matstodon-statuses-by-name
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
-rw-r--r--test/web/twitter_api/twitter_api_controller_test.exs10
1 files changed, 6 insertions, 4 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index de6177575..8bb8aa36d 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -1116,15 +1116,17 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
describe "POST /api/account/password_reset, with invalid parameters" do
setup [:valid_user]
- test "it returns 500 when user is not found", %{conn: conn, user: user} do
+ test "it returns 404 when user is not found", %{conn: conn, user: user} do
conn = post(conn, "/api/account/password_reset?email=nonexisting_#{user.email}")
- assert json_response(conn, :internal_server_error)
+ assert conn.status == 404
+ assert conn.resp_body == ""
end
- test "it returns 500 when user is not local", %{conn: conn, user: user} do
+ test "it returns 400 when user is not local", %{conn: conn, user: user} do
{:ok, user} = Repo.update(Changeset.change(user, local: false))
conn = post(conn, "/api/account/password_reset?email=#{user.email}")
- assert json_response(conn, :internal_server_error)
+ assert conn.status == 400
+ assert conn.resp_body == ""
end
end