diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 09:30:49 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 09:30:49 +0300 |
commit | f459aabdfafa990b33610438650f882ccac072d2 (patch) | |
tree | e5bfcb4f8fc7c2dd06e08f90b3a841c4f9ad759a /test/web/oauth/oauth_controller_test.exs | |
parent | 6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745 (diff) | |
parent | 9e34919dcdbeedf8eb623dc86b05f63ef44d8859 (diff) | |
download | pleroma-f459aabdfafa990b33610438650f882ccac072d2.tar.gz pleroma-f459aabdfafa990b33610438650f882ccac072d2.zip |
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/web/oauth/oauth_controller_test.exs')
-rw-r--r-- | test/web/oauth/oauth_controller_test.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/web/oauth/oauth_controller_test.exs b/test/web/oauth/oauth_controller_test.exs index 0cf755806..4d0741d14 100644 --- a/test/web/oauth/oauth_controller_test.exs +++ b/test/web/oauth/oauth_controller_test.exs @@ -852,6 +852,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do assert resp = json_response(conn, 403) assert resp["error"] == "Password reset is required" + assert resp["identifier"] == "password_reset_required" refute Map.has_key?(resp, "access_token") end |