test/test_zip_exporter.rb in review-2.3.0 vs test/test_zip_exporter.rb in review-2.4.0

@@ -1,7 +1,5 @@
-# encoding: utf-8
-
 require 'test_helper'
 require 'epubmaker'
 require 'epubmaker/zip_exporter'
 require 'fileutils'
 
@@ -11,11 +9,11 @@
   def setup
     @tmpdir = Dir.mktmpdir
     @epubdir = "#{@tmpdir}/epubdir"
     FileUtils.mkdir_p("#{@epubdir}/META-INF")
     FileUtils.mkdir_p("#{@epubdir}/OEBPS")
-    File.write("#{@epubdir}/mimetype", "application/epub+zip")
+    File.write("#{@epubdir}/mimetype", 'application/epub+zip')
 
     container_xml = <<-EOB
     <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="urn:oasis:names:tc:opendocument:xmlns:container" version="1.0">
   <rootfiles>
@@ -65,49 +63,45 @@
     if Gem.win_platform?
       ## skip this test
       return
     end
 
-    params = {"epubmaker"=>{}}
-    epubfile = File.join(@tmpdir, "test.epub")
-    exporter = ZipExporter.new(@epubdir, params)
+    config = { 'epubmaker' => {} }
+    epubfile = File.join(@tmpdir, 'test.epub')
+    exporter = ZipExporter.new(@epubdir, config)
     exporter.export_zip_extcmd(epubfile)
     assert_true(File.exist?(epubfile))
 
     if defined?(Zip)
       File.open(epubfile) do |f|
         ::Zip::InputStream.open(f) do |fzip|
           ## get first entry
           entry = fzip.get_next_entry
-          assert_equal "mimetype", entry.name
-          assert_equal "application/epub+zip", fzip.read
+          assert_equal 'mimetype', entry.name
+          assert_equal 'application/epub+zip', fzip.read
         end
       end
     end
   end
 
   def test_export_rubyzip
-    if !defined?(Zip)
-      ## skip test
-      return
-    end
-    params = {"epubmaker"=>{}}
-    epubfile = File.join(@tmpdir, "test.epub")
-    exporter = ZipExporter.new(@epubdir, params)
+    return unless defined?(Zip) ## skip test
+    config = { 'epubmaker' => {} }
+    epubfile = File.join(@tmpdir, 'test.epub')
+    exporter = ZipExporter.new(@epubdir, config)
     exporter.export_zip_rubyzip(epubfile)
     assert_true(File.exist?(epubfile))
 
     File.open(epubfile) do |f|
       ::Zip::InputStream.open(f) do |fzip|
         ## get first entry
         entry = fzip.get_next_entry
-        assert_equal "mimetype", entry.name
-        assert_equal "application/epub+zip", fzip.read
+        assert_equal 'mimetype', entry.name
+        assert_equal 'application/epub+zip', fzip.read
       end
     end
   end
 
   def teardown
     FileUtils.remove_entry_secure(@tmpdir)
   end
-
 end