rubyXL 2.5.4 → 2.5.5

data/spec/lib/color_spec.rb

@@ -4,11 +4,11 @@ require 'rubyXL'
 describe RubyXL::Color do
   describe '.validate_color' do
     it 'should return true if a valid hex color without a # is passed' do
-      RubyXL::Color.validate_color('0fbCAd').should == true
+      expect(RubyXL::Color.validate_color('0fbCAd')).to eq(true)
     end
 
     it 'should cause an error if an invalid hex color code or one with a # is passed' do
-      lambda {RubyXL::Color.validate_color('#G')}.should raise_error
+      expect {RubyXL::Color.validate_color('#G')}.to raise_error
     end
   end
 end

data/spec/lib/parser_spec.rb

@@ -48,22 +48,22 @@ describe RubyXL::Parser do
     it 'should parse a valid Excel xlsx or xlsm workbook correctly' do
       @workbook2 = RubyXL::Parser.parse(@file)
 
-      @workbook2.worksheets.size.should == @workbook.worksheets.size
+      expect(@workbook2.worksheets.size).to eq(@workbook.worksheets.size)
       @workbook2.worksheets.each_index { |i|
-        @workbook2[i].extract_data.should == @workbook[i].extract_data
+        expect(@workbook2[i].extract_data).to eq(@workbook[i].extract_data)
       }
     end
 
     it 'should cause an error if an xlsx or xlsm workbook is not passed' do
-      lambda {@workbook2 = RubyXL::Parser.parse("nonexistent_file.tmp")}.should raise_error
+      expect {@workbook2 = RubyXL::Parser.parse("nonexistent_file.tmp")}.to raise_error
     end
 
     it 'should not cause an error if an xlsx or xlsm workbook is not passed but the skip_filename_check option is used' do
       filename = @time_str
       FileUtils.cp(@file, filename)
       
-      lambda {@workbook2 = RubyXL::Parser.parse(filename)}.should raise_error
-      lambda {@workbook2 = RubyXL::Parser.parse(filename, :skip_filename_check => true)}.should_not raise_error
+      expect {@workbook2 = RubyXL::Parser.parse(filename)}.to raise_error
+      expect {@workbook2 = RubyXL::Parser.parse(filename, :skip_filename_check => true)}.not_to raise_error
 
       File.delete(filename)
     end
@@ -71,9 +71,9 @@ describe RubyXL::Parser do
     it 'should only read the data and not any of the styles (for the sake of speed) when passed true' do
       @workbook2 = RubyXL::Parser.parse(@file, :data_only => true)
 
-      @workbook2.worksheets.size.should == @workbook.worksheets.size
-      @workbook2[0].extract_data.should == @workbook[0].extract_data
-      @workbook2[0].extract_data.should == @workbook[0].extract_data
+      expect(@workbook2.worksheets.size).to eq(@workbook.worksheets.size)
+      expect(@workbook2[0].extract_data).to eq(@workbook[0].extract_data)
+      expect(@workbook2[0].extract_data).to eq(@workbook[0].extract_data)
     end
 
 =begin
@@ -86,27 +86,27 @@ describe RubyXL::Parser do
 
     it 'should unescape HTML entities properly' do
       @workbook2 = RubyXL::Parser.parse(@file)
-      @workbook2["Escape Test"][0][0].value.should == "&"
-      @workbook2["Escape Test"][0][1].value.should == "<"
-      @workbook2["Escape Test"][0][2].value.should == ">"
+      expect(@workbook2["Escape Test"][0][0].value).to eq("&")
+      expect(@workbook2["Escape Test"][0][1].value).to eq("<")
+      expect(@workbook2["Escape Test"][0][2].value).to eq(">")
 
-      @workbook2["Escape Test"][1][0].value.should == "&"
-      @workbook2["Escape Test"][1][1].value.should == "<"
-      @workbook2["Escape Test"][1][2].value.should == ">"
+      expect(@workbook2["Escape Test"][1][0].value).to eq("&")
+      expect(@workbook2["Escape Test"][1][1].value).to eq("<")
+      expect(@workbook2["Escape Test"][1][2].value).to eq(">")
     end
 
     it 'should parse Core properties correctly' do
       @workbook2 = RubyXL::Parser.parse(@file)
-      @workbook2.creator.should == "test creator"
-      @workbook2.modifier.should == "test modifier"
-      @workbook2.created_at.should == @time
-      @workbook2.modified_at.should == @time2
+      expect(@workbook2.creator).to eq("test creator")
+      expect(@workbook2.modifier).to eq("test modifier")
+      expect(@workbook2.created_at).to eq(@time)
+      expect(@workbook2.modified_at).to eq(@time2)
     end
 
     it 'should trim excessively long sheet names on save' do
       @workbook2 = RubyXL::Parser.parse(@file)
-      @workbook2[@test_sheet_name].should be_nil
-      @workbook2[@test_sheet_name[0..30]].should_not be_nil
+      expect(@workbook2[@test_sheet_name]).to be_nil
+      expect(@workbook2[@test_sheet_name[0..30]]).not_to be_nil
     end
 
   end

data/spec/lib/reference_spec.rb

@@ -5,24 +5,24 @@ describe RubyXL::Reference do
 
   describe '.ind2ref + .ref2ind' do
     it 'should correctly return the "Excel Style" description of cells when given a row/column number' do
-      RubyXL::Reference.ind2ref(0, 26).should == 'AA1'
-      RubyXL::Reference.ind2ref(99, 0).should == 'A100'
-      RubyXL::Reference.ind2ref(0, 26).should == 'AA1'
-      RubyXL::Reference.ind2ref(0, 51).should == 'AZ1'
-      RubyXL::Reference.ind2ref(0, 52).should == 'BA1'
-      RubyXL::Reference.ind2ref(0, 77).should == 'BZ1'
-      RubyXL::Reference.ind2ref(0, 78).should == 'CA1'
-      RubyXL::Reference.ind2ref(0, 16383).should == 'XFD1'
+      expect(RubyXL::Reference.ind2ref(0, 26)).to eq('AA1')
+      expect(RubyXL::Reference.ind2ref(99, 0)).to eq('A100')
+      expect(RubyXL::Reference.ind2ref(0, 26)).to eq('AA1')
+      expect(RubyXL::Reference.ind2ref(0, 51)).to eq('AZ1')
+      expect(RubyXL::Reference.ind2ref(0, 52)).to eq('BA1')
+      expect(RubyXL::Reference.ind2ref(0, 77)).to eq('BZ1')
+      expect(RubyXL::Reference.ind2ref(0, 78)).to eq('CA1')
+      expect(RubyXL::Reference.ind2ref(0, 16383)).to eq('XFD1')
     end
 
     it 'should correctly convert back and forth between "Excel Style" and index style cell references' do
       0.upto(16383) do |n|
-        RubyXL::Reference.ref2ind(RubyXL::Reference.ind2ref(n, 16383 - n)).should == [ n, 16383 - n ]
+        expect(RubyXL::Reference.ref2ind(RubyXL::Reference.ind2ref(n, 16383 - n))).to eq([ n, 16383 - n ])
       end
     end
 
     it 'should return [-1, -1] if the Excel index is not well-formed' do
-      RubyXL::Reference.ref2ind('A1B').should == [-1, -1]
+      expect(RubyXL::Reference.ref2ind('A1B')).to eq([-1, -1])
     end
   end
 

data/spec/lib/stylesheet_spec.rb

@@ -5,23 +5,23 @@ describe RubyXL::NumberFormat do
 
   describe '.is_date_format?' do
     it 'should return true if number format = dd// yy// mm' do
-      RubyXL::NumberFormat.new(:num_fmt_id => 1, :format_code => 'dd// yy// mm').is_date_format?().should == true
+      expect(RubyXL::NumberFormat.new(:num_fmt_id => 1, :format_code => 'dd// yy// mm').is_date_format?()).to eq(true)
     end  
 
     it 'should return true if number format = DD// YY// MM (uppercase)' do
-      RubyXL::NumberFormat.new(:num_fmt_id => 1, :format_code => 'DD// YY// MM').is_date_format?().should == true
+      expect(RubyXL::NumberFormat.new(:num_fmt_id => 1, :format_code => 'DD// YY// MM').is_date_format?()).to eq(true)
     end  
 
     it 'should return false if number format = @' do
-      RubyXL::NumberFormat.new(:num_fmt_id => 1, :format_code => '@').is_date_format?().should == false
-      RubyXL::NumberFormat.new(:num_fmt_id => 1, :format_code => 'general').is_date_format?().should == false
-      RubyXL::NumberFormat.new(:num_fmt_id => 1, :format_code => '0.00e+00').is_date_format?().should == false
+      expect(RubyXL::NumberFormat.new(:num_fmt_id => 1, :format_code => '@').is_date_format?()).to eq(false)
+      expect(RubyXL::NumberFormat.new(:num_fmt_id => 1, :format_code => 'general').is_date_format?()).to eq(false)
+      expect(RubyXL::NumberFormat.new(:num_fmt_id => 1, :format_code => '0.00e+00').is_date_format?()).to eq(false)
     end  
 
     it 'should properly detect date formats amongst default ones' do
       all_formats = RubyXL::NumberFormats::DEFAULT_NUMBER_FORMATS
       id_list = all_formats.collect { |fmt| fmt.num_fmt_id if fmt.is_date_format? }.compact.sort
-      id_list.should == [14, 15, 16, 17, 18, 19, 20, 21, 22, 45, 46, 47]
+      expect(id_list).to eq([14, 15, 16, 17, 18, 19, 20, 21, 22, 45, 46, 47])
     end
 
   end

data/spec/lib/workbook_spec.rb

@@ -17,39 +17,40 @@ describe RubyXL::Workbook do
 
   describe '.new' do
     it 'should automatically create a blank worksheet named "Sheet1"' do
