diff options
author | Richard Schneeman <richard.schneeman+no-recruiters@gmail.com> | 2018-10-04 11:37:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-04 11:37:32 -0500 |
commit | cba27402388380d672199a1a46de0a06ef383332 (patch) | |
tree | 5e940cd280d9b1fce027dbf2bc6390fb24e3a6c8 /actionpack/lib/action_dispatch/testing/assertions/routing.rb | |
parent | 47adad38166fc6cf6bd306ff0c2f20ea922dbae6 (diff) | |
parent | 235e734e1ea1e8bc1f8dcf2f6a75126a48fccd7a (diff) | |
download | rails-cba27402388380d672199a1a46de0a06ef383332.tar.gz rails-cba27402388380d672199a1a46de0a06ef383332.tar.bz2 rails-cba27402388380d672199a1a46de0a06ef383332.zip |
Merge pull request #34064 from schneems/schneems/revert-7f870a5ba2aa9177aa4a0e03a9d027928ba60e49
Revert "Merge pull request #33970 from rails/eager-url-helpers"
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions/routing.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index 0e8712f8d9..af41521c5c 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -138,20 +138,6 @@ module ActionDispatch assert_generates(path.is_a?(Hash) ? path[:path] : path, generate_options, defaults, extras, message) end - # Provides a hook on `finalize!` so we can mutate a controller after the - # route set has been drawn. - class WithRouting < ActionDispatch::Routing::RouteSet # :nodoc: - def initialize(&block) - super() - @block = block - end - - def finalize! - super - @block.call self - end - end - # A helper to make it easier to test different route configurations. # This method temporarily replaces @routes with a new RouteSet instance. # @@ -166,19 +152,16 @@ module ActionDispatch # end # def with_routing - old_routes = @routes - old_controller = nil - @routes = WithRouting.new do |_routes| - if defined?(@controller) && @controller - old_controller, @controller = @controller, @controller.clone - _routes = @routes - - @controller.singleton_class.include(_routes.url_helpers) - - if @controller.respond_to? :view_context_class - @controller.view_context_class = Class.new(@controller.view_context_class) do - include _routes.url_helpers - end + old_routes, @routes = @routes, ActionDispatch::Routing::RouteSet.new + if defined?(@controller) && @controller + old_controller, @controller = @controller, @controller.clone + _routes = @routes + + @controller.singleton_class.include(_routes.url_helpers) + + if @controller.respond_to? :view_context_class + @controller.view_context_class = Class.new(@controller.view_context_class) do + include _routes.url_helpers end end end |