Use Ruby 1.9 hash syntax (non-production code)

34 files changed, 98 insertions, 98 deletions

diff --git a/test/drawing/tc_area_chart.rb b/test/drawing/tc_area_chart.rb
index 5829149a..3aa7d20c 100644
--- a/test/drawing/tc_area_chart.rb
+++ b/test/drawing/tc_area_chart.rb
@@ -7,7 +7,7 @@ class TestAreaChart < Test::Unit::TestCase
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.add_chart Axlsx::AreaChart, :title => "fishery"
+    @chart = ws.add_chart Axlsx::AreaChart, title: "fishery"
   end
 
   def teardown; end
diff --git a/test/drawing/tc_area_series.rb b/test/drawing/tc_area_series.rb
index c9b9a949..334a3ba4 100644
--- a/test/drawing/tc_area_series.rb
+++ b/test/drawing/tc_area_series.rb
@@ -5,15 +5,15 @@ require 'tc_helper'
 class TestAreaSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
-    @ws = p.workbook.add_worksheet :name => "hmmm"
-    chart = @ws.add_chart Axlsx::AreaChart, :title => "fishery"
+    @ws = p.workbook.add_worksheet name: "hmmm"
+    chart = @ws.add_chart Axlsx::AreaChart, title: "fishery"
     @series = chart.add_series(
-      :data => [0, 1, 2],
-      :labels => ["zero", "one", "two"],
-      :title => "bob",
-      :color => "#FF0000",
-      :show_marker => true,
-      :smooth => true
+      data: [0, 1, 2],
+      labels: ["zero", "one", "two"],
+      title: "bob",
+      color: "#FF0000",
+      show_marker: true,
+      smooth: true
     )
   end
 
diff --git a/test/drawing/tc_axes.rb b/test/drawing/tc_axes.rb
index 2e9aab90..7ec5613c 100644
--- a/test/drawing/tc_axes.rb
+++ b/test/drawing/tc_axes.rb
@@ -4,7 +4,7 @@ require 'tc_helper'
 
 class TestAxes < Test::Unit::TestCase
   def test_constructor_requires_cat_axis_first
-    assert_raise(ArgumentError) { Axlsx::Axes.new(:val_axis => Axlsx::ValAxis, :cat_axis => Axlsx::CatAxis) }
-    assert_nothing_raised { Axlsx::Axes.new(:cat_axis => Axlsx::CatAxis, :val_axis => Axlsx::ValAxis) }
+    assert_raise(ArgumentError) { Axlsx::Axes.new(val_axis: Axlsx::ValAxis, cat_axis: Axlsx::CatAxis) }
+    assert_nothing_raised { Axlsx::Axes.new(cat_axis: Axlsx::CatAxis, val_axis: Axlsx::ValAxis) }
   end
 end
diff --git a/test/drawing/tc_axis.rb b/test/drawing/tc_axis.rb
index 59f48d1d..cbe7187e 100644
--- a/test/drawing/tc_axis.rb
+++ b/test/drawing/tc_axis.rb
@@ -4,7 +4,7 @@ require 'tc_helper'
 
 class TestAxis < Test::Unit::TestCase
   def setup
-    @axis = Axlsx::Axis.new :gridlines => false, :title => 'Foo'
+    @axis = Axlsx::Axis.new gridlines: false, title: 'Foo'
   end
 
   def test_initialization
@@ -28,12 +28,12 @@ class TestAxis < Test::Unit::TestCase
 
   def test_cell_based_axis_title
     p = Axlsx::Package.new
-    p.workbook.add_worksheet(:name => 'foosheet') do |sheet|
+    p.workbook.add_worksheet(name: 'foosheet') do |sheet|
       sheet.add_row ['battle victories']
       sheet.add_row ['bird', 1, 2, 1]
       sheet.add_row ['cat', 7, 9, 10]
       sheet.add_chart(Axlsx::Line3DChart) do |chart|
-        chart.add_series :data => sheet['B2:D2'], :labels => sheet['B1']
+        chart.add_series data: sheet['B2:D2'], labels: sheet['B1']
         chart.val_axis.title = sheet['A1']
 
         assert_equal('battle victories', chart.val_axis.title.text)
@@ -66,10 +66,10 @@ class TestAxis < Test::Unit::TestCase
 
   def create_chart_with_formatting(format_string = nil)
     p = Axlsx::Package.new
-    p.workbook.add_worksheet(:name => "Formatting Test") do |sheet|
+    p.workbook.add_worksheet(name: "Formatting Test") do |sheet|
       sheet.add_row(['test', 20])
