aff2b6e4eb
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.
30 lines
746 B
Ruby
30 lines
746 B
Ruby
require 'spec_helper'
|
|
|
|
describe Gitlab::RequestContext do
|
|
describe '#client_ip' do
|
|
subject { described_class.client_ip }
|
|
let(:app) { -> (env) {} }
|
|
let(:env) { Hash.new }
|
|
|
|
context 'when RequestStore::Middleware is used' do
|
|
around do |example|
|
|
RequestStore::Middleware.new(-> (env) { example.run }).call({})
|
|
end
|
|
|
|
context 'request' do
|
|
let(:ip) { '192.168.1.11' }
|
|
|
|
before do
|
|
allow_any_instance_of(ActionDispatch::Request).to receive(:ip).and_return(ip)
|
|
described_class.new(app).call(env)
|
|
end
|
|
|
|
it { is_expected.to eq(ip) }
|
|
end
|
|
|
|
context 'before RequestContext middleware run' do
|
|
it { is_expected.to be_nil }
|
|
end
|
|
end
|
|
end
|
|
end
|