Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #10072 from senny/10071_format_on_scope_block_is_i…

…gnored

fix regression in Mapper when `format:` was used in a `scope`.
  • Loading branch information...
commit 5120e5596c7e5cb58004cb264e93a4670ee0e8f6 2 parents 979adea + 3397192
@pixeltrix pixeltrix authored
View
2  actionpack/lib/action_dispatch/routing/mapper.rb
@@ -58,8 +58,8 @@ def initialize(set, scope, path, options)
@set, @scope, @path, @options = set, scope, path, options
@requirements, @conditions, @defaults = {}, {}, {}
- normalize_path!
normalize_options!
+ normalize_path!
normalize_requirements!
normalize_conditions!
normalize_defaults!
View
22 actionpack/test/dispatch/routing_test.rb
@@ -1102,6 +1102,28 @@ def test_scoped_root
assert_equal 'projects#index', @response.body
end
+ def test_scope_with_format_option
+ draw do
+ get "direct/index", as: :no_format_direct, format: false
+
+ scope format: false do
+ get "scoped/index", as: :no_format_scoped
+ end
+ end
+
+ assert_equal "/direct/index", no_format_direct_path
+ assert_equal "/direct/index?format=html", no_format_direct_path(format: "html")
+
+ assert_equal "/scoped/index", no_format_scoped_path
+ assert_equal "/scoped/index?format=html", no_format_scoped_path(format: "html")
+
+ get '/scoped/index'
+ assert_equal "scoped#index", @response.body
+
+ get '/scoped/index.html'
+ assert_equal "Not Found", @response.body
+ end
+
def test_index
draw do
get '/info' => 'projects#info', :as => 'info'
Please sign in to comment.
Something went wrong with that request. Please try again.