-      sheet.add_chart(Axlsx::Bar3DChart, :start_at => [0, 5], :end_at => [10, 20], :title => "Test Formatting") do |chart|
-        chart.add_series :data => sheet["B1:B1"], :labels => sheet["A1:A1"]
+      sheet.add_chart(Axlsx::Bar3DChart, start_at: [0, 5], end_at: [10, 20], title: "Test Formatting") do |chart|
+        chart.add_series data: sheet["B1:B1"], labels: sheet["A1:A1"]
         chart.val_axis.format_code = format_string if format_string
         doc = Nokogiri::XML(chart.to_xml_string)
         yield doc
diff --git a/test/drawing/tc_bar_3D_chart.rb b/test/drawing/tc_bar_3D_chart.rb
index d825ce94..b01dcd38 100644
--- a/test/drawing/tc_bar_3D_chart.rb
+++ b/test/drawing/tc_bar_3D_chart.rb
@@ -7,7 +7,7 @@ class TestBar3DChart < Test::Unit::TestCase
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.add_chart Axlsx::Bar3DChart, :title => "fishery"
+    @chart = ws.add_chart Axlsx::Bar3DChart, title: "fishery"
   end
 
   def teardown; end
diff --git a/test/drawing/tc_bar_chart.rb b/test/drawing/tc_bar_chart.rb
index 0d4fd341..d81d3b8d 100644
--- a/test/drawing/tc_bar_chart.rb
+++ b/test/drawing/tc_bar_chart.rb
@@ -7,7 +7,7 @@ class TestBarChart < Test::Unit::TestCase
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.add_chart Axlsx::BarChart, :title => "fishery"
+    @chart = ws.add_chart Axlsx::BarChart, title: "fishery"
   end
 
   def teardown; end
diff --git a/test/drawing/tc_bar_series.rb b/test/drawing/tc_bar_series.rb
index 450b67e5..f3dd34fe 100644
--- a/test/drawing/tc_bar_series.rb
+++ b/test/drawing/tc_bar_series.rb
@@ -5,8 +5,8 @@ require 'tc_helper'
 class TestBarSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