-      @workbook[0].sheet_name.should == 'Sheet1'
+      expect(@workbook[0]).not_to be_nil
+      expect(@workbook[0].sheet_name).to eq('Sheet1')
     end
   end
 
   describe '[]' do
     it 'should properly locate worksheet by index' do
-      @workbook[1].sheet_name.should == 'Test Worksheet'
+      expect(@workbook[1]).not_to be_nil
+      expect(@workbook[1].sheet_name).to eq('Test Worksheet')
     end
 
     it 'should properly locate worksheet by name' do
-      @workbook['Test Worksheet'].sheet_name.should == 'Test Worksheet'
+      expect(@workbook['Test Worksheet']).not_to be_nil
+      expect(@workbook['Test Worksheet'].sheet_name).to eq('Test Worksheet')
     end
   end
 
   describe '.add_worksheet' do
     it 'when not given a name, it should automatically pick a name "SheetX" that is not taken yet' do
+      expect(@workbook['Sheet2']).to be_nil
       @workbook.add_worksheet
-      @workbook['Sheet2'].sheet_name.should == 'Sheet2'
+      expect(@workbook['Sheet2']).not_to be_nil
+      expect(@workbook['Sheet2'].sheet_name).to eq('Sheet2')
     end
   end
 
-  describe '.write' do
-    #method not conducive to unit tests
-  end
-
   describe '.get_fill_color' do
     it 'should return the fill color of a particular style attribute' do
       @cell.change_fill('000000')
-      @workbook.get_fill_color(@workbook.cell_xfs[@cell.style_index]).should == '000000'
+      expect(@workbook.get_fill_color(@workbook.cell_xfs[@cell.style_index])).to eq('000000')
     end
 
     it 'should return white (ffffff) if no fill color is specified in style' do
-      @workbook.get_fill_color(@workbook.cell_xfs[@cell.style_index]).should == 'ffffff'
+      expect(@workbook.get_fill_color(@workbook.cell_xfs[@cell.style_index])).to eq('ffffff')
     end
   end
 

data/spec/lib/worksheet_spec.rb

@@ -20,1606 +20,1638 @@ describe RubyXL::Worksheet do
   describe '.extract_data' do
     it 'should return a 2d array of just the cell values (without style or formula information)' do
       data = @worksheet.extract_data()
-      data[0][0].should == '0:0'
-      data.size.should == @worksheet.sheet_data.size
-      data[0].size.should == @worksheet[0].size
+      expect(data[0][0]).to eq('0:0')
+      expect(data.size).to eq(@worksheet.sheet_data.size)
+      expect(data[0].size).to eq(@worksheet[0].size)
     end
   end
 
   describe '.get_table' do
     it 'should return nil if table cannot be found with specified string' do
-      @worksheet.get_table('TEST').should be_nil
+      expect(@worksheet.get_table('TEST')).to be_nil
     end
 
     it 'should return nil if table cannot be found with specified headers' do
-      @worksheet.get_table(['TEST']).should be_nil
+      expect(@worksheet.get_table(['TEST'])).to be_nil
     end
 
     it 'should return a hash when given an array of headers it can find, where :table points to an array of hashes (rows), where each symbol is a column' do
       headers = ["0:0", "0:1", "0:4"]
       table_hash = @worksheet.get_table(headers)
 
-      table_hash[:table].size.should == 10
-      table_hash["0:0"].size.should == 10
-      table_hash["0:1"].size.should == 10
-      table_hash["0:4"].size.should == 10
+      expect(table_hash[:table].size).to eq(10)
+      expect(table_hash["0:0"].size).to eq(10)
+      expect(table_hash["0:1"].size).to eq(10)
+      expect(table_hash["0:4"].size).to eq(10)
     end
   end
 
   describe '.change_row_fill' do
     it 'should raise error if hex color code not passed' do
-  	  lambda {
-  	    @worksheet.change_row_fill(0, 'G')
-  	  }.should raise_error
+      expect {
+        @worksheet.change_row_fill(0, 'G')
+      }.to raise_error
     end
 
     it 'should raise error if hex color code includes # character' do
-      lambda {
+      expect {
         @worksheet.change_row_fill(3,'#FFF000')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should make row and cell fill colors equal hex color code passed' do
       @worksheet.change_row_fill(0, '111111')
-      @worksheet.get_row_fill(0).should == '111111'
-      @worksheet[0][5].fill_color.should == '111111'
+      expect(@worksheet.get_row_fill(0)).to eq('111111')
+      expect(@worksheet[0][5].fill_color).to eq('111111')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_fill(-1,'111111')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_fill(11,'111111')
-      @worksheet.get_row_fill(11).should == '111111'
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_fill(11)).to eq('111111')
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_font_name' do
     it 'should make row and cell font names equal font name passed' do
       @worksheet.change_row_font_name(0, 'Arial')
-      @worksheet.get_row_font_name(0).should == 'Arial'
-      @worksheet[0][5].font_name.should == 'Arial'
+      expect(@worksheet.get_row_font_name(0)).to eq('Arial')
+      expect(@worksheet[0][5].font_name).to eq('Arial')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_font_name(-1,'Arial')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_font_name(11, 'Arial')
-      @worksheet.get_row_font_name(11).should == "Arial"
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_font_name(11)).to eq("Arial")
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_font_size' do
     it 'should make row and cell font sizes equal font number passed' do
       @worksheet.change_row_font_size(0, 20)
-      @worksheet.get_row_font_size(0).should == 20
-      @worksheet[0][5].font_size.should == 20
+      expect(@worksheet.get_row_font_size(0)).to eq(20)
+      expect(@worksheet[0][5].font_size).to eq(20)
     end
 
     it 'should cause an error if a string passed' do
-      lambda {
+      expect {
         @worksheet.change_row_font_size(0, '20')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_font_size(-1,20)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_font_size(11,20)
-      @worksheet.get_row_font_size(11).should == 20
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_font_size(11)).to eq(20)
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_font_color' do
     it 'should make row and cell font colors equal to font color passed' do
       @worksheet.change_row_font_color(0, '0f0f0f')
-      @worksheet.get_row_font_color(0).should == '0f0f0f'
-      @worksheet[0][5].font_color.should == '0f0f0f'
+      expect(@worksheet.get_row_font_color(0)).to eq('0f0f0f')
+      expect(@worksheet[0][5].font_color).to eq('0f0f0f')
     end
 
     it 'should raise error if hex color code not passed' do
-  	  lambda {
-  	    @worksheet.change_row_font_color(0, 'G')
-  	  }.should raise_error
+      expect {
+        @worksheet.change_row_font_color(0, 'G')
+      }.to raise_error
     end
 
     it 'should raise error if hex color code includes # character' do
-      lambda {
+      expect {
         @worksheet.change_row_font_color(3,'#FFF000')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_font_color(-1,'0f0f0f')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_font_color(11,'0f0f0f')
-      @worksheet.get_row_font_color(11).should == '0f0f0f'
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_font_color(11)).to eq('0f0f0f')
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_italics' do
     it 'should make row and cell fonts italicized when true is passed' do
-      @worksheet.change_row_italics(0,true)
-      @worksheet.is_row_italicized(0).should == true
-      @worksheet[0][5].is_italicized.should == true
+      @worksheet.change_row_italics(0, true)
+      expect(@worksheet.is_row_italicized(0)).to eq(true)
+      expect(@worksheet[0][5].is_italicized).to eq(true)
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_italics(-1,false)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_italics(11,true)
-      @worksheet.is_row_italicized(11).should == true
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.is_row_italicized(11)).to eq(true)
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_bold' do
     it 'should make row and cell fonts bolded when true is passed' do
-      @worksheet.change_row_bold(0,true)
-      @worksheet.is_row_bolded(0).should == true
-      @worksheet[0][5].is_bolded.should == true
+      @worksheet.change_row_bold(0, true)
+      expect(@worksheet.is_row_bolded(0)).to eq(true)
+      expect(@worksheet[0][5].is_bolded).to eq(true)
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_bold(-1,false)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_bold(11,true)
-      @worksheet.is_row_bolded(11).should == true
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.is_row_bolded(11)).to eq(true)
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_underline' do
     it 'should make row and cell fonts underlined when true is passed' do
-      @worksheet.change_row_underline(0,true)
-      @worksheet.is_row_underlined(0).should == true
-      @worksheet[0][5].is_underlined.should == true
+      @worksheet.change_row_underline(0, true)
+      expect(@worksheet.is_row_underlined(0)).to eq(true)
+      expect(@worksheet[0][5].is_underlined).to eq(true)
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_underline(-1,false)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_underline(11,true)
-      @worksheet.is_row_underlined(11).should == true
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.is_row_underlined(11)).to eq(true)
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_strikethrough' do
     it 'should make row and cell fonts struckthrough when true is passed' do
-      @worksheet.change_row_strikethrough(0,true)
-      @worksheet.is_row_struckthrough(0).should == true
-      @worksheet[0][5].is_struckthrough.should == true
+      @worksheet.change_row_strikethrough(0, true)
+      expect(@worksheet.is_row_struckthrough(0)).to eq(true)
+      expect(@worksheet[0][5].is_struckthrough).to eq(true)
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_strikethrough(-1,false)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_strikethrough(11,true)
-      @worksheet.is_row_struckthrough(11).should == true
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.is_row_struckthrough(11)).to eq(true)
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_height' do
     it 'should make row height match number which is passed' do
       @worksheet.change_row_height(0,30.0002)
-      @worksheet.get_row_height(0).should == 30.0002
+      expect(@worksheet.get_row_height(0)).to eq(30.0002)
     end
 
     it 'should make row height a number equivalent of the string passed if it is a string which is a number' do
       @worksheet.change_row_height(0,'30.0002')
-      @worksheet.get_row_height(0).should == 30.0002
+      expect(@worksheet.get_row_height(0)).to eq(30.0002)
     end
 
     it 'should cause error if a string which is not a number' do
