aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-03-30 13:58:18 -0500
committerJoshua Peek <josh@joshpeek.com>2010-03-30 13:58:18 -0500
commit17f0c1e9e8a5bfa7c4d2e1632c3b8b91f4678f03 (patch)
tree852436ea410bb28f0a0744119ef76b01a839afb0 /actionpack/lib/action_dispatch/testing
parent37102a52373c368c1da18f916bfda1c4c4489fee (diff)
downloadrails-17f0c1e9e8a5bfa7c4d2e1632c3b8b91f4678f03.tar.gz
rails-17f0c1e9e8a5bfa7c4d2e1632c3b8b91f4678f03.tar.bz2
rails-17f0c1e9e8a5bfa7c4d2e1632c3b8b91f4678f03.zip
Fix stack overflow bug in integration test router helpers
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/routing.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index 1bb81ede3b..08f3d90e18 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -168,7 +168,7 @@ module ActionDispatch
# ROUTES TODO: These assertions should really work in an integration context
def method_missing(selector, *args, &block)
- if @controller && @router.named_routes.helpers.include?(selector)
+ if @controller && @router && @router.named_routes.helpers.include?(selector)
@controller.send(selector, *args, &block)
else
super