-    @ws = p.workbook.add_worksheet :name => "hmmm"
-    @chart = @ws.add_chart Axlsx::Bar3DChart, :title => "fishery"
+    @ws = p.workbook.add_worksheet name: "hmmm"
+    @chart = @ws.add_chart Axlsx::Bar3DChart, title: "fishery"
     @series = @chart.add_series(
       data: [0, 1, 2],
       labels: ['zero', 'one', 'two'],
diff --git a/test/drawing/tc_bubble_chart.rb b/test/drawing/tc_bubble_chart.rb
index b38e636b..5081e4b6 100644
--- a/test/drawing/tc_bubble_chart.rb
+++ b/test/drawing/tc_bubble_chart.rb
@@ -13,11 +13,11 @@ class TestBubbleChart < Test::Unit::TestCase
       sheet.add_row ["Second", 5,  2, 14, 9]
       sheet.add_row ["",       5, 10, 15, 20]
       sheet.add_row ["",       5, 28, 92, 13]
-      sheet.add_chart(Axlsx::BubbleChart, :title => "example: Bubble Chart") do |chart|
+      sheet.add_chart(Axlsx::BubbleChart, title: "example: Bubble Chart") do |chart|
         chart.start_at 0, 4
         chart.end_at 10, 19
-        chart.add_series :xData => sheet["B1:E1"], :yData => sheet["B2:E2"], :bubbleSize => sheet["B3:E3"], :title => sheet["A1"]
-        chart.add_series :xData => sheet["B4:E4"], :yData => sheet["B5:E5"], :bubbleSize => sheet["B6:E6"], :title => sheet["A3"]
+        chart.add_series xData: sheet["B1:E1"], yData: sheet["B2:E2"], bubbleSize: sheet["B3:E3"], title: sheet["A1"]
+        chart.add_series xData: sheet["B4:E4"], yData: sheet["B5:E5"], bubbleSize: sheet["B6:E6"], title: sheet["A3"]
         @chart = chart
       end
     end
diff --git a/test/drawing/tc_bubble_series.rb b/test/drawing/tc_bubble_series.rb
index 78ac1b23..3e799b98 100644
--- a/test/drawing/tc_bubble_series.rb
+++ b/test/drawing/tc_bubble_series.rb
@@ -5,9 +5,9 @@ require 'tc_helper'
 class TestBubbleSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
-    @ws = p.workbook.add_worksheet :name => "hmmm"
-    @chart = @ws.add_chart Axlsx::BubbleChart, :title => "Bubble Chart"
-    @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :bubbleSize => [1, 5, 7], :title => "GDP", :color => 'FF0000'
+    @ws = p.workbook.add_worksheet name: "hmmm"
+    @chart = @ws.add_chart Axlsx::BubbleChart, title: "Bubble Chart"
+    @series = @chart.add_series xData: [1, 2, 4], yData: [1, 3, 9], bubbleSize: [1, 5, 7], title: "GDP", color: 'FF0000'
   end
 
   def test_initialize
diff --git a/test/drawing/tc_chart.rb b/test/drawing/tc_chart.rb
index c7527e15..596a8bfa 100644
--- a/test/drawing/tc_chart.rb
+++ b/test/drawing/tc_chart.rb
@@ -7,7 +7,7 @@ class TestChart < Test::Unit::TestCase
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.add_chart Axlsx::Bar3DChart, :title => "fishery", :bg_color => "000000"
+    @chart = ws.add_chart Axlsx::Bar3DChart, title: "fishery", bg_color: "000000"
   end
 
   def teardown; end
@@ -101,7 +101,7 @@ class TestChart < Test::Unit::TestCase
   end
 
   def test_add_series
-    s = @chart.add_series :data => [0, 1, 2, 3], :labels => ["one", 1, "anything"], :title => "bob"
+    s = @chart.add_series data: [0, 1, 2, 3], labels: ["one", 1, "anything"], title: "bob"
 
     assert_equal(@chart.series.last, s, "series has been added to chart series collection")
     assert_equal("bob", s.title.text, "series title has been applied")
diff --git a/test/drawing/tc_d_lbls.rb b/test/drawing/tc_d_lbls.rb
index b7d664b4..9bb2d4ba 100644
--- a/test/drawing/tc_d_lbls.rb
+++ b/test/drawing/tc_d_lbls.rb
@@ -24,7 +24,7 @@ class TestDLbls < Test::Unit::TestCase
   def test_initialization_with_optoins
     options_hash = @boolean_attributes.to_h { |name| [name, true] }
 
-    d_lbls = Axlsx::DLbls.new(Axlsx::Pie3DChart, options_hash.merge({ :d_lbl_pos => :t }))
+    d_lbls = Axlsx::DLbls.new(Axlsx::Pie3DChart, options_hash.merge({ d_lbl_pos: :t }))
 
     @boolean_attributes.each do |attr|
       assert(d_lbls.send(attr), "boolean attributes set by options")
diff --git a/test/drawing/tc_data_source.rb b/test/drawing/tc_data_source.rb
index fd500819..c950accd 100644
--- a/test/drawing/tc_data_source.rb
+++ b/test/drawing/tc_data_source.rb
@@ -4,7 +4,7 @@ require 'tc_helper'
 
 class TestNumDataSource < Test::Unit::TestCase
   def setup
-    @data_source = Axlsx::NumDataSource.new :data => ["1", "2", "3"]
+    @data_source = Axlsx::NumDataSource.new data: ["1", "2", "3"]
   end
 
   def test_tag_name
diff --git a/test/drawing/tc_drawing.rb b/test/drawing/tc_drawing.rb
index 1e72b462..d7e3e8df 100644
--- a/test/drawing/tc_drawing.rb
+++ b/test/drawing/tc_drawing.rb
@@ -13,7 +13,7 @@ class TestDrawing < Test::Unit::TestCase
   end
 
   def test_add_chart
-    chart = @ws.add_chart(Axlsx::Pie3DChart, :title => "bob", :start_at => [0, 0], :end_at => [1, 1])
+    chart = @ws.add_chart(Axlsx::Pie3DChart, title: "bob", start_at: [0, 0], end_at: [1, 1])
 
     assert(chart.is_a?(Axlsx::Pie3DChart), "must create a chart")
     assert_equal(@ws.workbook.charts.last, chart, "must be added to workbook charts collection")
@@ -27,7 +27,7 @@ class TestDrawing < Test::Unit::TestCase
 
   def test_add_image
     src = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
-    image = @ws.add_image(:image_src => src, :start_at => [0, 0], :width => 600, :height => 400)
+    image = @ws.add_image(image_src: src, start_at: [0, 0], width: 600, height: 400)
 
     assert(@ws.drawing.anchors.last.is_a?(Axlsx::OneCellAnchor))
     assert(image.is_a?(Axlsx::Pic))
@@ -37,17 +37,17 @@ class TestDrawing < Test::Unit::TestCase
 
   def test_add_two_cell_anchor_image
     src = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
-    image = @ws.add_image(:image_src => src, :start_at => [0, 0], :end_at => [15, 0])
+    image = @ws.add_image(image_src: src, start_at: [0, 0], end_at: [15, 0])
 
     assert(@ws.drawing.anchors.last.is_a?(Axlsx::TwoCellAnchor))
     assert(image.is_a?(Axlsx::Pic))
   end
 
   def test_charts
-    chart = @ws.add_chart(Axlsx::Pie3DChart, :title => "bob", :start_at => [0, 0], :end_at => [1, 1])
+    chart = @ws.add_chart(Axlsx::Pie3DChart, title: "bob", start_at: [0, 0], end_at: [1, 1])
 
     assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
-    chart = @ws.add_chart(Axlsx::Pie3DChart, :title => "nancy", :start_at => [1, 5], :end_at => [5, 10])
+    chart = @ws.add_chart(Axlsx::Pie3DChart, title: "nancy", start_at: [1, 5], end_at: [5, 10])
 
     assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
   end
@@ -71,10 +71,10 @@ class TestDrawing < Test::Unit::TestCase
   end
 
   def test_relationships
-    @ws.add_chart(Axlsx::Pie3DChart, :title => "bob", :start_at => [0, 0], :end_at => [1, 1])
+    @ws.add_chart(Axlsx::Pie3DChart, title: "bob", start_at: [0, 0], end_at: [1, 1])
 
     assert_equal(1, @ws.drawing.relationships.size, "adding a chart adds a relationship")
-    @ws.add_chart(Axlsx::Pie3DChart, :title => "nancy", :start_at => [1, 5], :end_at => [5, 10])
+    @ws.add_chart(Axlsx::Pie3DChart, title: "nancy", start_at: [1, 5], end_at: [5, 10])
 
     assert_equal(2, @ws.drawing.relationships.size, "adding a chart adds a relationship")
   end
diff --git a/test/drawing/tc_hyperlink.rb b/test/drawing/tc_hyperlink.rb
index cad418f8..c3cffb1c 100644
--- a/test/drawing/tc_hyperlink.rb
+++ b/test/drawing/tc_hyperlink.rb
@@ -7,7 +7,7 @@ class TestHyperlink < Test::Unit::TestCase
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @test_img = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
-    @image = ws.add_image :image_src => @test_img, :hyperlink => "http://axlsx.blogspot.com"
+    @image = ws.add_image image_src: @test_img, hyperlink: "http://axlsx.blogspot.com"
     @hyperlink = @image.hyperlink
   end
 
diff --git a/test/drawing/tc_line_3d_chart.rb b/test/drawing/tc_line_3d_chart.rb
index 2107f1a0..471e9498 100644
--- a/test/drawing/tc_line_3d_chart.rb
+++ b/test/drawing/tc_line_3d_chart.rb
@@ -7,7 +7,7 @@ class TestLine3DChart < Test::Unit::TestCase
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.add_chart Axlsx::Line3DChart, :title => "fishery"
+    @chart = ws.add_chart Axlsx::Line3DChart, title: "fishery"
   end
 
   def teardown; end
diff --git a/test/drawing/tc_line_chart.rb b/test/drawing/tc_line_chart.rb
index 460b2055..b1bc0a75 100644
--- a/test/drawing/tc_line_chart.rb
+++ b/test/drawing/tc_line_chart.rb
@@ -7,7 +7,7 @@ class TestLineChart < Test::Unit::TestCase
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.add_chart Axlsx::LineChart, :title => "fishery"
+    @chart = ws.add_chart Axlsx::LineChart, title: "fishery"
   end
 
   def teardown; end
diff --git a/test/drawing/tc_line_series.rb b/test/drawing/tc_line_series.rb
index 7223fca3..0add56ee 100644
--- a/test/drawing/tc_line_series.rb
+++ b/test/drawing/tc_line_series.rb
@@ -5,15 +5,15 @@ require 'tc_helper'
 class TestLineSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
-    @ws = p.workbook.add_worksheet :name => "hmmm"
-    chart = @ws.add_chart Axlsx::Line3DChart, :title => "fishery"
+    @ws = p.workbook.add_worksheet name: "hmmm"
+    chart = @ws.add_chart Axlsx::Line3DChart, title: "fishery"
     @series = chart.add_series(
-      :data => [0, 1, 2],
-      :labels => ["zero", "one", "two"],
-      :title => "bob",
-      :color => "#FF0000",
-      :show_marker => true,
-      :smooth => true
+      data: [0, 1, 2],
+      labels: ["zero", "one", "two"],
+      title: "bob",
+      color: "#FF0000",
+      show_marker: true,
+      smooth: true
     )
   end
 
diff --git a/test/drawing/tc_num_data.rb b/test/drawing/tc_num_data.rb
index c794faf8..72f564c0 100644
--- a/test/drawing/tc_num_data.rb
+++ b/test/drawing/tc_num_data.rb
@@ -4,7 +4,7 @@ require 'tc_helper'
 
 class TestNumData < Test::Unit::TestCase
   def setup
-    @num_data = Axlsx::NumData.new :data => [1, 2, 3]
+    @num_data = Axlsx::NumData.new data: [1, 2, 3]
   end
 
   def test_initialize
diff --git a/test/drawing/tc_num_val.rb b/test/drawing/tc_num_val.rb
index 7ad6ace4..27553b6a 100644
--- a/test/drawing/tc_num_val.rb
+++ b/test/drawing/tc_num_val.rb
@@ -4,7 +4,7 @@ require 'tc_helper'
 
 class TestNumVal < Test::Unit::TestCase
   def setup
-    @num_val = Axlsx::NumVal.new :v => 1
+    @num_val = Axlsx::NumVal.new v: 1
   end
 
   def test_initialize
diff --git a/test/drawing/tc_one_cell_anchor.rb b/test/drawing/tc_one_cell_anchor.rb
index 7f0a7c4a..e3eb8d90 100644
--- a/test/drawing/tc_one_cell_anchor.rb
+++ b/test/drawing/tc_one_cell_anchor.rb
@@ -7,7 +7,7 @@ class TestOneCellAnchor < Test::Unit::TestCase
     @p = Axlsx::Package.new
     @ws = @p.workbook.add_worksheet
     @test_img = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
-    @image = @ws.add_image :image_src => @test_img
+    @image = @ws.add_image image_src: @test_img
     @anchor = @image.anchor
   end
 
@@ -52,8 +52,8 @@ class TestOneCellAnchor < Test::Unit::TestCase
   end
 
   def test_options
-    assert_raise(ArgumentError, 'invalid start_at') { @ws.add_image :image_src => @test_img, :start_at => [1] }
-    i = @ws.add_image :image_src => @test_img, :start_at => [1, 2], :width => 100, :height => 200, :name => "someimage", :descr => "a neat image"
+    assert_raise(ArgumentError, 'invalid start_at') { @ws.add_image image_src: @test_img, start_at: [1] }
+    i = @ws.add_image image_src: @test_img, start_at: [1, 2], width: 100, height: 200, name: "someimage", descr: "a neat image"
 
     assert_equal("a neat image", i.descr)
     assert_equal("someimage", i.name)
diff --git a/test/drawing/tc_pic.rb b/test/drawing/tc_pic.rb
index daa8b4a3..dc0f32da 100644
--- a/test/drawing/tc_pic.rb
+++ b/test/drawing/tc_pic.rb
@@ -15,8 +15,8 @@ class TestPic < Test::Unit::TestCase
     @test_img_fake = File.dirname(__FILE__) + "/../fixtures/image1_fake.jpg"
     @test_img_remote_png = "https://example.com/sample-image.png"
     @test_img_remote_fake = "invalid_URI"
-    @image = ws.add_image :image_src => @test_img, :hyperlink => 'https://github.com/randym', :tooltip => "What's up doc?", :opacity => 5
-    @image_remote = ws.add_image :image_src => @test_img_remote_png, remote: true, :hyperlink => 'https://github.com/randym', :tooltip => "What's up doc?", :opacity => 5
+    @image = ws.add_image image_src: @test_img, hyperlink: 'https://github.com/randym', tooltip: "What's up doc?", opacity: 5
+    @image_remote = ws.add_image image_src: @test_img_remote_png, remote: true, hyperlink: 'https://github.com/randym', tooltip: "What's up doc?", opacity: 5
   end
 
   def test_initialization
diff --git a/test/drawing/tc_pie_3D_chart.rb b/test/drawing/tc_pie_3D_chart.rb
index 889e383f..3fbdeacb 100644
--- a/test/drawing/tc_pie_3D_chart.rb
+++ b/test/drawing/tc_pie_3D_chart.rb
@@ -7,7 +7,7 @@ class TestPie3DChart < Test::Unit::TestCase
     p = Axlsx::Package.new
     ws = p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.add_chart Axlsx::Pie3DChart, :title => "fishery"
+    @chart = ws.add_chart Axlsx::Pie3DChart, title: "fishery"
   end
 
   def teardown; end
diff --git a/test/drawing/tc_pie_series.rb b/test/drawing/tc_pie_series.rb
index a0d63cfc..88930213 100644
--- a/test/drawing/tc_pie_series.rb
+++ b/test/drawing/tc_pie_series.rb
@@ -5,9 +5,9 @@ require 'tc_helper'
 class TestPieSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
-    @ws = p.workbook.add_worksheet :name => "hmmm"
-    chart = @ws.add_chart Axlsx::Pie3DChart, :title => "fishery"
-    @series = chart.add_series :data => [0, 1, 2], :labels => ["zero", "one", "two"], :title => "bob", :colors => ["FF0000", "00FF00", "0000FF"]
+    @ws = p.workbook.add_worksheet name: "hmmm"
+    chart = @ws.add_chart Axlsx::Pie3DChart, title: "fishery"
+    @series = chart.add_series data: [0, 1, 2], labels: ["zero", "one", "two"], title: "bob", colors: ["FF0000", "00FF00", "0000FF"]
   end
 
   def test_initialize
diff --git a/test/drawing/tc_scatter_chart.rb b/test/drawing/tc_scatter_chart.rb
index 92bc8486..9a7a3073 100644
--- a/test/drawing/tc_scatter_chart.rb
+++ b/test/drawing/tc_scatter_chart.rb
@@ -11,11 +11,11 @@ class TestScatterChart < Test::Unit::TestCase
       sheet.add_row ["",       1, 25, 49, 81]
       sheet.add_row ["Second", 5, 2, 14, 9]
       sheet.add_row ["",       5, 10, 15, 20]
-      sheet.add_chart(Axlsx::ScatterChart, :title => "example 7: Scatter Chart") do |chart|
+      sheet.add_chart(Axlsx::ScatterChart, title: "example 7: Scatter Chart") do |chart|
         chart.start_at 0, 4
         chart.end_at 10, 19
-        chart.add_series :xData => sheet["B1:E1"], :yData => sheet["B2:E2"], :title => sheet["A1"]
-        chart.add_series :xData => sheet["B3:E3"], :yData => sheet["B4:E4"], :title => sheet["A3"]
+        chart.add_series xData: sheet["B1:E1"], yData: sheet["B2:E2"], title: sheet["A1"]
+        chart.add_series xData: sheet["B3:E3"], yData: sheet["B4:E4"], title: sheet["A3"]
         @chart = chart
       end
     end
diff --git a/test/drawing/tc_scatter_series.rb b/test/drawing/tc_scatter_series.rb
index a550271b..26ed01ea 100644
--- a/test/drawing/tc_scatter_series.rb
+++ b/test/drawing/tc_scatter_series.rb
@@ -5,9 +5,9 @@ require 'tc_helper'
 class TestScatterSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
-    @ws = p.workbook.add_worksheet :name => "hmmm"
-    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "Scatter Chart"
-    @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "exponents", :color => 'FF0000', :smooth => true
+    @ws = p.workbook.add_worksheet name: "hmmm"
+    @chart = @ws.add_chart Axlsx::ScatterChart, title: "Scatter Chart"
+    @series = @chart.add_series xData: [1, 2, 4], yData: [1, 3, 9], title: "exponents", color: 'FF0000', smooth: true
   end
 
   def test_initialize
@@ -15,36 +15,36 @@ class TestScatterSeries < Test::Unit::TestCase
   end
 
   def test_smoothed_chart_default_smoothing
-    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "Smooth Chart", :scatter_style => :smoothMarker
-    @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "smoothed exponents"
+    @chart = @ws.add_chart Axlsx::ScatterChart, title: "Smooth Chart", scatter_style: :smoothMarker
+    @series = @chart.add_series xData: [1, 2, 4], yData: [1, 3, 9], title: "smoothed exponents"
 
     assert(@series.smooth, "series is smooth by default on smooth charts")
   end
 
   def test_unsmoothed_chart_default_smoothing
-    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "Unsmooth Chart", :scatter_style => :line
-    @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "unsmoothed exponents"
+    @chart = @ws.add_chart Axlsx::ScatterChart, title: "Unsmooth Chart", scatter_style: :line
+    @series = @chart.add_series xData: [1, 2, 4], yData: [1, 3, 9], title: "unsmoothed exponents"
 
     refute(@series.smooth, "series is not smooth by default on non-smooth charts")
   end
 
   def test_explicit_smoothing
-    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "Unsmooth Chart, Smooth Series", :scatter_style => :line
-    @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "smoothed exponents", :smooth => true
+    @chart = @ws.add_chart Axlsx::ScatterChart, title: "Unsmooth Chart, Smooth Series", scatter_style: :line
+    @series = @chart.add_series xData: [1, 2, 4], yData: [1, 3, 9], title: "smoothed exponents", smooth: true
 
     assert(@series.smooth, "series is smooth when overriding chart default")
   end
 
   def test_explicit_unsmoothing
-    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "Smooth Chart, Unsmooth Series", :scatter_style => :smoothMarker
-    @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "unsmoothed exponents", :smooth => false
+    @chart = @ws.add_chart Axlsx::ScatterChart, title: "Smooth Chart, Unsmooth Series", scatter_style: :smoothMarker
+    @series = @chart.add_series xData: [1, 2, 4], yData: [1, 3, 9], title: "unsmoothed exponents", smooth: false
 
     refute(@series.smooth, "series is not smooth when overriding chart default")
   end
 
   def test_ln_width
-    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "ln width", :scatter_style => :line
-    @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "ln_width"
+    @chart = @ws.add_chart Axlsx::ScatterChart, title: "ln width", scatter_style: :line
+    @series = @chart.add_series xData: [1, 2, 4], yData: [1, 3, 9], title: "ln_width"
     @series.ln_width = 12_700
 
     assert_equal(12_700, @series.ln_width, 'line width assigment is allowed')
@@ -61,22 +61,22 @@ class TestScatterSeries < Test::Unit::TestCase
   end
 
   def test_false_show_marker
-    @chart = @ws.add_chart Axlsx::ScatterChart, :title => 'Smooth Chart', :scatter_style => :smoothMarker
-    @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9]
+    @chart = @ws.add_chart Axlsx::ScatterChart, title: 'Smooth Chart', scatter_style: :smoothMarker
+    @series = @chart.add_series xData: [1, 2, 4], yData: [1, 3, 9]
 
     assert(@series.show_marker, 'markers are enabled for marker-related styles')
   end
 
   def test_true_show_marker
