New upstream version 2.10.0.upstream/2.10.0

2 files changed, 43 insertions, 0 deletions

diff --git a/spec/lib/roo/base_spec.rb b/spec/lib/roo/base_spec.rb
index 76cefcc..9d44656 100644
--- a/spec/lib/roo/base_spec.rb
+++ b/spec/lib/roo/base_spec.rb
@@ -182,6 +182,14 @@ describe Roo::Base do
     end
   end
 
+  describe '#each_with_pagename' do
+    it 'should return an enumerator with all the rows' do
+      each_with_pagename = spreadsheet.each_with_pagename
+      expect(each_with_pagename).to be_a(Enumerator)
+      expect(each_with_pagename.to_a.last).to eq([spreadsheet.default_sheet, spreadsheet])
+    end
+  end
+
   describe '#each' do
     it 'should return an enumerator with all the rows' do
       each = spreadsheet.each
diff --git a/spec/lib/roo/excelx_spec.rb b/spec/lib/roo/excelx_spec.rb
index 7cc9b13..10b0caf 100755
--- a/spec/lib/roo/excelx_spec.rb
+++ b/spec/lib/roo/excelx_spec.rb
@@ -326,6 +326,30 @@ describe Roo::Excelx do
         expect(subject.formatted_value(4, 1)).to eq '05010'
       end
     end
+
+    context 'contains US currency' do
+      let(:path) { 'test/files/currency-us.xlsx' }
+
+      it 'returns a zero-padded number' do
+        expect(subject.formatted_value(4, 1)).to eq '$20.51'
+      end
+    end
+
+    context 'contains euro currency' do
+      let(:path) { 'test/files/currency-euro.xlsx' }
+
+      it 'returns a zero-padded number' do
+        expect(subject.formatted_value(4, 1)).to eq '€20.51'
+      end
+    end
+
+    context 'contains uk currency' do
+      let(:path) { 'test/files/currency-uk.xlsx' }
+
+      it 'returns a zero-padded number' do
+        expect(subject.formatted_value(4, 1)).to eq '£20.51'
+      end
+    end
   end
 
   describe '#row' do
@@ -609,6 +633,17 @@ describe Roo::Excelx do
     end
   end
 
+  describe 'opening a file with filters' do
+    let(:path) { 'test/files/wrong_coordinates.xlsx' }
+    subject(:xlsx) do
+      Roo::Spreadsheet.open(path)
+    end
+
+    it 'should properly extract defined_names' do
+      expect(subject.sheet(0).workbook.defined_names.length).to eq(1)
+    end
+  end
+
   describe 'images' do
     let(:path) { 'test/files/images.xlsx' }