diff options
author | Stan Hu <stanhu@gmail.com> | 2019-01-07 11:35:53 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-01-07 11:35:53 +0300 |
commit | aff2b6e4eb07e8eed09bbc6c4e1a3d46766e1e17 (patch) | |
tree | a850465383209d99365dcc41dcaff5d0354d2fdc /spec/lib | |
parent | b83be5032716548ea9d738a03e0a20f660dc04ac (diff) |
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')
-rw-r--r-- | spec/lib/gitlab/auth/user_auth_finders_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/request_context_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/omni_auth/strategies/jwt_spec.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/spec/lib/gitlab/auth/user_auth_finders_spec.rb b/spec/lib/gitlab/auth/user_auth_finders_spec.rb index 4e4c8b215c2..1e2aebdc84b 100644 --- a/spec/lib/gitlab/auth/user_auth_finders_spec.rb +++ b/spec/lib/gitlab/auth/user_auth_finders_spec.rb @@ -9,7 +9,7 @@ describe Gitlab::Auth::UserAuthFinders do 'rack.input' => '' } end - let(:request) { Rack::Request.new(env) } + let(:request) { ActionDispatch::Request.new(env) } def set_param(key, value) request.update_param(key, value) diff --git a/spec/lib/gitlab/request_context_spec.rb b/spec/lib/gitlab/request_context_spec.rb index 8a28ad0e597..fd443cc1f71 100644 --- a/spec/lib/gitlab/request_context_spec.rb +++ b/spec/lib/gitlab/request_context_spec.rb @@ -15,7 +15,7 @@ describe Gitlab::RequestContext do let(:ip) { '192.168.1.11' } before do - allow_any_instance_of(Rack::Request).to receive(:ip).and_return(ip) + allow_any_instance_of(ActionDispatch::Request).to receive(:ip).and_return(ip) described_class.new(app).call(env) end 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 |