aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-11-28 11:48:39 +0100
committerJosé Valim <jose.valim@gmail.com>2010-11-28 11:54:00 +0100
commita4c360e8c7b7c2635de3c1172dafff7b7975ecc5 (patch)
tree19e22d62ad1afa96ff5e48523f9d8b213e12c0e7 /actionpack/test/dispatch
parent76053fe4d12bd2be38e16b3322f9de73e09b43bc (diff)
downloadrails-a4c360e8c7b7c2635de3c1172dafff7b7975ecc5.tar.gz
rails-a4c360e8c7b7c2635de3c1172dafff7b7975ecc5.tar.bz2
rails-a4c360e8c7b7c2635de3c1172dafff7b7975ecc5.zip
trailing star mimes should respect the order in which mime types are defined.
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r--actionpack/test/dispatch/mime_type_test.rb19
1 files changed, 6 insertions, 13 deletions
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 9424d88498..e80d339472 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -31,30 +31,23 @@ class MimeTypeTest < ActiveSupport::TestCase
test "parse text with trailing star at the beginning" do
accept = "text/*, text/html, application/json, multipart/form-data"
- expect = [Mime::JSON, Mime::XML, Mime::ICS, Mime::HTML, Mime::CSS, Mime::CSV, Mime::TEXT, Mime::YAML, Mime::JS, Mime::MULTIPART_FORM]
+ expect = [Mime::HTML, Mime::TEXT, Mime::JS, Mime::CSS, Mime::ICS, Mime::CSV, Mime::XML, Mime::YAML, Mime::JSON, Mime::MULTIPART_FORM]
parsed = Mime::Type.parse(accept)
- assert_equal expect.size, parsed.size
- Range.new(0,expect.size-1).to_a.each do |index|
- assert_equal expect[index], parsed[index], "Failed for index number #{index}"
- end
+ assert_equal expect, parsed
end
test "parse text with trailing star in the end" do
accept = "text/html, application/json, multipart/form-data, text/*"
- expect = [Mime::HTML, Mime::JSON, Mime::MULTIPART_FORM, Mime::XML, Mime::ICS, Mime::CSS, Mime::CSV, Mime::JS, Mime::YAML, Mime::TEXT]
+ expect = [Mime::HTML, Mime::JSON, Mime::MULTIPART_FORM, Mime::TEXT, Mime::JS, Mime::CSS, Mime::ICS, Mime::CSV, Mime::XML, Mime::YAML]
parsed = Mime::Type.parse(accept)
- assert_equal 10, parsed.size
- Range.new(0,expect.size-1).to_a.each do |index|
- assert_equal expect[index], parsed[index], "Failed for index number #{index}"
- end
+ assert_equal expect, parsed
end
test "parse text with trailing star" do
accept = "text/*"
- expect = [Mime::JSON, Mime::XML, Mime::ICS, Mime::HTML, Mime::CSS, Mime::CSV, Mime::JS, Mime::YAML, Mime::TEXT].sort_by(&:to_s)
+ expect = [Mime::HTML, Mime::TEXT, Mime::JS, Mime::CSS, Mime::ICS, Mime::CSV, Mime::XML, Mime::YAML, Mime::JSON]
parsed = Mime::Type.parse(accept)
- assert_equal 9, parsed.size
- assert_equal expect, parsed.sort_by(&:to_s)
+ assert_equal expect, parsed
end
test "parse application with trailing star" do