Commit 5a488a6a authored by Sean McGivern's avatar Sean McGivern Committed by Tiago
Browse files

Merge branch 'bvl-adjust-openid_connect_spec' into 'master'

Adjust openid_connect_spec to use `raise_error`

Closes #40093

See merge request gitlab-org/gitlab-ce!15420

(cherry picked from commit 37cca88d055491d1b2b15b72aa6968eb076da2a0)

ab65c53192d1 Adjust openid_connect_spec to use `raise_error`
parent 40eedda37202
......@@ -107,6 +107,15 @@ def hashed_subject
end
end
# These 2 calls shouldn't actually throw, they should be handled as an
# unauthorized request, so we should be able to check the response.
#
# This was not possible due to an issue with Warden:
# https://github.com/hassox/warden/pull/162
#
# When the patch gets merged and we update Warden, these specs will need to
# updated to check the response instead of a raised exception.
# https://gitlab.com/gitlab-org/gitlab-ce/issues/40218
context 'when user is blocked' do
it 'returns authentication error' do
access_grant
......@@ -114,7 +123,7 @@ def hashed_subject
expect do
request_access_token
end.to throw_symbol :warden
end.to raise_error UncaughtThrowError
end
end
......@@ -125,7 +134,7 @@ def hashed_subject
expect do
request_access_token
end.to throw_symbol :warden
end.to raise_error UncaughtThrowError
end
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment