aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-03-26 15:13:55 +0000
committerlambda <lain@soykaf.club>2019-03-26 15:13:55 +0000
commit9e3899bf36cea47560c5de1d4787125f6296a3b8 (patch)
tree6b64d0844f13f0a477a71e82f49dee2d4d802be0 /test
parent21ff78cd40820b6b5e56b78a08afddd04417937b (diff)
parentb0759f821b13caa5ac2c4462748dcf6530a2d693 (diff)
downloadpleroma-9e3899bf36cea47560c5de1d4787125f6296a3b8.tar.gz
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
Mastodon-based auth error messages. User#auth_active?/1 refactoring. See merge request pleroma/pleroma!978
Diffstat (limited to 'test')
-rw-r--r--test/web/oauth/oauth_controller_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/oauth/oauth_controller_test.exs b/test/web/oauth/oauth_controller_test.exs
index ff1e56fe9..84ec7b4ee 100644
--- a/test/web/oauth/oauth_controller_test.exs
+++ b/test/web/oauth/oauth_controller_test.exs
@@ -87,7 +87,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
assert result =~ app.redirect_uris
# Error message
- assert result =~ "Permissions not specified"
+ assert result =~ "This action is outside the authorized scopes"
end
test "returns 401 for scopes beyond app scopes", %{conn: conn} do
@@ -113,7 +113,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
assert result =~ app.redirect_uris
# Error message
- assert result =~ "Permissions not specified"
+ assert result =~ "This action is outside the authorized scopes"
end
test "issues a token for an all-body request" do