New upstream version 2.8.0upstream/2.8.0

2 files changed, 21 insertions, 4 deletions

diff --git a/test/formatters/test_csv.rb b/test/formatters/test_csv.rb
index a4443f4..d47d93d 100644
--- a/test/formatters/test_csv.rb
+++ b/test/formatters/test_csv.rb
@@ -100,6 +100,23 @@ class TestRooFormatterCSV < Minitest::Test
     end
   end
 
+  def test_bug_datetime_offset_change
+    # DO NOT REMOVE Asia/Calcutta
+    [nil, "US/Eastern", "US/Pacific", "Asia/Calcutta"].each do |zone|
+      with_timezone(zone) do
+        with_each_spreadsheet(name: "datetime_timezone_ist_offset_change", format: %i[excelx openoffice libreoffice]) do |workbook|
+          Dir.mktmpdir do |tempdir|
+            datetime_csv_file = File.join(tempdir, "datetime_timezone_ist_offset_change.csv")
+
+            assert workbook.to_csv(datetime_csv_file)
+            assert File.exist?(datetime_csv_file)
+            assert_equal "", file_diff("#{TESTDIR}/so_datetime_timezone_ist_offset_change.csv", datetime_csv_file)
+          end
+        end
+      end
+    end
+  end
+
   def test_true_class
     assert_equal "true", cell_to_csv(1, 1)
   end
diff --git a/test/formatters/test_xml.rb b/test/formatters/test_xml.rb
index c8390b6..ef904ec 100644
--- a/test/formatters/test_xml.rb
+++ b/test/formatters/test_xml.rb
@@ -16,7 +16,7 @@ class TestRooFormatterXML < Minitest::Test
         all_cells = init_all_cells(workbook, sheetname)
         cells = xml_sheet.children.reject(&:text?)
 
-        assert_equal sheetname, xml_sheet.attribute("name").value
+        assert_equal sheetname, xml_sheet["name"]
         assert_equal all_cells.size, cells.size
 
         cells.each_with_index do |cell, i|
@@ -27,10 +27,10 @@ class TestRooFormatterXML < Minitest::Test
             all_cells[i][:type],
           ]
           result = [
-            cell.attribute("row").value,
-            cell.attribute("column").value,
+            cell["row"],
+            cell["column"],
             cell.text,
-            cell.attribute("type").value,
+            cell["type"],
           ]
 
           assert_equal expected, result