-    @chart = @ws.add_chart Axlsx::ScatterChart, :title => 'Line chart', :scatter_style => :line
-    @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9]
+    @chart = @ws.add_chart Axlsx::ScatterChart, title: 'Line chart', scatter_style: :line
+    @series = @chart.add_series xData: [1, 2, 4], yData: [1, 3, 9]
 
     refute(@series.show_marker, 'markers are disabled for markerless scatter styles')
   end
 
   def test_marker_symbol
-    @chart = @ws.add_chart Axlsx::ScatterChart, :title => 'Line chart', :scatter_style => :line
-    @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :marker_symbol => :diamond
+    @chart = @ws.add_chart Axlsx::ScatterChart, title: 'Line chart', scatter_style: :line
+    @series = @chart.add_series xData: [1, 2, 4], yData: [1, 3, 9], marker_symbol: :diamond
 
     assert_equal(:diamond, @series.marker_symbol, 'series could have own custom marker symbol')
   end
diff --git a/test/drawing/tc_ser_axis.rb b/test/drawing/tc_ser_axis.rb
index 6d26b182..fa67024c 100644
--- a/test/drawing/tc_ser_axis.rb
+++ b/test/drawing/tc_ser_axis.rb
@@ -10,7 +10,7 @@ class TestSerAxis < Test::Unit::TestCase
   def teardown; end
 
   def test_options