-      lambda {
+      expect {
         @worksheet.change_row_height(0,'TEST')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_height(-1,30)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_height(11,30)
-      @worksheet.get_row_height(11).should == 30
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_height(11)).to eq(30)
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_horizontal_alignment' do
     it 'should cause row and cells to horizontally align as specified by the passed in string' do
       @worksheet.change_row_horizontal_alignment(0,'center')
-      @worksheet.get_row_horizontal_alignment(0).should == 'center'
-      @worksheet[0][5].horizontal_alignment.should == 'center'
+      expect(@worksheet.get_row_horizontal_alignment(0)).to eq('center')
+      expect(@worksheet[0][5].horizontal_alignment).to eq('center')
     end
 
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_horizontal_alignment(-1,'center')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_horizontal_alignment(11,'center')
-      @worksheet.get_row_horizontal_alignment(11).should == 'center'
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_horizontal_alignment(11)).to eq('center')
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_vertical_alignment' do
     it 'should cause row and cells to vertically align as specified by the passed in string' do
       @worksheet.change_row_vertical_alignment(0,'center')
-      @worksheet.get_row_vertical_alignment(0).should == 'center'
-      @worksheet[0][5].vertical_alignment.should == 'center'
+      expect(@worksheet.get_row_vertical_alignment(0)).to eq('center')
+      expect(@worksheet[0][5].vertical_alignment).to eq('center')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_vertical_alignment(-1,'center')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_vertical_alignment(11,'center')
-      @worksheet.get_row_vertical_alignment(11).should == 'center'
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_vertical_alignment(11)).to eq('center')
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_border_top' do
     it 'should cause row and cells to have border at top of specified weight' do
       @worksheet.change_row_border_top(0, 'thin')
-      @worksheet.get_row_border_top(0).should == 'thin'
-      @worksheet[0][5].border_top.should == 'thin'
+      expect(@worksheet.get_row_border_top(0)).to eq('thin')
+      expect(@worksheet[0][5].border_top).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_border_top(-1,'thin')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_border_top(11,'thin')
-      @worksheet.get_row_border_top(11).should == 'thin'
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_border_top(11)).to eq('thin')
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_border_left' do
     it 'should cause row and cells to have border at left of specified weight' do
       @worksheet.change_row_border_left(0, 'thin')
-      @worksheet.get_row_border_left(0).should == 'thin'
-      @worksheet[0][5].border_left.should == 'thin'
+      expect(@worksheet.get_row_border_left(0)).to eq('thin')
+      expect(@worksheet[0][5].border_left).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_border_left(-1,'thin')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'  do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_border_left(11,'thin')
-      @worksheet.get_row_border_left(11).should == 'thin'
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_border_left(11)).to eq('thin')
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_border_right' do
     it 'should cause row and cells to have border at right of specified weight' do
       @worksheet.change_row_border_right(0, 'thin')
-      @worksheet.get_row_border_right(0).should == 'thin'
-      @worksheet[0][5].border_right.should == 'thin'
+      expect(@worksheet.get_row_border_right(0)).to eq('thin')
+      expect(@worksheet[0][5].border_right).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_border_right(-1,'thin')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_border_right(11,'thin')
-      @worksheet.get_row_border_right(11).should == 'thin'
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_border_right(11)).to eq('thin')
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_border_bottom' do
     it 'should cause row to have border at bottom of specified weight' do
       @worksheet.change_row_border_bottom(0, 'thin')
-      @worksheet.get_row_border_bottom(0).should == 'thin'
-      @worksheet[0][5].border_bottom.should == 'thin'
+      expect(@worksheet.get_row_border_bottom(0)).to eq('thin')
+      expect(@worksheet[0][5].border_bottom).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_border_bottom(-1,'thin')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_border_bottom(11,'thin')
-      @worksheet.get_row_border_bottom(11).should == 'thin'
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_border_bottom(11)).to eq('thin')
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_row_border_diagonal' do
     it 'should cause row to have border at diagonal of specified weight' do
       @worksheet.change_row_border_diagonal(0, 'thin')
-      @worksheet.get_row_border_diagonal(0).should == 'thin'
-      @worksheet[0][5].border_diagonal.should == 'thin'
+      expect(@worksheet.get_row_border_diagonal(0)).to eq('thin')
+      expect(@worksheet[0][5].border_diagonal).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_row_border_diagonal(-1,'thin')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.change_row_border_diagonal(11,'thin')
-      @worksheet.get_row_border_diagonal(11).should == 'thin'
-      @worksheet.sheet_data.size.should == 12
+      expect(@worksheet.get_row_border_diagonal(11)).to eq('thin')
+      expect(@worksheet.sheet_data.size).to eq(12)
     end
   end
 
   describe '.change_column_font_name' do
     it 'should cause column and cell font names to match string passed in' do
       @worksheet.change_column_font_name(0, 'Arial')
-      @worksheet.get_column_font_name(0).should == 'Arial'
-      @worksheet[5][0].font_name.should == 'Arial'
+      expect(@worksheet.get_column_font_name(0)).to eq('Arial')
+      expect(@worksheet[5][0].font_name).to eq('Arial')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_font_name(-1,'Arial')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_font_name(11,'Arial')
-      @worksheet.get_column_font_name(11).should == 'Arial'
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.get_column_font_name(11)).to eq('Arial')
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_font_size' do
     it 'should make column and cell font sizes equal font number passed' do
       @worksheet.change_column_font_size(0, 20)
-      @worksheet.get_column_font_size(0).should == 20
-      @worksheet[5][0].font_size.should == 20
+      expect(@worksheet.get_column_font_size(0)).to eq(20)
+      expect(@worksheet[5][0].font_size).to eq(20)
     end
 
     it 'should cause an error if a string passed' do
-      lambda {
+      expect {
         @worksheet.change_column_font_size(0, '20')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_font_size(-1,20)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_font_size(11,20)
-      @worksheet.get_column_font_size(11).should == 20
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.get_column_font_size(11)).to eq(20)
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_font_color' do
     it 'should make column and cell font colors equal to font color passed' do
       @worksheet.change_column_font_color(0, '0f0f0f')
-      @worksheet.get_column_font_color(0).should == '0f0f0f'
-      @worksheet[5][0].font_color.should == '0f0f0f'
+      expect(@worksheet.get_column_font_color(0)).to eq('0f0f0f')
+      expect(@worksheet[5][0].font_color).to eq('0f0f0f')
     end
 
     it 'should raise error if hex color code not passed' do
-  	  lambda {
-  	    @worksheet.change_column_font_color(0, 'G')
-  	  }.should raise_error
+      expect {
+        @worksheet.change_column_font_color(0, 'G')
+      }.to raise_error
     end
 
     it 'should raise error if hex color code includes # character' do
-      lambda {
+      expect {
         @worksheet.change_column_font_color(0,'#FFF000')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_font_color(-1,'0f0f0f')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_font_color(11,'0f0f0f')
-      @worksheet.get_column_font_color(11).should == '0f0f0f'
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.get_column_font_color(11)).to eq('0f0f0f')
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_italics' do
     it 'should make column and cell fonts italicized when true is passed' do
-      @worksheet.change_column_italics(0,true)
-      @worksheet.is_column_italicized(0).should == true
-      @worksheet[5][0].is_italicized.should == true
+      @worksheet.change_column_italics(0, true)
+      expect(@worksheet.is_column_italicized(0)).to eq(true)
+      expect(@worksheet[5][0].is_italicized).to eq(true)
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_italicized(-1,false)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_italics(11,true)
-      @worksheet.is_column_italicized(11).should == true
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.is_column_italicized(11)).to eq(true)
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_bold' do
     it 'should make column and cell fonts bolded when true is passed' do
-      @worksheet.change_column_bold(0,true)
-      @worksheet.is_column_bolded(0).should == true
-      @worksheet[5][0].is_bolded.should == true
+      @worksheet.change_column_bold(0, true)
+      expect(@worksheet.is_column_bolded(0)).to eq(true)
+      expect(@worksheet[5][0].is_bolded).to eq(true)
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_bold(-1,false)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_bold(11,true)
-      @worksheet.is_column_bolded(11).should == true
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.is_column_bolded(11)).to eq(true)
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_underline' do
     it 'should make column and cell fonts underlined when true is passed' do
-      @worksheet.change_column_underline(0,true)
-      @worksheet.is_column_underlined(0).should == true
-      @worksheet[5][0].is_underlined.should == true
+      @worksheet.change_column_underline(0, true)
+      expect(@worksheet.is_column_underlined(0)).to eq(true)
+      expect(@worksheet[5][0].is_underlined).to eq(true)
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_underline(-1,false)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_underline(11,true)
-      @worksheet.is_column_underlined(11).should == true
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.is_column_underlined(11)).to eq(true)
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_strikethrough' do
     it 'should make column and cell fonts struckthrough when true is passed' do
-      @worksheet.change_column_strikethrough(0,true)
-      @worksheet.is_column_struckthrough(0).should == true
-      @worksheet[5][0].is_struckthrough.should == true
+      @worksheet.change_column_strikethrough(0, true)
+      expect(@worksheet.is_column_struckthrough(0)).to eq(true)
+      expect(@worksheet[5][0].is_struckthrough).to eq(true)
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_strikethrough(-1,false)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_strikethrough(11,true)
-      @worksheet.is_column_struckthrough(11).should == true
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.is_column_struckthrough(11)).to eq(true)
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
-  describe '.change_column_width' do
+  describe '.change_column_width_raw' do
     it 'should make column width match number which is passed' do
       @worksheet.change_column_width_raw(0, 30.0002)
