diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-07-25 07:46:54 +0100 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-07-25 07:54:57 +0100 |
| commit | 4db0637d556ab11c55de6afcaa267147a032a74d (patch) | |
| tree | 38aab96e411daa55a4b6277cf461b90421b5e013 /actionpack/lib/action_dispatch | |
| parent | 7af0ae919fbf2119f94221470d4b8c3d7e909ffb (diff) | |
| download | rails-4db0637d556ab11c55de6afcaa267147a032a74d.tar.gz rails-4db0637d556ab11c55de6afcaa267147a032a74d.tar.bz2 rails-4db0637d556ab11c55de6afcaa267147a032a74d.zip | |
Allow overriding of all headers from passed environment hash
Allow REMOTE_ADDR, HTTP_HOST and HTTP_USER_AGENT to be overridden from
the environment passed into `ActionDispatch::TestRequest.new`.
Fixes #11590
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/test_request.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/testing/test_request.rb b/actionpack/lib/action_dispatch/testing/test_request.rb index c63778f870..57c678843b 100644 --- a/actionpack/lib/action_dispatch/testing/test_request.rb +++ b/actionpack/lib/action_dispatch/testing/test_request.rb @@ -3,7 +3,11 @@ require 'rack/utils' module ActionDispatch class TestRequest < Request - DEFAULT_ENV = Rack::MockRequest.env_for('/') + DEFAULT_ENV = Rack::MockRequest.env_for('/', + 'HTTP_HOST' => 'test.host', + 'REMOTE_ADDR' => '0.0.0.0', + 'HTTP_USER_AGENT' => 'Rails Testing' + ) def self.new(env = {}) super @@ -12,10 +16,6 @@ module ActionDispatch def initialize(env = {}) env = Rails.application.env_config.merge(env) if defined?(Rails.application) && Rails.application super(default_env.merge(env)) - - self.host = 'test.host' - self.remote_addr = '0.0.0.0' - self.user_agent = 'Rails Testing' end def request_method=(method) |