-    a = Axlsx::SerAxis.new(:tick_lbl_skip => 9, :tick_mark_skip => 7)
+    a = Axlsx::SerAxis.new(tick_lbl_skip: 9, tick_mark_skip: 7)
 
     assert_equal(9, a.tick_lbl_skip)
     assert_equal(7, a.tick_mark_skip)
diff --git a/test/drawing/tc_series.rb b/test/drawing/tc_series.rb
index 2215d398..756beaee 100644
--- a/test/drawing/tc_series.rb
+++ b/test/drawing/tc_series.rb
@@ -5,9 +5,9 @@ require 'tc_helper'
 class TestSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
-    @ws = p.workbook.add_worksheet :name => "hmmm"
-    chart = @ws.add_chart Axlsx::Chart, :title => "fishery"
-    @series = chart.add_series :title => "bob"
+    @ws = p.workbook.add_worksheet name: "hmmm"
+    chart = @ws.add_chart Axlsx::Chart, title: "fishery"
+    @series = chart.add_series title: "bob"
   end
 
   def test_initialize
diff --git a/test/drawing/tc_str_data.rb b/test/drawing/tc_str_data.rb
index f80bf24b..cc15d0fd 100644
--- a/test/drawing/tc_str_data.rb
+++ b/test/drawing/tc_str_data.rb
@@ -4,7 +4,7 @@ require 'tc_helper'
 
 class TestStrData < Test::Unit::TestCase
   def setup
