summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Ziegler <austin@zieglers.ca>2014-10-06 16:03:43 -0400
committerAustin Ziegler <austin@zieglers.ca>2014-10-06 16:03:43 -0400
commiteb59b75086a66eeb978f37d6a9c40ebe8b129a62 (patch)
treeeca7c0c7c2d5d410a2d7efbffee4d66f84cfdd55
parentc9f3ed62f8aaac9d73a38f4d304fca4106078981 (diff)
downloadmime-types-2.4-experiments.tar.gz
Silencing a warning, fixing a test.2.4-experiments
-rw-r--r--lib/mime/type.rb2
-rw-r--r--test/test_mime_type.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mime/type.rb b/lib/mime/type.rb
index 00a7348..5aac3ef 100644
--- a/lib/mime/type.rb
+++ b/lib/mime/type.rb
@@ -94,6 +94,7 @@ class MIME::Type
self.registered = nil
self.use_instead = nil
self.signature = nil
+ self.friendly = nil
case content_type
when Hash
@@ -107,7 +108,6 @@ class MIME::Type
self.content_type = content_type
end
- self.extensions ||= []
self.docs ||= nil
self.encoding ||= :default
# This value will be deprecated in the future, as it will be an
diff --git a/test/test_mime_type.rb b/test/test_mime_type.rb
index 0476af6..780d7c7 100644
--- a/test/test_mime_type.rb
+++ b/test/test_mime_type.rb
@@ -204,7 +204,7 @@ class TestMIMEType < Minitest::Test
assert_equal(%w(yaml), yaml.extensions)
yaml.extensions = %w(yz yaml yz yml)
- assert_equal(%w(yaml yml yz), yaml.extensions)
+ assert_equal(%w(yzl yaml yml), yaml.extensions)
end
def test_like_eh