kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

fix Mime type in doc since mime types via constants is deprecated [ci skip]

Browse source
This commit is contained in:
Gaurav Sharma 2015-09-26 00:20:41 +05:30
parent 3c52b2000c
commit 2b8a862365
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_dispatch/http/mime_types.rb
View file

@ -32,5 +32,5 @@ Mime::Type.register "application/json", :json, %w( text/x-json application/jsonr
Mime::Type.register "application/pdf", :pdf, [], %w(pdf) Mime::Type.register "application/pdf", :pdf, [], %w(pdf)
Mime::Type.register "application/zip", :zip, [], %w(zip) Mime::Type.register "application/zip", :zip, [], %w(zip)
# Create Mime::ALL but do not add it to the SET. # Create Mime::Type[:ALL] but do not add it to the SET.
Mime::Type.add_type :ALL, Mime::Type::All.new("*/*", :all, []) Mime::Type.add_type :ALL, Mime::Type::All.new("*/*", :all, [])

6
actionpack/test/dispatch/mime_type_test.rb
View file

@ -154,10 +154,10 @@ class MimeTypeTest < ActiveSupport::TestCase
end end
test "type convenience methods" do test "type convenience methods" do
# Don't test Mime::ALL, since it Mime::ALL#html? == true # Don't test Mime::Type[:ALL], since it Mime::Type[:ALL].html? == true
types = Mime::SET.symbols.uniq - [:all, :iphone] types = Mime::SET.symbols.uniq - [:all, :iphone]
# Remove custom Mime::Type instances set in other tests, like Mime::GIF and Mime::IPHONE # Remove custom Mime::Type instances set in other tests, like Mime::Type[:GIF] and Mime::Type[:IPHONE]
types.delete_if { |type| !Mime::Type.registered?(type.upcase) } types.delete_if { |type| !Mime::Type.registered?(type.upcase) }
types.each do |type| types.each do |type|
@ -186,7 +186,7 @@ class MimeTypeTest < ActiveSupport::TestCase
test "verifiable mime types" do test "verifiable mime types" do
all_types = Mime::SET.symbols all_types = Mime::SET.symbols
all_types.uniq! all_types.uniq!
# Remove custom Mime::Type instances set in other tests, like Mime::GIF and Mime::IPHONE # Remove custom Mime::Type instances set in other tests, like Mime::Type[:GIF] and Mime::Type[:IPHONE]
all_types.delete_if { |type| !Mime::Type.registered?(type.upcase) } all_types.delete_if { |type| !Mime::Type.registered?(type.upcase) }
end end