-      @worksheet.get_column_width_raw(0).should == 30.0002
+      expect(@worksheet.get_column_width_raw(0)).to eq(30.0002)
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
-        @worksheet.change_column_width(-1,10)
-      }.should raise_error
+      expect {
+        @worksheet.change_column_width_raw(-1, 10)
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
-      @worksheet.change_column_width(11,30)
-      @worksheet.get_column_width(11).should == 30
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.sheet_data[0].size).to eq(11)
+      @worksheet.change_column_width_raw(11, 30)
+      expect(@worksheet.get_column_width_raw(11)).to eq(30)
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_fill' do
     it 'should raise error if hex color code not passed' do
-  	  lambda {
-  	    @worksheet.change_column_fill(0, 'G')
-  	  }.should raise_error
+      expect {
+        @worksheet.change_column_fill(0, 'G')
+      }.to raise_error
     end
 
     it 'should raise error if hex color code includes # character' do
-      lambda {
+      expect {
         @worksheet.change_column_fill(3,'#FFF000')
-      }.should raise_error
+      }.to raise_error
     end
 
-  	it 'should make column and cell fill colors equal hex color code passed' do
-  	  @worksheet.change_column_fill(0, '111111')
-      @worksheet.get_column_fill(0).should == '111111'
-      @worksheet[5][0].fill_color.should == '111111'
-  	end
+    it 'should make column and cell fill colors equal hex color code passed' do
+      @worksheet.change_column_fill(0, '111111')
+      expect(@worksheet.get_column_fill(0)).to eq('111111')
+      expect(@worksheet[5][0].fill_color).to eq('111111')
+    end
 
-  	it 'should cause error if a negative argument is passed in' do
-      lambda {
+    it 'should cause error if a negative argument is passed in' do
+      expect {
         @worksheet.change_column_fill(-1,'111111')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_fill(11,'111111')
-      @worksheet.get_column_fill(11).should == '111111'
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.get_column_fill(11)).to eq('111111')
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_horizontal_alignment' do
     it 'should cause column and cell to horizontally align as specified by the passed in string' do
       @worksheet.change_column_horizontal_alignment(0,'center')
-      @worksheet.get_column_horizontal_alignment(0).should == 'center'
-      @worksheet[5][0].horizontal_alignment.should == 'center'
+      expect(@worksheet.get_column_horizontal_alignment(0)).to eq('center')
+      expect(@worksheet[5][0].horizontal_alignment).to eq('center')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_horizontal_alignment(-1,'center')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_horizontal_alignment(11,'center')
-      @worksheet.get_column_horizontal_alignment(11).should == 'center'
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.get_column_horizontal_alignment(11)).to eq('center')
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_vertical_alignment' do
     it 'should cause column and cell to vertically align as specified by the passed in string' do
-      @worksheet.change_column_vertical_alignment(0,'center')
-      @worksheet.get_column_vertical_alignment(0).should == 'center'
-      @worksheet[5][0].vertical_alignment.should == 'center'
+      @worksheet.change_column_vertical_alignment(0, 'center')
+      expect(@worksheet.get_column_vertical_alignment(0)).to eq('center')
+      expect(@worksheet[5][0].vertical_alignment).to eq('center')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
-        @worksheet.change_column_vertical_alignment(-1,'center')
-      }.should raise_error
+      expect {
+        @worksheet.change_column_vertical_alignment(-1, 'center')
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_vertical_alignment(11,'center')
-      @worksheet.get_column_vertical_alignment(11).should == 'center'
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.get_column_vertical_alignment(11)).to eq('center')
+      expect(@worksheet.sheet_data[0].size).to eq(12)
+    end
+
+    it 'should set column width if column alignment is changed' do
+      test_column = 2
+      expect(@worksheet.get_column_vertical_alignment(test_column)).to be_nil
+      expect(@worksheet.get_column_width_raw(test_column)).to be_nil
+      expect(@worksheet.get_column_width(test_column)).to eq(RubyXL::ColumnRange::DEFAULT_WIDTH)
+      @worksheet.change_column_vertical_alignment(test_column, 'top')
+      expect(@worksheet.get_column_width_raw(test_column)).not_to be_nil
+      expect(@worksheet.get_column_width(test_column)).to eq(RubyXL::ColumnRange::DEFAULT_WIDTH)
+      expect(@worksheet.get_column_vertical_alignment(test_column)).to eq('top')
     end
   end
 
   describe '.change_column_border_top' do
     it 'should cause column and cells within to have border at top of specified weight' do
       @worksheet.change_column_border_top(0, 'thin')
-      @worksheet.get_column_border_top(0).should == 'thin'
-      @worksheet[5][0].border_top.should == 'thin'
+      expect(@worksheet.get_column_border_top(0)).to eq('thin')
+      expect(@worksheet[5][0].border_top).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_border_top(-1,'thin')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_border_top(11,'thin')
-      @worksheet.get_column_border_top(11).should == 'thin'
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.get_column_border_top(11)).to eq('thin')
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_border_left' do
     it 'should cause column and cells within to have border at left of specified weight' do
       @worksheet.change_column_border_left(0, 'thin')
-      @worksheet.get_column_border_left(0).should == 'thin'
-      @worksheet[5][0].border_left.should == 'thin'
+      expect(@worksheet.get_column_border_left(0)).to eq('thin')
+      expect(@worksheet[5][0].border_left).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_border_left(-1,'thin')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_border_left(11,'thin')
-      @worksheet.get_column_border_left(11).should == 'thin'
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.get_column_border_left(11)).to eq('thin')
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_border_right' do
     it 'should cause column and cells within to have border at right of specified weight' do
       @worksheet.change_column_border_right(0, 'thin')
-      @worksheet.get_column_border_right(0).should == 'thin'
-      @worksheet[5][0].border_right.should == 'thin'
+      expect(@worksheet.get_column_border_right(0)).to eq('thin')
+      expect(@worksheet[5][0].border_right).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_border_right(-1,'thin')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_border_right(11,'thin')
-      @worksheet.get_column_border_right(11).should == 'thin'
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.get_column_border_right(11)).to eq('thin')
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_border_bottom' do
     it 'should cause column and cells within to have border at bottom of specified weight' do
       @worksheet.change_column_border_bottom(0, 'thin')
-      @worksheet.get_column_border_bottom(0).should == 'thin'
-      @worksheet[5][0].border_bottom.should == 'thin'
+      expect(@worksheet.get_column_border_bottom(0)).to eq('thin')
+      expect(@worksheet[5][0].border_bottom).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_border_bottom(-1,'thin')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_border_bottom(11,'thin')
-      @worksheet.get_column_border_bottom(11).should == 'thin'
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.get_column_border_bottom(11)).to eq('thin')
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.change_column_border_diagonal' do
     it 'should cause column and cells within to have border at diagonal of specified weight' do
       @worksheet.change_column_border_diagonal(0, 'thin')
-      @worksheet.get_column_border_diagonal(0).should == 'thin'
-      @worksheet[5][0].border_diagonal.should == 'thin'
+      expect(@worksheet.get_column_border_diagonal(0)).to eq('thin')
+      expect(@worksheet[5][0].border_diagonal).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.change_column_border_diagonal(-1,'thin')
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.change_column_border_diagonal(11,'thin')
-      @worksheet.get_column_border_diagonal(11).should == 'thin'
-      @worksheet.sheet_data[0].size.should == 12
+      expect(@worksheet.get_column_border_diagonal(11)).to eq('thin')
+      expect(@worksheet.sheet_data[0].size).to eq(12)
     end
   end
 
   describe '.merge_cells' do
     it 'should merge cells in any valid range specified by indices' do
       @worksheet.merge_cells(0, 0, 1, 1)
-      @worksheet.merged_cells.collect{ |r| r.ref.to_s }.should == ["A1:B2"]
+      expect(@worksheet.merged_cells.collect{ |r| r.ref.to_s }).to eq(["A1:B2"])
     end
   end
 
   describe '.add_cell' do
     it 'should add new cell where specified, even if a cell is already there (default)' do
       @worksheet.add_cell(0,0,'TEST')
-      @worksheet[0][0].value.should_not == @old_cell_value
-      @worksheet[0][0].value.should == 'TEST'
+      expect(@worksheet[0][0].value).not_to eq(@old_cell_value)
+      expect(@worksheet[0][0].value).to eq('TEST')
     end
 
     it 'should add new cell where specified with formula, even if a cell is already there (default)' do
       @worksheet.add_cell(0,0,'','SUM(A2:A10)')
-      @worksheet[0][0].value.should_not == @old_cell_value
-      @worksheet[0][0].formula.should_not == @old_cell_formula
-      @worksheet[0][0].value.should == ''
-      @worksheet[0][0].formula.expression.should == 'SUM(A2:A10)'
+      expect(@worksheet[0][0].value).not_to eq(@old_cell_value)
+      expect(@worksheet[0][0].formula).not_to eq(@old_cell_formula)
+      expect(@worksheet[0][0].value).to eq('')
+      expect(@worksheet[0][0].formula.expression).to eq('SUM(A2:A10)')
     end
 
     it 'should not overwrite when a cell is present when overwrite is specified to be false' do
       @worksheet.add_cell(0,0,'TEST','B2',false)
-      @worksheet[0][0].value.should == @old_cell_value
-      @worksheet[0][0].formula.should == @old_cell_formula
+      expect(@worksheet[0][0].value).to eq(@old_cell_value)
+      expect(@worksheet[0][0].formula).to eq(@old_cell_formula)
     end
 
     it 'should still add a new cell when there is no cell to be overwritten' do
       @worksheet.add_cell(11,11,'TEST','B2',false)
-      @worksheet[11][11].value.should == 'TEST'
-      @worksheet[11][11].formula.expression.should == 'B2'
+      expect(@worksheet[11][11].value).to eq('TEST')
+      expect(@worksheet[11][11].formula.expression).to eq('B2')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.add_cell(-1,-1,'')
-      }.should raise_error
+      }.to raise_error
     end
   end
 
   describe '.delete_row' do
     it 'should delete a row at index specified, "pushing" everything else "up"' do
       @worksheet.delete_row(0)
