aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/dispatcher_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-04-20 20:06:30 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-04-20 20:06:30 -0700
commit696375ac628bd41edf3a8c8c00dde196696f4add (patch)
tree0b8ca850e462d5d2722ea4d2217d9c132a0e3cb1 /actionpack/test/controller/dispatcher_test.rb
parent685a53a360d0d8fc4a9f3b49f900621c940a71f2 (diff)
parentb10fb7e7bcb5efea6c93ae52bad125887cfc235c (diff)
downloadrails-696375ac628bd41edf3a8c8c00dde196696f4add.tar.gz
rails-696375ac628bd41edf3a8c8c00dde196696f4add.tar.bz2
rails-696375ac628bd41edf3a8c8c00dde196696f4add.zip
Merge branch 'master' into cherry
Diffstat (limited to 'actionpack/test/controller/dispatcher_test.rb')
-rw-r--r--actionpack/test/controller/dispatcher_test.rb2
1 files changed, 1 insertions, 1 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)