test/zip_writer_test.rb in iostreams-0.14.0 vs test/zip_writer_test.rb in iostreams-0.15.0

@@ -1,47 +1,51 @@
 require_relative 'test_helper'
 require 'zip'
 
-# Unit Test for IOStreams::Zip
-module Streams
-  class ZipWriterTest < Minitest::Test
-    describe IOStreams::Zip::Writer do
-      before do
-        file_name = File.join(File.dirname(__FILE__), 'files', 'text.txt')
-        @data     = File.read(file_name)
-      end
+class ZipWriterTest < Minitest::Test
+  describe IOStreams::Zip::Writer do
+    let :temp_file do
+      Tempfile.new('iostreams')
+    end
 
-      describe '.open' do
-        it 'file' do
-          temp_file = Tempfile.new('rocket_job')
-          file_name = temp_file.to_path
-          IOStreams::Zip::Writer.open(file_name, zip_file_name: 'text.txt') do |io|
-            io.write(@data)
-          end
-          result = Zip::File.open(file_name) do |zip_file|
-            zip_file.first.get_input_stream.read
-          end
-          temp_file.delete
-          assert_equal @data, result
-        end
+    let :file_name do
+      temp_file.path
+    end
 
-        it 'stream' do
-          io_string = StringIO.new(''.force_encoding('ASCII-8BIT'))
-          IOStreams::Zip::Writer.open(io_string) do |io|
-            io.write(@data)
-          end
-          io     = StringIO.new(io_string.string)
-          result = nil
-          begin
-            zin = ::Zip::InputStream.new(io)
-            zin.get_next_entry
-            result = zin.read
-          ensure
-            zin.close if zin
-          end
-          assert_equal @data, result
+    let :decompressed do
+      File.read(File.join(File.dirname(__FILE__), 'files', 'text.txt'))
+    end
+
+    after do
+      temp_file.delete
+    end
+
+    describe '.open' do
+      it 'file' do
+        IOStreams::Zip::Writer.open(file_name, zip_file_name: 'text.txt') do |io|
+          io.write(decompressed)
         end
+        result = Zip::File.open(file_name) do |zip_file|
+          zip_file.first.get_input_stream.read
+        end
+        assert_equal decompressed, result
       end
 
+      it 'stream' do
+        io_string = StringIO.new(''.b)
+        IOStreams::Zip::Writer.open(io_string) do |io|
+          io.write(decompressed)
+        end
+        io     = StringIO.new(io_string.string)
+        result = nil
+        begin
+          zin = ::Zip::InputStream.new(io)
+          zin.get_next_entry
+          result = zin.read
+        ensure
+          zin.close if zin
+        end
+        assert_equal decompressed, result
+      end
     end
   end
 end