aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/testing/integration.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-04-30 14:40:46 -0500
committerJoshua Peek <josh@joshpeek.com>2009-04-30 14:40:46 -0500
commit64e66cf161ee8db0bdbccb1be18fb760f5a9d24e (patch)
tree3ae960609c335291abc737b62b1344b520c8927a /actionpack/lib/action_controller/testing/integration.rb
parent9bac470c7ac7bc15830a66f416358d8efc74a39d (diff)
downloadrails-64e66cf161ee8db0bdbccb1be18fb760f5a9d24e.tar.gz
rails-64e66cf161ee8db0bdbccb1be18fb760f5a9d24e.tar.bz2
rails-64e66cf161ee8db0bdbccb1be18fb760f5a9d24e.zip
Vendor new Rack::Mock changes
Diffstat (limited to 'actionpack/lib/action_controller/testing/integration.rb')
-rw-r--r--actionpack/lib/action_controller/testing/integration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb
index f088e91de4..ce161ef846 100644
--- a/actionpack/lib/action_controller/testing/integration.rb
+++ b/actionpack/lib/action_controller/testing/integration.rb
@@ -263,7 +263,7 @@ module ActionController
string << "#{name}=#{value}; "
}
}
- env = ActionDispatch::Test::MockRequest.env_for(path, opts)
+ env = Rack::MockRequest.env_for(path, opts)
(headers || {}).each do |key, value|
key = key.to_s.upcase.gsub(/-/, "_")