From dde9c488398293fb1cbdc02595b8c4e9860b03cc Mon Sep 17 00:00:00 2001 From: Gannon McGibbon Date: Tue, 20 Nov 2018 13:16:39 -0500 Subject: Raise an error on root route naming conflicts. Raises an ArgumentError when multiple root routes are defined in the same context instead of assigning nil names to subsequent roots. --- actionpack/lib/action_dispatch/routing/mapper.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 06ce165f76..421e2023c2 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -656,7 +656,7 @@ module ActionDispatch # Query if the following named route was already defined. def has_named_route?(name) - @set.named_routes.key? name + @set.named_routes.key?(name) end private @@ -1952,9 +1952,7 @@ module ActionDispatch end def match_root_route(options) - name = has_named_route?(name_for_action(:root, nil)) ? nil : :root - args = ["/", { as: name, via: :get }.merge!(options)] - + args = ["/", { as: :root, via: :get }.merge(options)] match(*args) end end -- cgit v1.2.3