diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 20:06:30 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 20:06:30 -0700 |
| commit | 696375ac628bd41edf3a8c8c00dde196696f4add (patch) | |
| tree | 0b8ca850e462d5d2722ea4d2217d9c132a0e3cb1 /actionpack/test | |
| parent | 685a53a360d0d8fc4a9f3b49f900621c940a71f2 (diff) | |
| parent | b10fb7e7bcb5efea6c93ae52bad125887cfc235c (diff) | |
| download | rails-696375ac628bd41edf3a8c8c00dde196696f4add.tar.gz rails-696375ac628bd41edf3a8c8c00dde196696f4add.tar.bz2 rails-696375ac628bd41edf3a8c8c00dde196696f4add.zip | |
Merge branch 'master' into cherry
Diffstat (limited to 'actionpack/test')
3 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb index 721bcf6136..569d698a03 100644 --- a/actionpack/test/controller/dispatcher_test.rb +++ b/actionpack/test/controller/dispatcher_test.rb @@ -94,7 +94,7 @@ class DispatcherTest < Test::Unit::TestCase def dispatch(cache_classes = true) ActionController::Routing::RouteSet.any_instance.stubs(:call).returns([200, {}, 'response']) Dispatcher.define_dispatcher_callbacks(cache_classes) - Dispatcher.new.call({}) + Dispatcher.new.call({'rack.input' => StringIO.new('')}) end def assert_subclasses(howmany, klass, message = klass.subclasses.inspect) diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb index 2f409f020d..88b81dc493 100644 --- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb @@ -206,8 +206,8 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest end def call(env) - req = Rack::Request.new(env) - req.params # Parse params + env['rack.input'].read + env['rack.input'].rewind @app.call(env) end end diff --git a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb index 51a660f614..8de4a83d76 100644 --- a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb @@ -150,8 +150,8 @@ class UrlEncodedParamsParsingTest < ActionController::IntegrationTest end def call(env) - req = Rack::Request.new(env) - req.params # Parse params + env['rack.input'].read + env['rack.input'].rewind @app.call(env) end end |