-    @str_data = Axlsx::StrData.new :data => ["1", "2", "3"]
+    @str_data = Axlsx::StrData.new data: ["1", "2", "3"]
   end
 
   def test_to_xml_string_strLit
diff --git a/test/drawing/tc_str_val.rb b/test/drawing/tc_str_val.rb
index c094c450..783d4122 100644
--- a/test/drawing/tc_str_val.rb
+++ b/test/drawing/tc_str_val.rb
@@ -4,8 +4,8 @@ require 'tc_helper'
 
 class TestStrVal < Test::Unit::TestCase
   def setup
-    @str_val = Axlsx::StrVal.new :v => "1"
-    @str_val_with_special_characters = Axlsx::StrVal.new :v => "a & b <c>"
+    @str_val = Axlsx::StrVal.new v: "1"
+    @str_val_with_special_characters = Axlsx::StrVal.new v: "a & b <c>"
   end
 
   def test_initialize
diff --git a/test/drawing/tc_two_cell_anchor.rb b/test/drawing/tc_two_cell_anchor.rb
index bfdaf4de..f20aebfb 100644
--- a/test/drawing/tc_two_cell_anchor.rb
+++ b/test/drawing/tc_two_cell_anchor.rb
@@ -23,11 +23,11 @@ class TestTwoCellAnchor < Test::Unit::TestCase
   end
 
   def test_options
