diff options
| author | mathieuravaux <mathieu.ravaux@gmail.com> | 2011-02-27 01:52:08 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-07 23:35:52 +0200 |
| commit | fadd1fa3d314639067404403651de52a7d2b72f7 (patch) | |
| tree | 45c3587562c970f0a5fa13ee2b628bbb560e78ca /actionpack/test | |
| parent | 803548c46b32d1be760b21da80477f43b801b8e9 (diff) | |
| download | rails-fadd1fa3d314639067404403651de52a7d2b72f7.tar.gz rails-fadd1fa3d314639067404403651de52a7d2b72f7.tar.bz2 rails-fadd1fa3d314639067404403651de52a7d2b72f7.zip | |
Fixes ticket #6379. Improved the handling of Accept headers containing */*.
`lookup_context#formats=` being too restrictive, "Accept: text/javascript, */*"
resulted in [:js, "*/*"] formats instead of [:js, :html].
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/template/lookup_context_test.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb index 5fb1fdc044..e7680bc022 100644 --- a/actionpack/test/template/lookup_context_test.rb +++ b/actionpack/test/template/lookup_context_test.rb @@ -51,6 +51,11 @@ class LookupContextTest < ActiveSupport::TestCase assert_equal Mime::SET, @lookup_context.formats end + test "handles explicitly defined */* formats fallback to :js" do + @lookup_context.formats = [:js, Mime::ALL] + assert_equal [:js, :html], @lookup_context.formats + end + test "adds :html fallback to :js formats" do @lookup_context.formats = [:js] assert_equal [:js, :html], @lookup_context.formats |