From 5199aea4aa5d07cf978270f22d03abefbee245c2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 17 Feb 2005 02:14:32 +0000 Subject: Better fix for requireing a missing route file in unit tests git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@643 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/routing.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 6c3b73843c..2633eff09c 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -238,7 +238,9 @@ module ActionController def reload begin - require_dependency(ROUTE_FILE) if Object.method_defined?(:require_dependency) + require_dependency(ROUTE_FILE) + rescue NoMethodError + # ignore for unit tests rescue LoadError, ScriptError => e raise RoutingError, "Cannot load config/routes.rb:\n #{e.message}" ensure # Ensure that there is at least one route: -- cgit v1.2.3