-    assert_raise(ArgumentError, 'invalid start_at') { @ws.add_chart Axlsx::Chart, :start_at => "1" }
-    assert_raise(ArgumentError, 'invalid end_at') { @ws.add_chart Axlsx::Chart, :start_at => [1, 2], :end_at => ["a", 4] }
+    assert_raise(ArgumentError, 'invalid start_at') { @ws.add_chart Axlsx::Chart, start_at: "1" }
+    assert_raise(ArgumentError, 'invalid end_at') { @ws.add_chart Axlsx::Chart, start_at: [1, 2], end_at: ["a", 4] }
     # this is actually raised in the graphic frame
     assert_raise(ArgumentError, 'invalid Chart') { @ws.add_chart Axlsx::TwoCellAnchor }
-    a = @ws.add_chart Axlsx::Chart, :start_at => [15, 35], :end_at => [90, 45]
+    a = @ws.add_chart Axlsx::Chart, start_at: [15, 35], end_at: [90, 45]
 
     assert_equal(15, a.graphic_frame.anchor.from.col)
     assert_equal(35, a.graphic_frame.anchor.from.row)
diff --git a/test/drawing/tc_val_axis.rb b/test/drawing/tc_val_axis.rb
index bb464048..e9c1dbaf 100644
--- a/test/drawing/tc_val_axis.rb
+++ b/test/drawing/tc_val_axis.rb
@@ -14,7 +14,7 @@ class TestValAxis < Test::Unit::TestCase
   end
 
   def test_options