-      @worksheet[0][0].value.should == "1:0"
-      @worksheet[0][0].formula.should be_nil
-      @worksheet[0][0].row.should == 0
-      @worksheet[0][0].column.should == 0
+      expect(@worksheet[0][0].value).to eq("1:0")
+      expect(@worksheet[0][0].formula).to be_nil
+      expect(@worksheet[0][0].row).to eq(0)
+      expect(@worksheet[0][0].column).to eq(0)
     end
 
     it 'should delete a row at index specified, adjusting styles for other rows' do
       @worksheet.change_row_font_name(1,"Courier")
       @worksheet.delete_row(0)
-      @worksheet.get_row_font_name(0).should == "Courier"
+      expect(@worksheet.get_row_font_name(0)).to eq("Courier")
     end
 
     it 'should preserve (rather than fix) formulas that reference cells in "pushed up" rows' do
-      @worksheet.add_cell(11,0,nil,'SUM(A1:A10)')
+      @worksheet.add_cell(11, 0, nil, 'SUM(A1:A10)')
       @worksheet.delete_row(0)
-      @worksheet[10][0].formula.expression.should == 'SUM(A1:A10)'
+      expect(@worksheet[10][0].formula.expression).to eq('SUM(A1:A10)')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.delete_row(-1)
-      }.should raise_error
+      }.to raise_error
     end
   end
 
   describe '.insert_row' do
     it 'should insert a row at index specified, "pushing" everything else "down"' do
       @worksheet.insert_row(0)
-      @worksheet[0][0].should be_nil
-      @worksheet[1][0].value.should == @old_cell_value
-      @worksheet[1][0].formula.should == @old_cell_formula
+      expect(@worksheet[0][0]).to be_nil
+      expect(@worksheet[1][0].value).to eq(@old_cell_value)
+      expect(@worksheet[1][0].formula).to eq(@old_cell_formula)
     end
 
     it 'should insert a row at index specified, copying styles from row "above"' do
       @worksheet.change_row_font_name(0,'Courier')
       @worksheet.insert_row(1)
-      @worksheet.get_row_font_name(1).should == 'Courier'
+      expect(@worksheet.get_row_font_name(1)).to eq('Courier')
     end
 
     it 'should preserve (rather than fix) formulas that reference cells "pushed down" rows' do
       @worksheet.add_cell(5,0,nil,'SUM(A1:A4)')
       @worksheet.insert_row(0)
-      @worksheet[6][0].formula.expression.should == 'SUM(A1:A4)'
+      expect(@worksheet[6][0].formula.expression).to eq('SUM(A1:A4)')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.insert_row(-1)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative'  do
-      @worksheet.sheet_data.size.should == 11
+      expect(@worksheet.sheet_data.size).to eq(11)
       @worksheet.insert_row(11)
-      @worksheet.sheet_data.size.should == 13
+      expect(@worksheet.sheet_data.size).to eq(13)
     end
   end
 
   describe '.delete_column' do
     it 'should delete a column at index specified, "pushing" everything else "left"' do
       @worksheet.delete_column(0)
-      @worksheet[0][0].value.should == "0:1"
-      @worksheet[0][0].formula.should be_nil
-      @worksheet[0][0].row.should == 0
-      @worksheet[0][0].column.should == 0
+      expect(@worksheet[0][0].value).to eq("0:1")
+      expect(@worksheet[0][0].formula).to be_nil
+      expect(@worksheet[0][0].row).to eq(0)
+      expect(@worksheet[0][0].column).to eq(0)
     end
 
     it 'should delete a column at index specified, "pushing" styles "left"' do
       @worksheet.change_column_font_name(1,"Courier")
       @worksheet.delete_column(0)
-      @worksheet.get_column_font_name(0).should == "Courier"
+      expect(@worksheet.get_column_font_name(0)).to eq("Courier")
     end
 
     it 'should preserve (rather than fix) formulas that reference cells in "pushed left" columns' do
       @worksheet.add_cell(0,4,nil,'SUM(A1:D1)')
       @worksheet.delete_column(0)
-      @worksheet[0][3].formula.expression.should == 'SUM(A1:D1)'
+      expect(@worksheet[0][3].formula.expression).to eq('SUM(A1:D1)')
     end
 
     it 'should cause error if negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.delete_column(-1)
-      }.should raise_error
+      }.to raise_error
     end
   end
 
   describe '.insert_column' do
     it 'should insert a column at index specified, "pushing" everything else "right"' do
       @worksheet.insert_column(0)
-      @worksheet[0][0].should be_nil
-      @worksheet[0][1].value.should == @old_cell_value
-      @worksheet[0][1].formula.should == @old_cell_formula
+      expect(@worksheet[0][0]).to be_nil
+      expect(@worksheet[0][1].value).to eq(@old_cell_value)
+      expect(@worksheet[0][1].formula).to eq(@old_cell_formula)
     end
 
     it 'should insert a column at index specified, copying styles from column to "left"' do
       @worksheet.change_column_font_name(0,'Courier')
       @worksheet.insert_column(1)
-      @worksheet.get_column_font_name(1).should == 'Courier'
+      expect(@worksheet.get_column_font_name(1)).to eq('Courier')
     end
 
     it 'should insert a column at 0 without copying any styles, when passed 0 as column index' do
       @worksheet.change_column_font_name(0, 'Courier')
       @worksheet.insert_column(0)
-      @worksheet.get_column_font_name(0).should == 'Verdana' #not courier
+      expect(@worksheet.get_column_font_name(0)).to eq('Verdana') #not courier
     end
 
     it 'should preserve (rather than fix) formulas that reference cells in "pushed right" column' do
       @worksheet.add_cell(0,5,nil,'SUM(A1:D1)')
       @worksheet.insert_column(0)
-      @worksheet[0][6].formula.expression.should == 'SUM(A1:D1)'
+      expect(@worksheet[0][6].formula.expression).to eq('SUM(A1:D1)')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.insert_column(-1)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should expand matrix to fit argument if nonnegative' do
-      @worksheet.sheet_data[0].size.should == 11
+      expect(@worksheet.sheet_data[0].size).to eq(11)
       @worksheet.insert_column(11)
-      @worksheet.sheet_data[0].size.should == 13
+      expect(@worksheet.sheet_data[0].size).to eq(13)
     end
   end
 
   describe '.insert_cell' do
     it 'should simply add a cell if no shift argument is specified' do
       @worksheet.insert_cell(0,0,'test')
-      @worksheet[0][0].value.should == 'test'
-      @worksheet[0][1].value.should == '0:1'
-      @worksheet[1][0].value.should == '1:0'
+      expect(@worksheet[0][0].value).to eq('test')
+      expect(@worksheet[0][1].value).to eq('0:1')
+      expect(@worksheet[1][0].value).to eq('1:0')
     end
 
     it 'should shift cells to the right if :right is specified' do
       @worksheet.insert_cell(0,0,'test',nil,:right)
-      @worksheet[0][0].value.should == 'test'
-      @worksheet[0][1].value.should == '0:0'
-      @worksheet[1][0].value.should == '1:0'
+      expect(@worksheet[0][0].value).to eq('test')
+      expect(@worksheet[0][1].value).to eq('0:0')
+      expect(@worksheet[1][0].value).to eq('1:0')
     end
 
     it 'should shift cells down if :down is specified' do
       @worksheet.insert_cell(0,0,'test',nil,:down)
-      @worksheet[0][0].value.should == 'test'
-      @worksheet[0][1].value.should == '0:1'
-      @worksheet[1][0].value.should == '0:0'
+      expect(@worksheet[0][0].value).to eq('test')
+      expect(@worksheet[0][1].value).to eq('0:1')
+      expect(@worksheet[1][0].value).to eq('0:0')
     end
 
     it 'should cause error if shift argument is specified whcih is not :right or :down' do
-      lambda {
+      expect {
         @worksheet.insert_cell(0,0,'test',nil,:up)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.insert_cell(-1,-1)
-      }.should raise_error
+      }.to raise_error
     end
   end
 
   describe '.delete_cell' do
     it 'should make a cell nil if no shift argument specified' do
       deleted = @worksheet.delete_cell(0,0)
-      @worksheet[0][0].should be_nil
-      @old_cell.inspect.should == deleted.inspect
+      expect(@worksheet[0][0]).to be_nil
+      expect(@old_cell.inspect).to eq(deleted.inspect)
     end
 
     it 'should return nil if a cell which is out of range is specified' do
-      @worksheet.delete_cell(12,12).should be_nil
+      expect(@worksheet.delete_cell(12,12)).to be_nil
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.delete_cell(-1,-1)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should shift cells to the right of the deleted cell left if :left is specified' do
       @worksheet.delete_cell(0,0,:left)
-      @worksheet[0][0].value.should == '0:1'
+      expect(@worksheet[0][0].value).to eq('0:1')
     end
 
     it 'should shift cells below the deleted cell up if :up is specified' do
       @worksheet.delete_cell(0,0,:up)
-      @worksheet[0][0].value.should == '1:0'
+      expect(@worksheet[0][0].value).to eq('1:0')
     end
 
     it 'should cause en error if an argument other than :left, :up, or nil is specified for shift' do
-      lambda {
+      expect {
         @worksheet.delete_cell(0,0,:down)
-      }.should raise_error
+      }.to raise_error
     end
   end
 
   describe '.get_row_fill' do
     it 'should return white (ffffff) if no fill color specified for row' do
-      @worksheet.get_row_fill(0).should == 'ffffff'
+      expect(@worksheet.get_row_fill(0)).to eq('ffffff')
     end
 
     it 'should correctly reflect fill color if specified for row' do
       @worksheet.change_row_fill(0, '000000')
