diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-08-31 15:39:19 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-08-31 15:39:19 -0500 |
| commit | 5e5e34377ca22a4b5ea55975c119fb31d996ef80 (patch) | |
| tree | f69715e3b90938fa6988686cfa98cdedfe1290c5 /actionpack/lib/action_controller/testing/integration.rb | |
| parent | 8974ab2e2e2faf647b03859b618b0302ac6cfcf4 (diff) | |
| download | rails-5e5e34377ca22a4b5ea55975c119fb31d996ef80.tar.gz rails-5e5e34377ca22a4b5ea55975c119fb31d996ef80.tar.bz2 rails-5e5e34377ca22a4b5ea55975c119fb31d996ef80.zip | |
Back off rack 1.1-pre and bundle in the new testing goodies
Diffstat (limited to 'actionpack/lib/action_controller/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_controller/testing/integration.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb index 5cb0f48f82..fb82f866fe 100644 --- a/actionpack/lib/action_controller/testing/integration.rb +++ b/actionpack/lib/action_controller/testing/integration.rb @@ -267,7 +267,8 @@ module ActionController "CONTENT_TYPE" => "application/x-www-form-urlencoded", "HTTP_ACCEPT" => accept } - env = Rack::MockRequest.env_for(path, opts) + + env = ActionDispatch::TestRequest.env_for(path, opts) (rack_environment || {}).each do |key, value| env[key] = value |