Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #9469 from senny/9466_format_enforcing_routes

`format: true` does not override existing format constraints.
  • Loading branch information...
commit 17cff2c1b867ccf46d2c2dad4ae0ee9d506e9017 2 parents 9126d53 + afddc04
@pixeltrix pixeltrix authored
View
10 actionpack/CHANGELOG.md
@@ -1,5 +1,15 @@
## Rails 4.0.0 (unreleased) ##
+* `format: true` does not override existing format constraints.
+ Fixes #9466.
+
+ Example:
+
+ # this will force the .json extension
+ get '/json_only', to: ok, format: true, constraints: { format: /json/ }
+
+ *Yves Senn*
+
* Skip valid encoding checks for non-String parameters that come
from the matched route's defaults.
Fixes #9435.
View
2  actionpack/lib/action_dispatch/routing/mapper.rb
@@ -129,7 +129,7 @@ def normalize_requirements!
end
if options[:format] == true
- @requirements[:format] = /.+/
+ @requirements[:format] ||= /.+/
elsif Regexp === options[:format]
@requirements[:format] = options[:format]
elsif String === options[:format]
View
24 actionpack/test/dispatch/routing_test.rb
@@ -3407,6 +3407,8 @@ class TestFormatConstraints < ActionDispatch::IntegrationTest
get '/string', to: ok, constraints: { format: 'json' }
get '/regexp', to: ok, constraints: { format: /json/ }
+ get '/json_only', to: ok, format: true, constraints: { format: /json/ }
+ get '/xml_only', to: ok, format: 'xml'
end
end
@@ -3434,6 +3436,28 @@ def test_regexp_format_constraints
get 'http://www.example.com/regexp.html'
assert_response :not_found
end
+
+ def test_enforce_with_format_true_with_constraint
+ get 'http://www.example.com/json_only.json'
+ assert_response :success
+
+ get 'http://www.example.com/json_only.html'
+ assert_response :not_found
+
+ get 'http://www.example.com/json_only'
+ assert_response :not_found
+ end
+
+ def test_enforce_with_string
+ get 'http://www.example.com/xml_only.xml'
+ assert_response :success
+
+ get 'http://www.example.com/xml_only'
+ assert_response :success
+
+ get 'http://www.example.com/xml_only.json'
+ assert_response :not_found
+ end
end
class TestRouteDefaults < ActionDispatch::IntegrationTest
Please sign in to comment.
Something went wrong with that request. Please try again.