From 56fae454a3a4f01c2401321579726d7331407f0d Mon Sep 17 00:00:00 2001 From: Weston Ganger Date: Fri, 21 Oct 2022 10:53:57 -0700 Subject: Fix bug in BorderCreator when second arg is nil --- lib/axlsx/workbook/worksheet/border_creator.rb | 4 ++-- test/workbook/worksheet/tc_border_creator.rb | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/axlsx/workbook/worksheet/border_creator.rb b/lib/axlsx/workbook/worksheet/border_creator.rb index a4146ee1..a1b063e7 100644 --- a/lib/axlsx/workbook/worksheet/border_creator.rb +++ b/lib/axlsx/workbook/worksheet/border_creator.rb @@ -4,7 +4,7 @@ module Axlsx class BorderCreator attr_reader :worksheet, :cells, :edges, :width, :color - def initialize(worksheet, cells, args) + def initialize(worksheet, cells, args=nil) @worksheet = worksheet @cells = cells if args.is_a?(Hash) @@ -12,7 +12,7 @@ module Axlsx @width = args[:style] || :thin @color = args[:color] || '000000' else - @edges = args || Axlsx::Border::Edges + @edges = args || Axlsx::Border::EDGES @width = :thin @color = '000000' end diff --git a/test/workbook/worksheet/tc_border_creator.rb b/test/workbook/worksheet/tc_border_creator.rb index 86b47fc1..c84b1f46 100644 --- a/test/workbook/worksheet/tc_border_creator.rb +++ b/test/workbook/worksheet/tc_border_creator.rb @@ -36,6 +36,16 @@ class TestBorderCreator < Test::Unit::TestCase assert_equal bc.instance_variable_get(:@edges), [:top] assert_equal bc.instance_variable_get(:@width), :thick assert_equal bc.instance_variable_get(:@color), "ffffff" + + bc = Axlsx::BorderCreator.new(@ws, @ws["A1:B2"], nil) + assert_equal bc.instance_variable_get(:@edges), Axlsx::Border::EDGES + assert_equal bc.instance_variable_get(:@width), :thin + assert_equal bc.instance_variable_get(:@color), "000000" + + bc = Axlsx::BorderCreator.new(@ws, @ws["A1:B2"]) + assert_equal bc.instance_variable_get(:@edges), Axlsx::Border::EDGES + assert_equal bc.instance_variable_get(:@width), :thin + assert_equal bc.instance_variable_get(:@color), "000000" end def test_draw -- cgit v1.2.3