diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-12-14 17:54:41 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-12-14 17:54:41 -0600 |
| commit | 5f8e48cbd297aca4add4b48efa2136ba6ac851b1 (patch) | |
| tree | 939c7670965015dc0721967204d2c533f597ae46 /actionpack/lib/action_dispatch/testing/assertions/routing.rb | |
| parent | ce970a8bb9f124d19d28270b1ffc8c4532bbbcc1 (diff) | |
| download | rails-5f8e48cbd297aca4add4b48efa2136ba6ac851b1.tar.gz rails-5f8e48cbd297aca4add4b48efa2136ba6ac851b1.tar.bz2 rails-5f8e48cbd297aca4add4b48efa2136ba6ac851b1.zip | |
Move route reloading into railties
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions/routing.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index 794fb888b7..fc477afb17 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -46,7 +46,6 @@ module ActionDispatch request_method = nil end - ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty? request = recognized_request_for(path, request_method) expected_options = expected_options.clone @@ -80,7 +79,6 @@ module ActionDispatch def assert_generates(expected_path, options, defaults={}, extras = {}, message=nil) expected_path = "/#{expected_path}" unless expected_path[0] == ?/ # Load routes.rb if it hasn't been loaded. - ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty? generated_path, extra_keys = ActionController::Routing::Routes.generate_extras(options, defaults) found_extras = options.reject {|k, v| ! extra_keys.include? k} |