-      @worksheet.get_row_fill(0).should == '000000'
+      expect(@worksheet.get_row_fill(0)).to eq('000000')
     end
 
     it 'should return nil if a row which does not exist is passed in' do
-      @worksheet.get_row_fill(11).should be_nil
+      expect(@worksheet.get_row_fill(11)).to be_nil
     end
   end
 
   describe '.get_row_font_name' do
     it 'should correctly reflect font name for row' do
       @worksheet.change_row_font_name(0,'Courier')
-      @worksheet.get_row_font_name(0).should == 'Courier'
+      expect(@worksheet.get_row_font_name(0)).to eq('Courier')
     end
 
     it 'should return nil if a (nonnegative) row which does not exist is passed in' do
-      @worksheet.get_row_font_name(11).should be_nil
+      expect(@worksheet.get_row_font_name(11)).to be_nil
     end
   end
 
   describe '.get_row_font_size' do
     it 'should correctly reflect font size for row' do
       @worksheet.change_row_font_size(0,30)
-      @worksheet.get_row_font_size(0).should == 30
+      expect(@worksheet.get_row_font_size(0)).to eq(30)
     end
 
     it 'should return nil if a (nonnegative) row which does not exist is passed in' do
-      @worksheet.get_row_font_size(11).should be_nil
+      expect(@worksheet.get_row_font_size(11)).to be_nil
     end
   end
 
   describe '.get_row_font_color' do
     it 'should correctly reflect font color for row' do
       @worksheet.change_row_font_color(0,'0f0f0f')
-      @worksheet.get_row_font_color(0).should == '0f0f0f'
+      expect(@worksheet.get_row_font_color(0)).to eq('0f0f0f')
     end
 
     it 'should return nil if a (nonnegative) row which does not exist is passed in' do
-      @worksheet.get_row_font_color(11).should be_nil
+      expect(@worksheet.get_row_font_color(11)).to be_nil
     end
   end
 
   describe '.is_row_italicized' do
     it 'should correctly return whether row is italicized' do
-      @worksheet.change_row_italics(0,true)
-      @worksheet.is_row_italicized(0).should == true
+      @worksheet.change_row_italics(0, true)
+      expect(@worksheet.is_row_italicized(0)).to eq(true)
     end
 
     it 'should return nil if a (nonnegative) row which does not exist is passed in' do
-      @worksheet.is_row_italicized(11).should be_nil
+      expect(@worksheet.is_row_italicized(11)).to be_nil
     end
   end
 
   describe '.is_row_bolded' do
     it 'should correctly return whether row is bolded' do
-      @worksheet.change_row_bold(0,true)
-      @worksheet.is_row_bolded(0).should == true
+      @worksheet.change_row_bold(0, true)
+      expect(@worksheet.is_row_bolded(0)).to eq(true)
     end
 
     it 'should return nil if a (nonnegative) row which does not exist is passed in' do
-      @worksheet.is_row_bolded(11).should be_nil
+      expect(@worksheet.is_row_bolded(11)).to be_nil
     end
   end
 
   describe '.is_row_underlined' do
     it 'should correctly return whether row is underlined' do
-      @worksheet.change_row_underline(0,true)
-      @worksheet.is_row_underlined(0).should == true
+      @worksheet.change_row_underline(0, true)
+      expect(@worksheet.is_row_underlined(0)).to eq(true)
     end
 
     it 'should return nil if a (nonnegative) row which does not exist is passed in' do
-      @worksheet.is_row_underlined(11).should be_nil
+      expect(@worksheet.is_row_underlined(11)).to be_nil
     end
   end
 
   describe '.is_row_struckthrough' do
     it 'should correctly return whether row is struckthrough' do
-      @worksheet.change_row_strikethrough(0,true)
-      @worksheet.is_row_struckthrough(0).should == true
+      @worksheet.change_row_strikethrough(0, true)
+      expect(@worksheet.is_row_struckthrough(0)).to eq(true)
     end
 
     it 'should return nil if a (nonnegative) row which does not exist is passed in' do
-      @worksheet.is_row_struckthrough(11).should be_nil
+      expect(@worksheet.is_row_struckthrough(11)).to be_nil
     end
   end
 
   describe '.get_row_height' do
     it 'should return 13 if no height specified for row' do
-      @worksheet.get_row_height(0).should == 13
+      expect(@worksheet.get_row_height(0)).to eq(13)
     end
 
     it 'should correctly reflect height if specified for row' do
       @worksheet.change_row_height(0, 30)
-      @worksheet.get_row_height(0).should == 30
+      expect(@worksheet.get_row_height(0)).to eq(30)
     end
 
     it 'should return nil if a row which does not exist is passed in' do
-      @worksheet.get_row_height(11).should be_nil
+      expect(@worksheet.get_row_height(11)).to be_nil
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.get_row_height(-1)
-      }.should raise_error
+      }.to raise_error
     end
   end
 
   describe '.get_row_horizontal_alignment' do
     it 'should return nil if no alignment specified for row' do
-      @worksheet.get_row_horizontal_alignment(0).should be_nil
+      expect(@worksheet.get_row_horizontal_alignment(0)).to be_nil
     end
 
     it 'should return nil if a row which does not exist is passed in' do
-      @worksheet.get_row_horizontal_alignment(11).should be_nil
+      expect(@worksheet.get_row_horizontal_alignment(11)).to be_nil
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.get_row_horizontal_alignment(-1)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should return correct horizontal alignment if it is set for that row' do
       @worksheet.change_row_horizontal_alignment(0, 'center')
-      @worksheet.get_row_horizontal_alignment(0).should == 'center'
+      expect(@worksheet.get_row_horizontal_alignment(0)).to eq('center')
     end
   end
 
   describe '.get_row_vertical_alignment' do
     it 'should return nil if no alignment specified for row' do
-      @worksheet.get_row_vertical_alignment(0).should be_nil
+      expect(@worksheet.get_row_vertical_alignment(0)).to be_nil
     end
 
     it 'should return nil if a row which does not exist is passed in' do
-      @worksheet.get_row_vertical_alignment(11).should be_nil
+      expect(@worksheet.get_row_vertical_alignment(11)).to be_nil
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.get_row_vertical_alignment(-1)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should return correct vertical alignment if it is set for that row' do
       @worksheet.change_row_vertical_alignment(0, 'center')
-      @worksheet.get_row_vertical_alignment(0).should == 'center'
+      expect(@worksheet.get_row_vertical_alignment(0)).to eq('center')
     end
   end
 
   describe '.get_row_border_top' do
     it 'should return nil if no border is specified for that row in that direction' do
-      @worksheet.get_row_border_top(0).should be_nil
+      expect(@worksheet.get_row_border_top(0)).to be_nil
     end
 
     it 'should return type of border that this row has on top' do
       @worksheet.change_row_border_top(0,'thin')
-      @worksheet.get_row_border_top(0).should == 'thin'
+      expect(@worksheet.get_row_border_top(0)).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.get_row_border_top(-1)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should return nil if a row which does not exist is passed in' do
-      @worksheet.get_row_border_top(11).should be_nil
+      expect(@worksheet.get_row_border_top(11)).to be_nil
     end
   end
 
   describe '.get_row_border_left' do
     it 'should return nil if no border is specified for that row in that direction' do
-      @worksheet.get_row_border_left(0).should be_nil
+      expect(@worksheet.get_row_border_left(0)).to be_nil
     end
 
     it 'should return type of border that this row has on left' do
       @worksheet.change_row_border_left(0,'thin')
-      @worksheet.get_row_border_left(0).should == 'thin'
+      expect(@worksheet.get_row_border_left(0)).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.get_row_border_left(-1)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should return nil if a row which does not exist is passed in' do
-      @worksheet.get_row_border_left(11).should be_nil
+      expect(@worksheet.get_row_border_left(11)).to be_nil
     end
   end
 
   describe '.get_row_border_right' do
     it 'should return nil if no border is specified for that row in that direction' do
-      @worksheet.get_row_border_right(0).should be_nil
+      expect(@worksheet.get_row_border_right(0)).to be_nil
     end
 
     it 'should return type of border that this row has on right' do
       @worksheet.change_row_border_right(0,'thin')
-      @worksheet.get_row_border_right(0).should == 'thin'
+      expect(@worksheet.get_row_border_right(0)).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.get_row_border_right(-1)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should return nil if a row which does not exist is passed in' do
-      @worksheet.get_row_border_right(11).should be_nil
+      expect(@worksheet.get_row_border_right(11)).to be_nil
     end
   end
 
 
   describe '.get_row_border_bottom' do
     it 'should return nil if no border is specified for that row in that direction' do
-      @worksheet.get_row_border_bottom(0).should be_nil
+      expect(@worksheet.get_row_border_bottom(0)).to be_nil
     end
 
     it 'should return type of border that this row has on bottom' do
       @worksheet.change_row_border_bottom(0,'thin')
-      @worksheet.get_row_border_bottom(0).should == 'thin'
+      expect(@worksheet.get_row_border_bottom(0)).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.get_row_border_bottom(-1)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should return nil if a row which does not exist is passed in' do
-      @worksheet.get_row_border_bottom(11).should be_nil
+      expect(@worksheet.get_row_border_bottom(11)).to be_nil
     end
   end
 
   describe '.get_row_border_diagonal' do
     it 'should return nil if no border is specified for that row in that direction' do
-      @worksheet.get_row_border_diagonal(0).should be_nil
+      expect(@worksheet.get_row_border_diagonal(0)).to be_nil
     end
 
     it 'should return type of border that this row has on diagonal' do
       @worksheet.change_row_border_diagonal(0,'thin')
