aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/routing.rb4
1 files changed, 3 insertions, 1 deletions
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: