New upstream version 3.0.0.upstream/3.0.0upstream

2 files changed, 32 insertions, 0 deletions

diff --git a/test/helpers/test_accessing_files.rb b/test/helpers/test_accessing_files.rb
index 8732bc8..5cccf27 100644
--- a/test/helpers/test_accessing_files.rb
+++ b/test/helpers/test_accessing_files.rb
@@ -36,6 +36,27 @@ module TestAccesingFiles
     end
   end
 
+  def test_finalize_twice
+    skip if defined? JRUBY_VERSION
+
+    instance = Class.new { include Roo::Tempdir }.new
+
+    tempdir = instance.make_tempdir(instance, "my_temp_prefix", nil)
+    assert File.exist?(tempdir), "Expected #{tempdir} to initially exist"
+
+    pid = Process.fork do
+      # Inside the forked process finalize does not affect the parent process's state, but does
+      # delete the tempfile on disk
+      instance.finalize_tempdirs(instance.object_id)
+    end
+
+    Process.wait(pid)
+    refute File.exist?(tempdir), "Expected #{tempdir} to have been cleaned up by child process"
+
+    instance.finalize_tempdirs(instance.object_id)
+    refute File.exist?(tempdir), "Expected #{tempdir} to still have been cleaned up"
+  end
+
   def test_cleanup_on_error
     # NOTE: This test was occasionally failing because when it started running
     #       other tests would have already added folders to the temp directory,
diff --git a/test/helpers/test_comments.rb b/test/helpers/test_comments.rb
index 2e26786..e204b1a 100644
--- a/test/helpers/test_comments.rb
+++ b/test/helpers/test_comments.rb
@@ -40,4 +40,15 @@ module TestComments
       assert_equal expected_comments, oo.comments(oo.sheets.first), "comments error in class #{oo.class}"
     end
   end
+
+  def test_excel_comment_with_author
+    options = { name: "comments-with-author", format: [:excelx] }
+    expexted_comments = [
+      [6, 2, "Eli Wang:\ncomment with author"]
+    ]
+
+    with_each_spreadsheet(options) do |oo|
+      assert_equal expexted_comments, oo.comments(oo.sheets.first), "comments error in class #{oo.class}"
+    end
+  end
 end