-      @worksheet.get_row_border_diagonal(0).should == 'thin'
+      expect(@worksheet.get_row_border_diagonal(0)).to eq('thin')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.get_row_border_diagonal(-1)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should return nil if a row which does not exist is passed in' do
-      @worksheet.get_row_border_diagonal(11).should be_nil
+      expect(@worksheet.get_row_border_diagonal(11)).to be_nil
     end
   end
 
   describe '.get_column_font_name' do
     it 'should correctly reflect font name for column' do
       @worksheet.change_column_font_name(0,'Courier')
-      @worksheet.get_column_font_name(0).should == 'Courier'
+      expect(@worksheet.get_column_font_name(0)).to eq('Courier')
     end
 
     it 'should cause error if a negative argument is passed in' do
-      lambda {
+      expect {
         @worksheet.get_column_font_name(-1)
-      }.should raise_error
+      }.to raise_error
     end
 
     it 'should return nil if a (nonnegative) column which does not exist is passed in' do
-      @worksheet.get_column_font_name(11).should be_nil
+      expect(@worksheet.get_column_font_name(11)).to be_nil
     end
   end
 
   describe '.get_column_font_size' do
-     it 'should correctly reflect font size for column' do
-       @worksheet.change_column_font_size(0,30)
-      @worksheet.get_column_font_size(0).should == 30
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.get_column_font_size(-1)
-       }.should raise_error
-     end
-
-     it 'should return nil if a (nonnegative) column which does not exist is passed in' do
-       @worksheet.get_column_font_size(11).should be_nil
-     end
-   end
-
-   describe '.get_column_font_color' do
-     it 'should correctly reflect font color for column' do
-       @worksheet.change_column_font_color(0,'0f0f0f')
-      @worksheet.get_column_font_color(0).should == '0f0f0f'
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.get_column_font_color(-1)
-       }.should raise_error
-     end
-
-     it 'should return nil if a (nonnegative) column which does not exist is passed in' do
-       @worksheet.get_column_font_color(11).should be_nil
-     end
-
-     it 'should return black (000000) if no rgb font color is specified' do
-       @worksheet.get_column_font_color(0).should == '000000'
-     end
-   end
-
-   describe '.is_column_italicized' do
-     it 'should correctly return whether column is italicized' do
-       @worksheet.change_column_italics(0,true)
-      @worksheet.is_column_italicized(0).should == true
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.is_column_italicized(-1)
-       }.should raise_error
-     end
-
-     it 'should return nil if a (nonnegative) column which does not exist is passed in' do
-       @worksheet.is_column_italicized(11).should be_nil
-     end
-   end
-
-   describe '.is_column_bolded' do
-     it 'should correctly return whether column is bolded' do
-       @worksheet.change_column_bold(0,true)
-      @worksheet.is_column_bolded(0).should == true
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.is_column_bolded(-1)
-       }.should raise_error
-     end
-
-     it 'should return nil if a (nonnegative) column which does not exist is passed in' do
-       @worksheet.is_column_bolded(11).should be_nil
-     end
-   end
-
-   describe '.is_column_underlined' do
-     it 'should correctly return whether column is underlined' do
-       @worksheet.change_column_underline(0,true)
-      @worksheet.is_column_underlined(0).should == true
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.is_column_underlined(-1)
-       }.should raise_error
-     end
-
-     it 'should return nil if a (nonnegative) column which does not exist is passed in' do
-       @worksheet.is_column_underlined(11).should be_nil
-     end
-   end
-
-   describe '.is_column_struckthrough' do
-     it 'should correctly return whether column is struckthrough' do
-       @worksheet.change_column_strikethrough(0,true)
-      @worksheet.is_column_struckthrough(0).should == true
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.is_column_struckthrough(-1)
-       }.should raise_error
-     end
-
-     it 'should return nil if a (nonnegative) column which does not exist is passed in' do
-       @worksheet.is_column_struckthrough(11).should be_nil
-     end
-   end
-
-   describe '.get_column_width' do
-     it 'should return 10 (base column width) if no width specified for column' do
-       @worksheet.get_column_width(0).should == RubyXL::ColumnRange::DEFAULT_WIDTH
-     end
-
-     it 'should correctly reflect width if specified for column' do
-       @worksheet.change_column_width(0, 30)
-       @worksheet.get_column_width(0).should == 30
-     end
-
-     it 'should return nil if a column which does not exist is passed in' do
-       @worksheet.get_column_width_raw(11).should be_nil
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.get_column_width(-1)
-       }.should raise_error
-     end
-   end
-
-   describe '.get_column_fill' do
-     it 'should return white (ffffff) if no fill color specified for column' do
-       @worksheet.get_column_fill(0).should == 'ffffff'
-     end
-
-     it 'should correctly reflect fill color if specified for column' do
-       @worksheet.change_column_fill(0, '000000')
-      @worksheet.get_column_fill(0).should == '000000'
-     end
-
-     it 'should return nil if a column which does not exist is passed in' do
-       @worksheet.get_column_fill(11).should be_nil
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.get_column_fill(-1)
-       }.should raise_error
-     end
-   end
-
-   describe '.get_column_horizontal_alignment' do
-     it 'should return nil if no alignment specified for column' do
-       @worksheet.get_column_horizontal_alignment(0).should be_nil
-     end
-
-     it 'should return nil if a column which does not exist is passed in' do
-       @worksheet.get_column_horizontal_alignment(11).should be_nil
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.get_column_horizontal_alignment(-1)
-       }.should raise_error
-     end
-
-     it 'should return correct horizontal alignment if it is set for that column' do
-       @worksheet.change_column_horizontal_alignment(0, 'center')
-       @worksheet.get_column_horizontal_alignment(0).should == 'center'
-     end
-   end
-
-   describe '.get_column_vertical_alignment' do
-     it 'should return nil if no alignment specified for column' do
-       @worksheet.get_column_vertical_alignment(0).should be_nil
-     end
-
-     it 'should return nil if a column which does not exist is passed in' do
-       @worksheet.get_column_vertical_alignment(11).should be_nil
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.get_column_vertical_alignment(-1)
-       }.should raise_error
-     end
-
-     it 'should return correct vertical alignment if it is set for that column' do
-       @worksheet.change_column_vertical_alignment(0, 'center')
-       @worksheet.get_column_vertical_alignment(0).should == 'center'
-     end
-   end
-
-   describe '.get_column_border_top' do
-     it 'should return nil if no border is specified for that column in that direction' do
-       @worksheet.get_column_border_top(0).should be_nil
-     end
-
-     it 'should return type of border that this column has on top' do
-       @worksheet.change_column_border_top(0,'thin')
-      @worksheet.get_column_border_top(0).should == 'thin'
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.get_column_border_top(-1)
-       }.should raise_error
-     end
-
-     it 'should return nil if a column which does not exist is passed in' do
-       @worksheet.get_column_border_top(11).should be_nil
-     end
-   end
-
-   describe '.get_column_border_left' do
-     it 'should return nil if no border is specified for that column in that direction' do
-       @worksheet.get_column_border_left(0).should be_nil
-     end
-
-     it 'should return type of border that this column has on left' do
-       @worksheet.change_column_border_left(0,'thin')
-      @worksheet.get_column_border_left(0).should == 'thin'
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.get_column_border_left(-1)
-       }.should raise_error
-     end
-
-     it 'should return nil if a column which does not exist is passed in' do
-       @worksheet.get_column_border_left(11).should be_nil
-     end
-   end
-
-   describe '.get_column_border_right' do
-     it 'should return nil if no border is specified for that column in that direction' do
-       @worksheet.get_column_border_right(0).should be_nil
-     end
-
-     it 'should return type of border that this column has on right' do
-       @worksheet.change_column_border_right(0,'thin')
-      @worksheet.get_column_border_right(0).should == 'thin'
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.get_column_border_right(-1)
-       }.should raise_error
-     end
-
-     it 'should return nil if a column which does not exist is passed in' do
-       @worksheet.get_column_border_right(11).should be_nil
-     end
-   end
-
-   describe '.get_column_border_bottom' do
-     it 'should return nil if no border is specified for that column in that direction' do
-       @worksheet.get_column_border_bottom(0).should be_nil
-     end
-
-     it 'should return type of border that this column has on bottom' do
-       @worksheet.change_column_border_bottom(0,'thin')
-      @worksheet.get_column_border_bottom(0).should == 'thin'
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.get_column_border_bottom(-1)
-       }.should raise_error
-     end
-
-     it 'should return nil if a column which does not exist is passed in' do
-       @worksheet.get_column_border_bottom(11).should be_nil
-     end
-   end
-
-   describe '.get_column_border_diagonal' do
-     it 'should return nil if no border is specified for that column in that direction' do
-       @worksheet.get_column_border_diagonal(0).should be_nil
-     end
-
-     it 'should return type of border that this column has on diagonal' do
-       @worksheet.change_column_border_diagonal(0,'thin')
-      @worksheet.get_column_border_diagonal(0).should == 'thin'
-     end
-
-     it 'should cause error if a negative argument is passed in' do
-       lambda {
-         @worksheet.get_column_border_diagonal(-1)
-       }.should raise_error
-     end
-
-     it 'should return nil if a column which does not exist is passed in' do
-       @worksheet.get_column_border_diagonal(11).should be_nil
-     end
-   end
+    it 'should correctly reflect font size for column' do
+      @worksheet.change_column_font_size(0,30)
+     expect(@worksheet.get_column_font_size(0)).to eq(30)
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_font_size(-1)
+      }.to raise_error
+    end
+
+    it 'should return nil if a (nonnegative) column which does not exist is passed in' do
+      expect(@worksheet.get_column_font_size(11)).to be_nil
+    end
+  end
+
+  describe '.get_column_font_color' do
+    it 'should correctly reflect font color for column' do
+      @worksheet.change_column_font_color(0,'0f0f0f')
+     expect(@worksheet.get_column_font_color(0)).to eq('0f0f0f')
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_font_color(-1)
+      }.to raise_error
+    end
+
+    it 'should return nil if a (nonnegative) column which does not exist is passed in' do
+      expect(@worksheet.get_column_font_color(11)).to be_nil
+    end
+
+    it 'should return black (000000) if no rgb font color is specified' do
+      expect(@worksheet.get_column_font_color(0)).to eq('000000')
+    end
+  end
+
+  describe '.is_column_italicized' do
+    it 'should correctly return whether column is italicized' do
+      @worksheet.change_column_italics(0, true)
+     expect(@worksheet.is_column_italicized(0)).to eq(true)
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.is_column_italicized(-1)
+      }.to raise_error
+    end
+
+    it 'should return nil if a (nonnegative) column which does not exist is passed in' do
+      expect(@worksheet.is_column_italicized(11)).to be_nil
+    end
+  end
+
+  describe '.is_column_bolded' do
+    it 'should correctly return whether column is bolded' do
+      @worksheet.change_column_bold(0, true)
+     expect(@worksheet.is_column_bolded(0)).to eq(true)
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.is_column_bolded(-1)
+      }.to raise_error
+    end
+
+    it 'should return nil if a (nonnegative) column which does not exist is passed in' do
+      expect(@worksheet.is_column_bolded(11)).to be_nil
+    end
+  end
+
+  describe '.is_column_underlined' do
+    it 'should correctly return whether column is underlined' do
+      @worksheet.change_column_underline(0, true)
+     expect(@worksheet.is_column_underlined(0)).to eq(true)
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.is_column_underlined(-1)
+      }.to raise_error
+    end
+
+    it 'should return nil if a (nonnegative) column which does not exist is passed in' do
+      expect(@worksheet.is_column_underlined(11)).to be_nil
+    end
+  end
+
+  describe '.is_column_struckthrough' do
+    it 'should correctly return whether column is struckthrough' do
+      @worksheet.change_column_strikethrough(0, true)
+     expect(@worksheet.is_column_struckthrough(0)).to eq(true)
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.is_column_struckthrough(-1)
+      }.to raise_error
+    end
+
+    it 'should return nil if a (nonnegative) column which does not exist is passed in' do
+      expect(@worksheet.is_column_struckthrough(11)).to be_nil
+    end
+  end
+
+  describe '.get_column_width_raw' do
+    it 'should return nil if no width specified for column' do
+      expect(@worksheet.get_column_width_raw(0)).to be_nil
+    end
+
+    it 'should correctly reflect width if specified for column' do
+      @worksheet.change_column_width_raw(0, 30.123)
+      expect(@worksheet.get_column_width_raw(0)).to eq(30.123)
+    end
+
+    it 'should return nil for a column that does not exist' do
+      expect(@worksheet.get_column_width_raw(11)).to be_nil
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_width_raw(-1)
+      }.to raise_error
+    end
+  end
+
+  describe '.get_column_width' do
+    it 'should return default width if no width specified for column' do
+      expect(@worksheet.get_column_width(0)).to eq(RubyXL::ColumnRange::DEFAULT_WIDTH)
+    end
+
+    it 'should correctly reflect width if specified for column' do
+      @worksheet.change_column_width(0, 15)
+      expect(@worksheet.get_column_width(0)).to eq(15)
+    end
+
+    it 'should return default width for a column that does not exist' do
+      expect(@worksheet.get_column_width(11)).to eq(RubyXL::ColumnRange::DEFAULT_WIDTH)
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_width(-1)
+      }.to raise_error
+    end
+  end
+
+  describe '.get_column_fill' do
+    it 'should return white (ffffff) if no fill color specified for column' do
+      expect(@worksheet.get_column_fill(0)).to eq('ffffff')
+    end
+
+    it 'should correctly reflect fill color if specified for column' do
+      @worksheet.change_column_fill(0, '000000')
+     expect(@worksheet.get_column_fill(0)).to eq('000000')
+    end
+
+    it 'should return nil if a column which does not exist is passed in' do
+      expect(@worksheet.get_column_fill(11)).to be_nil
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_fill(-1)
+      }.to raise_error
+    end
+  end
+
+  describe '.get_column_horizontal_alignment' do
+    it 'should return nil if no alignment specified for column' do
+      expect(@worksheet.get_column_horizontal_alignment(0)).to be_nil
+    end
+
+    it 'should return nil if a column which does not exist is passed in' do
+      expect(@worksheet.get_column_horizontal_alignment(11)).to be_nil
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_horizontal_alignment(-1)
+      }.to raise_error
+    end
+
+    it 'should return correct horizontal alignment if it is set for that column' do
+      @worksheet.change_column_horizontal_alignment(0, 'center')
+      expect(@worksheet.get_column_horizontal_alignment(0)).to eq('center')
+    end
+  end
+
+  describe '.get_column_vertical_alignment' do
+    it 'should return nil if no alignment specified for column' do
+      expect(@worksheet.get_column_vertical_alignment(0)).to be_nil
+    end
+
+    it 'should return nil if a column which does not exist is passed in' do
+      expect(@worksheet.get_column_vertical_alignment(11)).to be_nil
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_vertical_alignment(-1)
+      }.to raise_error
+    end
+
+    it 'should return correct vertical alignment if it is set for that column' do
+      @worksheet.change_column_vertical_alignment(0, 'center')
+      expect(@worksheet.get_column_vertical_alignment(0)).to eq('center')
+    end
+  end
+
+  describe '.get_column_border_top' do
+    it 'should return nil if no border is specified for that column in that direction' do
+      expect(@worksheet.get_column_border_top(0)).to be_nil
+    end
+
+    it 'should return type of border that this column has on top' do
+      @worksheet.change_column_border_top(0,'thin')
+     expect(@worksheet.get_column_border_top(0)).to eq('thin')
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_border_top(-1)
+      }.to raise_error
+    end
+
+    it 'should return nil if a column which does not exist is passed in' do
+      expect(@worksheet.get_column_border_top(11)).to be_nil
+    end
+  end
+
+  describe '.get_column_border_left' do
+    it 'should return nil if no border is specified for that column in that direction' do
+      expect(@worksheet.get_column_border_left(0)).to be_nil
+    end
+
+    it 'should return type of border that this column has on left' do
+      @worksheet.change_column_border_left(0,'thin')
+     expect(@worksheet.get_column_border_left(0)).to eq('thin')
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_border_left(-1)
+      }.to raise_error
+    end
+
+    it 'should return nil if a column which does not exist is passed in' do
+      expect(@worksheet.get_column_border_left(11)).to be_nil
+    end
+  end
+
+  describe '.get_column_border_right' do
+    it 'should return nil if no border is specified for that column in that direction' do
+      expect(@worksheet.get_column_border_right(0)).to be_nil
+    end
+
+    it 'should return type of border that this column has on right' do
+      @worksheet.change_column_border_right(0,'thin')
+     expect(@worksheet.get_column_border_right(0)).to eq('thin')
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_border_right(-1)
+      }.to raise_error
+    end
+
+    it 'should return nil if a column which does not exist is passed in' do
+      expect(@worksheet.get_column_border_right(11)).to be_nil
+    end
+  end
+
+  describe '.get_column_border_bottom' do
+    it 'should return nil if no border is specified for that column in that direction' do
+      expect(@worksheet.get_column_border_bottom(0)).to be_nil
+    end
+
+    it 'should return type of border that this column has on bottom' do
+      @worksheet.change_column_border_bottom(0,'thin')
+     expect(@worksheet.get_column_border_bottom(0)).to eq('thin')
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_border_bottom(-1)
+      }.to raise_error
+    end
+
+    it 'should return nil if a column which does not exist is passed in' do
+      expect(@worksheet.get_column_border_bottom(11)).to be_nil
+    end
+  end
+
+  describe '.get_column_border_diagonal' do
+    it 'should return nil if no border is specified for that column in that direction' do
+      expect(@worksheet.get_column_border_diagonal(0)).to be_nil
+    end
+
+    it 'should return type of border that this column has on diagonal' do
+      @worksheet.change_column_border_diagonal(0,'thin')
+     expect(@worksheet.get_column_border_diagonal(0)).to eq('thin')
+    end
+
+    it 'should cause error if a negative argument is passed in' do
+      expect {
+        @worksheet.get_column_border_diagonal(-1)
+      }.to raise_error
+    end
+
+    it 'should return nil if a column which does not exist is passed in' do
+      expect(@worksheet.get_column_border_diagonal(11)).to be_nil
+    end
+  end
 
 
   describe '@column_range' do
     it 'should properly handle range addition and modification' do
       # Ranges should be empty for brand new worskeet
