aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/routing.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 2633eff09c..84dd29e8eb 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -238,9 +238,7 @@ module ActionController
def reload
begin
- require_dependency(ROUTE_FILE)
- rescue NoMethodError
- # ignore for unit tests
+ require_dependency(ROUTE_FILE) if ROUTE_FILE
rescue LoadError, ScriptError => e
raise RoutingError, "Cannot load config/routes.rb:\n #{e.message}"
ensure # Ensure that there is at least one route: