aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_process.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-07 15:42:34 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-07 15:42:34 -0500
commitc82e8e1f483ece1fbd2e9f73715fd211487620fc (patch)
tree61711ba9d97ff640c3794f480c14b3cd83264b32 /actionpack/lib/action_controller/test_process.rb
parentebf14baa0eea1d7e98090b189369c1879b05dd54 (diff)
downloadrails-c82e8e1f483ece1fbd2e9f73715fd211487620fc.tar.gz
rails-c82e8e1f483ece1fbd2e9f73715fd211487620fc.tar.bz2
rails-c82e8e1f483ece1fbd2e9f73715fd211487620fc.zip
Move controller assertions from base TestCase to AC:: and AV::TestCase
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
-rw-r--r--actionpack/lib/action_controller/test_process.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index a5ec23cf50..38e15baac2 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -462,9 +462,9 @@ module ActionController #:nodoc:
html_document.find_all(conditions)
end
- def method_missing(selector, *args)
- if ActionController::Routing::Routes.named_routes.helpers.include?(selector)
- @controller.send(selector, *args)
+ def method_missing(selector, *args, &block)
+ if @controller && ActionController::Routing::Routes.named_routes.helpers.include?(selector)
+ @controller.send(selector, *args, &block)
else
super
end