Merge branch 'master' of https://github.com/rails/rails

1 files changed, 12 insertions, 1 deletions

diff --git a/activesupport/test/gzip_test.rb b/activesupport/test/gzip_test.rb
index 2a24c0bd0d..f564e63f29 100644
--- a/activesupport/test/gzip_test.rb
+++ b/activesupport/test/gzip_test.rb
@@ -1,7 +1,18 @@
 require 'abstract_unit'
+require 'active_support/core_ext/object/blank'
 
 class GzipTest < Test::Unit::TestCase
   def test_compress_should_decompress_to_the_same_value
     assert_equal "Hello World", ActiveSupport::Gzip.decompress(ActiveSupport::Gzip.compress("Hello World"))
   end
-end
\ No newline at end of file
+
+  def test_compress_should_return_a_binary_string
+    compressed = ActiveSupport::Gzip.compress('')
+
+    if "".encoding_aware?
+      assert_equal Encoding.find('binary'), compressed.encoding
+    end
+
+    assert !compressed.blank?, "a compressed blank string should not be blank"
+  end
+end