Permalink
Browse files

Merge pull request #10654 from schneems/schneems/fix-route-regression

Fix named routing regression from 3.2.13
  • Loading branch information...
2 parents 5dced4e + 2ee9a98 commit a63074dde8363923f7d292eafca26ddb22f190db @rafaelfranca rafaelfranca committed May 16, 2013
@@ -218,6 +218,7 @@ def handle_positional_args(t, args, options, keys)
keys -= t.url_options.keys if t.respond_to?(:url_options)
keys -= options.keys
end
+ keys -= inner_options.keys
result.merge!(Hash[keys.zip(args)])
end
@@ -69,6 +69,17 @@ def call(env)
end
end
+ test "explicit keys win over implicit keys" do
+ draw do
+ resources :foo do
+ resources :bar, to: SimpleApp.new('foo#show')
+ end
+ end
+
+ assert_equal '/foo/1/bar/2', url_helpers.foo_bar_path(1, 2)
+ assert_equal '/foo/1/bar/2', url_helpers.foo_bar_path(2, foo_id: 1)
+ end
+
private
def clear!
@set.clear!

0 comments on commit a63074d

Please sign in to comment.