From 17f0c1e9e8a5bfa7c4d2e1632c3b8b91f4678f03 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 30 Mar 2010 13:58:18 -0500
Subject: Fix stack overflow bug in integration test router helpers

---
 actionpack/lib/action_dispatch/testing/assertions/routing.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_dispatch/testing')

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
-- 
cgit v1.2.3