summaryrefslogtreecommitdiff
path: root/spec/lib/omni_auth
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-01-07 00:35:53 -0800
committerStan Hu <stanhu@gmail.com>2019-01-07 00:35:53 -0800
commitaff2b6e4eb07e8eed09bbc6c4e1a3d46766e1e17 (patch)
treea850465383209d99365dcc41dcaff5d0354d2fdc /spec/lib/omni_auth
parentb83be5032716548ea9d738a03e0a20f660dc04ac (diff)
downloadgitlab-ce-aff2b6e4eb07e8eed09bbc6c4e1a3d46766e1e17.tar.gz
Switch use of Rack::Request to ActionDispatch::Request
As mentioned in https://gitlab.com/gitlab-org/gitlab-ee/issues/9035#note_129093444, Rails 5 switched ActionDispatch::Request so that it no longer inherits Rack::Request directly. A middleware that uses Rack::Request to read the environment may see stale request parameters if another middleware modifies the environment via ActionDispatch::Request. To be safe, we should be using ActionDispatch::Request everywhere.
Diffstat (limited to 'spec/lib/omni_auth')
-rw-r--r--spec/lib/omni_auth/strategies/jwt_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/lib/omni_auth/strategies/jwt_spec.rb b/spec/lib/omni_auth/strategies/jwt_spec.rb
index c2e2db27362..c1eaf0bb0bf 100644
--- a/spec/lib/omni_auth/strategies/jwt_spec.rb
+++ b/spec/lib/omni_auth/strategies/jwt_spec.rb
@@ -25,6 +25,8 @@ describe OmniAuth::Strategies::Jwt do
subject.options[:secret] = secret
subject.options[:algorithm] = algorithm
+ # We use Rack::Request instead of ActionDispatch::Request because
+ # Rack::Test::Methods enables testing of this module.
expect_next_instance_of(Rack::Request) do |rack_request|
expect(rack_request).to receive(:params).and_return('jwt' => payload)
end