-      @worksheet.cols.column_ranges.size.should == 0
+      expect(@worksheet.cols.column_ranges.size).to eq(0)
 
       # Range should be created if the column has not been touched before
       @worksheet.change_column_width(0, 30)
-      @worksheet.get_column_width(0).should == 30
-      @worksheet.cols.column_ranges.size.should == 1
+      expect(@worksheet.get_column_width(0)).to eq(30)
+      expect(@worksheet.cols.column_ranges.size).to eq(1)
 
       # Range should be reused if the column has not been touched before
       @worksheet.change_column_width(0, 20)
-      @worksheet.get_column_width(0).should == 20
-      @worksheet.cols.column_ranges.size.should == 1
+      expect(@worksheet.get_column_width(0)).to eq(20)
+      expect(@worksheet.cols.column_ranges.size).to eq(1)
 
       # Creation of the new range should not affect previously changed columns
       @worksheet.change_column_width(1, 999)
-      @worksheet.get_column_width(1).should == 999
-      @worksheet.get_column_width(0).should == 20
-      @worksheet.cols.column_ranges.size.should == 2
+      expect(@worksheet.get_column_width(1)).to eq(999)
+      expect(@worksheet.get_column_width(0)).to eq(20)
+      expect(@worksheet.cols.column_ranges.size).to eq(2)
     end
 
   end