aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorRichard Schneeman <richard.schneeman@gmail.com>2016-02-16 17:18:19 -0600
committerRichard Schneeman <richard.schneeman@gmail.com>2016-02-16 17:18:19 -0600
commit5971fddb7997231f3431c26ba17471ba52704852 (patch)
tree70731bb6ac2a9f5257c35adebda4dce0426337d5 /actionpack/test
parent32de1657a7211334fa0ef2dacc6c928d84839e7d (diff)
parentff8bdafec4d752be1152217a92d4522fdb1e7c10 (diff)
downloadrails-5971fddb7997231f3431c26ba17471ba52704852.tar.gz
rails-5971fddb7997231f3431c26ba17471ba52704852.tar.bz2
rails-5971fddb7997231f3431c26ba17471ba52704852.zip
Merge pull request #23661 from meinac/add_gzip_mime_type
application/gzip added as default mime type into mime type list
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/dispatch/mime_type_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 149e37bf3d..672b272590 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -49,7 +49,7 @@ class MimeTypeTest < ActiveSupport::TestCase
test "parse application with trailing star" do
accept = "application/*"
- expect = [Mime[:html], Mime[:js], Mime[:xml], Mime[:rss], Mime[:atom], Mime[:yaml], Mime[:url_encoded_form], Mime[:json], Mime[:pdf], Mime[:zip]]
+ expect = [Mime[:html], Mime[:js], Mime[:xml], Mime[:rss], Mime[:atom], Mime[:yaml], Mime[:url_encoded_form], Mime[:json], Mime[:pdf], Mime[:zip], Mime[:gzip]]
parsed = Mime::Type.parse(accept)
assert_equal expect, parsed
end