-    a = Axlsx::ValAxis.new(:cross_between => :midCat)
+    a = Axlsx::ValAxis.new(cross_between: :midCat)
 
     assert_equal(:midCat, a.cross_between)
   end
diff --git a/test/drawing/tc_view_3D.rb b/test/drawing/tc_view_3D.rb
index e09edc13..f411127a 100644
--- a/test/drawing/tc_view_3D.rb
+++ b/test/drawing/tc_view_3D.rb
@@ -10,7 +10,7 @@ class TestView3D < Test::Unit::TestCase
   def teardown; end
 
   def test_options
-    v = Axlsx::View3D.new :rot_x => 10, :rot_y => 5, :h_percent => "30%", :depth_percent => "45%", :r_ang_ax => false, :perspective => 10
+    v = Axlsx::View3D.new rot_x: 10, rot_y: 5, h_percent: "30%", depth_percent: "45%", r_ang_ax: false, perspective: 10
 
     assert_equal(10, v.rot_x)
     assert_equal(5, v.rot_y)
diff --git a/test/drawing/tc_vml_drawing.rb b/test/drawing/tc_vml_drawing.rb
index 815cc556..fa939f56 100644
--- a/test/drawing/tc_vml_drawing.rb
+++ b/test/drawing/tc_vml_drawing.rb
@@ -7,8 +7,8 @@ class TestVmlDrawing < Test::Unit::TestCase
     p = Axlsx::Package.new
     wb = p.workbook
     @ws = wb.add_worksheet
-    @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank'
-    @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO'
+    @ws.add_comment ref: 'A1', text: 'penut machine', author: 'crank'
+    @ws.add_comment ref: 'C3', text: 'rust bucket', author: 'PO'
     @vml_drawing = @ws.comments.vml_drawing
   end
 
diff --git a/test/drawing/tc_vml_shape.rb b/test/drawing/tc_vml_shape.rb
index 8e415cc1..cf8fe541 100644
--- a/test/drawing/tc_vml_shape.rb
+++ b/test/drawing/tc_vml_shape.rb
@@ -7,8 +7,8 @@ class TestVmlShape < Test::Unit::TestCase
     p = Axlsx::Package.new
     wb = p.workbook
     @ws = wb.add_worksheet
-    @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank', :visible => true
-    @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO', :visible => false
+    @ws.add_comment ref: 'A1', text: 'penut machine', author: 'crank', visible: true
+    @ws.add_comment ref: 'C3', text: 'rust bucket', author: 'PO', visible: false
     @comments = @ws.comments
   end