diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-02-13 20:38:33 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-02-13 20:44:10 +0100 |
| commit | bfc34fc0050ce61650701676dd45553aa82214c0 (patch) | |
| tree | 6ae6b87760b806f0544842cd801088e1c8b4b1b9 /actionpack | |
| parent | f9e4c3c7c0c4152b62fe9202a9d12262884bb118 (diff) | |
| download | rails-bfc34fc0050ce61650701676dd45553aa82214c0.tar.gz rails-bfc34fc0050ce61650701676dd45553aa82214c0.tar.bz2 rails-bfc34fc0050ce61650701676dd45553aa82214c0.zip | |
No variant should also be picked up by variant.any if variant.none is not defined (just like any other variant)
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/mime/respond_to_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index c8076af0c8..1974bbf529 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -532,7 +532,7 @@ module ActionController #:nodoc: def variant if @variant.nil? - @variants[:none] + @variants[:none] || @variants[:any] elsif (@variants.keys & @variant).any? @variant.each do |v| return @variants[v] if @variants.key?(v) diff --git a/actionpack/test/controller/mime/respond_to_test.rb b/actionpack/test/controller/mime/respond_to_test.rb index 2f05017ec9..499c62cc35 100644 --- a/actionpack/test/controller/mime/respond_to_test.rb +++ b/actionpack/test/controller/mime/respond_to_test.rb @@ -671,6 +671,10 @@ class RespondToControllerTest < ActionController::TestCase end def test_variant_any_any + get :variant_any_any + assert_equal "text/html", @response.content_type + assert_equal "any", @response.body + @request.variant = :phone get :variant_any_any assert_equal "text/html", @response.content_type |