holidays 4.2.0 → 8.4.1

data/test/holidays/definition/generator/test_regions.rb

@@ -0,0 +1,97 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../test_helper'
+
+require 'holidays/definition/generator/regions'
+
+class GeneratorRegionsTests < Test::Unit::TestCase
+  def setup
+    @generator = Holidays::Definition::Generator::Regions.new
+  end
+
+  def test_generates_regions_single_region_multiple_subregions
+    regions = {:region1 => [:test, :test2]}
+    expected = <<-EOE
+# encoding: utf-8
+module Holidays
+  REGIONS = [:test, :test2]
+
+  PARENT_REGION_LOOKUP = {:test=>:region1, :test2=>:region1}
+end
+EOE
+
+    assert_equal expected, @generator.call(regions)
+  end
+
+  def test_generates_regions_multiple_regions_single_unique_subregions
+    regions = {:region1 => [:test], :region2 => [:test2]}
+    expected = <<-EOE
+# encoding: utf-8
+module Holidays
+  REGIONS = [:test, :test2]
+
+  PARENT_REGION_LOOKUP = {:test=>:region1, :test2=>:region2}
+end
+EOE
+
+    assert_equal expected, @generator.call(regions)
+  end
+
+  def test_generates_regions_multiple_regions_multiple_overlapping_subregions
+    regions = {:region1 => [:test], :region2 => [:test, :test2], :region3 => [:test3, :test]}
+    expected = <<-EOE
+# encoding: utf-8
+module Holidays
+  REGIONS = [:test, :test2, :test3]
+
+  PARENT_REGION_LOOKUP = {:test=>:region1, :test2=>:region2, :test3=>:region3}
+end
+EOE
+
+    assert_equal expected, @generator.call(regions)
+  end
+
+  def test_generates_regions_multiple_regions_multiple_overlapping_subregions_complex
+    regions = {
+      :region1 => [:test],
+      :region2 => [:test, :test2],
+      :region3 => [:test3, :test],
+      :region4 => [:test4, :test2],
+      :region5 => [:test4, :test5, :test3],
+      :region6 => [:test4, :test6, :test],
+    }
+
+    expected = <<-EOE
+# encoding: utf-8
+module Holidays
+  REGIONS = [:test, :test2, :test3, :test4, :test5, :test6]
+
+  PARENT_REGION_LOOKUP = {:test=>:region1, :test2=>:region2, :test3=>:region3, :test4=>:region4, :test5=>:region5, :test6=>:region6}
+end
+EOE
+
+    assert_equal expected, @generator.call(regions)
+  end
+
+  def test_returns_error_if_regions_is_empty
+    regions = {}
+
+    assert_raises ArgumentError do
+      @generator.call(regions)
+    end
+  end
+
+  def test_returns_error_if_regions_is_not_a_hash
+    regions = "invalid"
+
+    assert_raises ArgumentError do
+      @generator.call(regions)
+    end
+  end
+
+  def test_returns_error_if_regions_is_nil
+    regions = nil
+
+    assert_raises ArgumentError do
+      @generator.call(regions)
+    end
+  end
+end

data/test/holidays/definition/generator/test_test.rb

@@ -0,0 +1,113 @@
+# Heh at this file name
+require File.expand_path(File.dirname(__FILE__)) + '/../../../test_helper'
+
+require 'holidays/definition/generator/test'
+require 'holidays/definition/entity/test'
+
+class TestGeneratorTests < Test::Unit::TestCase
+  def setup
+    @module_name = "Test"
+    @files = ["file1.rb"]
+    @tests = [
+      Holidays::Definition::Entity::Test.new(
+        :dates => [DateTime.parse("2016-01-01")],
+        :regions => [:test],
+        :name => "Test Holiday",
+      ),
+    ]
+
+    @decorator = mock()
+
+    @generator = Holidays::Definition::Generator::Test.new(@decorator)
+  end
+
+  def test_generate_tests_raises_error_if_module_name_is_invalid
+    assert_raises ArgumentError do
+      @generator.call(nil, @files, @tests)
+    end
+
+    assert_raises ArgumentError do
+      @generator.call("", @files, @tests)
+    end
+  end
+
+  def test_generate_tests_raises_error_if_files_is_invalid
+    assert_raises ArgumentError do
+      @generator.call(@module_name, nil, @tests)
+    end
+
+    assert_raises ArgumentError do
+      @generator.call(@module_name, "", @tests)
+    end
+  end
+
+  def test_generate_tests_raises_error_if_tests_are_missing
+    assert_raises ArgumentError do
+      @generator.call(@module_name, @files, nil)
+    end
+  end
+
+  def test_generate_source_from_single_test
+    @decorator.expects(:call).with(@tests.first).returns("test")
+
+    expected = <<-EOT
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+# This file is generated by the Ruby Holiday gem.
+#
+# Definitions loaded: #{@files.join(', ')}
+class #{@module_name.to_s.capitalize}DefinitionTests < Test::Unit::TestCase  # :nodoc:
+
+  def test_#{@module_name.to_s.downcase}
+    test
+  end
+end
+EOT
+
+    assert_equal(expected, @generator.call(@module_name, @files, @tests))
+  end
+
+  def test_generate_source_from_multiple_tests
+    @tests = [
+      Holidays::Definition::Entity::Test.new(
+        :dates => [DateTime.parse("2016-01-01")],
+        :regions => [:test],
+        :name => "Test Holiday",
+      ),
+      Holidays::Definition::Entity::Test.new(
+        :dates => [DateTime.parse("2016-02-01")],
+        :regions => [:test2],
+        :name => "Test Holiday2",
+      ),
+      Holidays::Definition::Entity::Test.new(
+        :dates => [DateTime.parse("2016-03-01")],
+        :regions => [:test3],
+        :name => "Test Holiday3",
+      ),
+    ]
+
+    @decorator.expects(:call).with(@tests[0]).returns("test")
+    @decorator.expects(:call).with(@tests[1]).returns("test2")
+    @decorator.expects(:call).with(@tests[2]).returns("test3")
+
+    expected = <<-EOT
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+# This file is generated by the Ruby Holiday gem.
+#
+# Definitions loaded: #{@files.join(', ')}
+class #{@module_name.to_s.capitalize}DefinitionTests < Test::Unit::TestCase  # :nodoc:
+
+  def test_#{@module_name.to_s.downcase}
+    test
+    test2
+    test3
+  end
+end
+EOT
+
+    assert_equal(expected, @generator.call(@module_name, @files, @tests))
+  end
+end

data/test/holidays/definition/parser/test_custom_method.rb

@@ -11,7 +11,7 @@ class ParserCustomMethodTests < Test::Unit::TestCase
   end
 
   def test_parse_happy_single_method
-    input = {"custom_method"=>{"arguments"=>"year", "source"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}}
+    input = {"custom_method"=>{"arguments"=>"year", "ruby"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}}
     @validator.expects(:valid?).with({:name => "custom_method", :arguments => "year", :source => "d = Date.civil(year, 1, 1)\nd + 2\n"}).returns(true)
 
     result = @parser.call(input)
@@ -28,7 +28,7 @@ class ParserCustomMethodTests < Test::Unit::TestCase
   end
 
   def test_call_happy_with_multiple_methods
-    input = {"custom_method"=>{"arguments"=>"year", "source"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}, "second_method"=>{"arguments"=>"month","source"=>"source"}}
+    input = {"custom_method"=>{"arguments"=>"year", "ruby"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}, "second_method"=>{"arguments"=>"month","ruby"=>"source"}}
     @validator.expects(:valid?).with({:name => "custom_method", :arguments => "year", :source => "d = Date.civil(year, 1, 1)\nd + 2\n"}).returns(true)
     @validator.expects(:valid?).with({:name => "second_method", :arguments => "month", :source => "source"}).returns(true)
 
@@ -59,21 +59,21 @@ class ParserCustomMethodTests < Test::Unit::TestCase
   end
 
   def test_call_raises_error_if_validator_returns_false_for_single_method
-    input = {"custom_method"=>{"arguments"=>"year", "source"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}}
+    input = {"custom_method"=>{"arguments"=>"year", "ruby"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}}
     @validator.expects(:valid?).with({:name => "custom_method", :arguments => "year", :source => "d = Date.civil(year, 1, 1)\nd + 2\n"}).returns(false)
 
     assert_raises ArgumentError do
-      result = @parser.call(input)
+      @parser.call(input)
     end
   end
 
   def test_call_raises_error_if_validator_returns_false_for_one_of_multiple_methods
-    input = {"custom_method"=>{"arguments"=>"year", "source"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}, "second_method"=>{"arguments"=>"month","source"=>"source"}}
+    input = {"custom_method"=>{"arguments"=>"year", "ruby"=>"d = Date.civil(year, 1, 1)\nd + 2\n"}, "second_method"=>{"arguments"=>"month","ruby"=>"source"}}
     @validator.expects(:valid?).with({:name => "custom_method", :arguments => "year", :source => "d = Date.civil(year, 1, 1)\nd + 2\n"}).returns(true)
     @validator.expects(:valid?).with({:name => "second_method", :arguments => "month", :source => "source"}).returns(false)
 
     assert_raises ArgumentError do
-      result = @parser.call(input)
+      @parser.call(input)
     end
   end
 end

data/test/holidays/definition/parser/test_test.rb

@@ -0,0 +1,142 @@
+# Heh at this file name
+require File.expand_path(File.dirname(__FILE__)) + '/../../../test_helper'
+
+require 'holidays/definition/parser/test'
+require 'holidays/definition/entity/test'
+
+class ParserTestTests < Test::Unit::TestCase
+  def setup
+    @validator = mock()
+
+    @parser = Holidays::Definition::Parser::Test.new(@validator)
+  end
+
+  def test_parse_no_tests
+    input = nil
+    result = @parser.call(input)
+
+    assert_equal(0, result.size)
+  end
+
+  def test_parse_single_test_happy
+    input = [ { "given" => { "date" => "2016-01-01", "regions" => ['us'] }, "expect" => { "name" => "Test Holiday" } } ]
+    @validator.expects(:valid?).with({:dates => ["2016-01-01"], :regions=> ['us'], :options => nil, :name => "Test Holiday", :holiday => nil}).returns(true)
+
+    result = @parser.call(input)
+
+    assert_equal(1, result.size)
+
+    test = result.first
+    assert(test)
+
+    assert(test.is_a?(Holidays::Definition::Entity::Test))
+    assert_equal([DateTime.parse('2016-01-01')], test.dates)
+    assert_equal([:us], test.regions)
+    assert_equal("Test Holiday", test.name)
+    assert(test.holiday?)
+  end
+
+  def test_parse_single_test_with_options
+    input = [ { "given" => { "date" => "2016-01-01", "regions" => ['us'], "options" => ['option1']}, "expect" => { "name" => "Test Holiday" } } ]
+    @validator.expects(:valid?).with({:dates => ["2016-01-01"], :regions=> ['us'], :name => "Test Holiday", :options => ['option1'], :holiday => nil}).returns(true)
+
+    result = @parser.call(input)
+
+    assert_equal(1, result.size)
+
+    test = result.first
+    assert(test)
+
+    assert(test.is_a?(Holidays::Definition::Entity::Test))
+    assert_equal([DateTime.parse('2016-01-01')], test.dates)
+    assert_equal([:us], test.regions)
+    assert_equal([:option1], test.options)
+    assert_equal("Test Holiday", test.name)
+    assert(test.holiday?)
+  end
+
+  def test_parse_single_test_with_single_option_as_string
+    input = [ { "given" => { "date" => "2016-01-01", "regions" => ['us'], "options" => 'option1'}, "expect" => { "name" => "Test Holiday" } } ]
+    @validator.expects(:valid?).with({:dates => ["2016-01-01"], :regions=> ['us'], :name => "Test Holiday", :options => 'option1', :holiday => nil}).returns(true)
+
+    result = @parser.call(input)
+
+    assert_equal(1, result.size)
+
+    test = result.first
+    assert(test)
+
+    assert(test.is_a?(Holidays::Definition::Entity::Test))
+    assert_equal([DateTime.parse('2016-01-01')], test.dates)
+    assert_equal([:us], test.regions)
+    assert_equal([:option1], test.options)
+    assert_equal("Test Holiday", test.name)
+    assert(test.holiday?)
+  end
+
+  def test_parse_single_test_no_name_no_holiday
+    input = [ { "given" => { "date" => "2016-01-01", "regions" => ['us']}, "expect" => { "holiday" => false } } ]
+    @validator.expects(:valid?).with({:dates => ["2016-01-01"], :regions=> ['us'], :name => nil, :options => nil, :holiday => false}).returns(true)
+
+    result = @parser.call(input)
+
+    assert_equal(1, result.size)
+
+    test = result.first
+    assert(test)
+
+    assert(test.is_a?(Holidays::Definition::Entity::Test))
+    assert_equal([DateTime.parse('2016-01-01')], test.dates)
+    assert_equal([:us], test.regions)
+    assert_nil(test.options)
+    assert_nil(test.name)
+    assert_equal(false, test.holiday?)
+  end
+
+  def test_parse_single_test_with_options_no_name_no_holiday
+    input = [ { "given" => { "date" => "2016-01-01", "regions" => ['us'], "options" => ['option1']}, "expect" => { "holiday" => false } } ]
+    @validator.expects(:valid?).with({:dates => ["2016-01-01"], :regions=> ['us'], :name => nil, :options => ['option1'], :holiday => false}).returns(true)
+
+    result = @parser.call(input)
+
+    assert_equal(1, result.size)
+
+    test = result.first
+    assert(test)
+
+    assert(test.is_a?(Holidays::Definition::Entity::Test))
+    assert_equal([DateTime.parse('2016-01-01')], test.dates)
+    assert_equal([:us], test.regions)
+    assert_equal([:option1], test.options)
+    assert_nil(test.name)
+    assert_equal(false, test.holiday?)
+  end
+
+  def test_parse_single_test_multiple_dates
+    input = [ { "given" => { "date" => ["2016-01-01", "2017-01-01"], "regions" => ['us']}, "expect" => { "name" => "Test Holiday"} } ]
+    @validator.expects(:valid?).with({:dates => ["2016-01-01", "2017-01-01"], :regions=> ['us'], :name => "Test Holiday", :options => nil, :holiday => nil}).returns(true)
+
+    result = @parser.call(input)
+
+    assert_equal(1, result.size)
+
+    test = result.first
+    assert(test)
+
+    assert(test.is_a?(Holidays::Definition::Entity::Test))
+    assert_equal([DateTime.parse('2016-01-01'), DateTime.parse('2017-01-01')], test.dates)
+    assert_equal([:us], test.regions)
+    assert_nil(test.options)
+    assert_equal("Test Holiday", test.name)
+    assert(test.holiday?)
+  end
+
+  def test_parse_single_test_fail_validation
+    input = [ { "given" => { "date" => "2016-01-01", "regions" => ['us']}, "expect" => { "name" => "Test Holiday"} } ]
+    @validator.expects(:valid?).with({:dates => ["2016-01-01"], :regions=> ['us'], :name => "Test Holiday", :options => nil, :holiday => nil}).returns(false)
+
+    assert_raises ArgumentError do
+      @parser.call(input)
+    end
+  end
+end

data/test/holidays/definition/repository/test_cache.rb

@@ -7,30 +7,71 @@ class CacheRepoTests < Test::Unit::TestCase
     @subject = Holidays::Definition::Repository::Cache.new
   end
 
+  def test_find_supports_overlapping_holidays
+    start_date = Date.civil(2015, 1, 1)
+    end_date = Date.civil(2015, 7, 1)
+    cache_data = [
+      {:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day A", :regions=>[:us]},
+      {:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day B", :regions=>[:us]}
+    ]
+    options = :us
+
+    @subject.cache_between(start_date, end_date, cache_data, options)
+
+    assert_equal(cache_data, @subject.find(start_date, start_date, options))
+    assert_equal(cache_data, @subject.find(start_date, end_date, options))
+  end
+
+  def test_cache_returns_empty_array_no_holidays_are_found
+    start_date = Date.civil(2015, 1, 1)
+    end_date = Date.civil(2015, 7, 1)
+    cache_data = [{:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day", :regions=>[:us]}]
+    options = :us
+
+    @subject.cache_between(start_date, end_date, cache_data, options)
+
+    assert_empty(@subject.find(Date.civil(2015, 1, 2), Date.civil(2015, 1, 2), options))
+    assert_empty(@subject.find(Date.civil(2015, 1, 2), Date.civil(2015, 1, 3), options))
+  end
+
+  def test_cache_returns_empty_array_when_cache_is_empty
+    start_date = Date.civil(2015, 1, 1)
+    end_date = Date.civil(2015, 7, 1)
+    cache_data = []
+    options = :us
+
+    @subject.cache_between(start_date, end_date, cache_data, options)
+
+    assert_empty(@subject.find(Date.civil(2015, 1, 2), Date.civil(2015, 1, 2), options))
+    assert_empty(@subject.find(Date.civil(2015, 1, 2), Date.civil(2015, 1, 3), options))
+  end
+
   def test_find_returns_correct_cache_data
     start_date = Date.civil(2015, 1, 1)
-    end_date = Date.civil(2015, 1, 1)
-    cache_data =  [{:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day", :regions=>[:us]}]
+    end_date = Date.civil(2015, 7, 1)
+    cache_data = [{:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day", :regions=>[:us]}]
     options = :us
     @subject.cache_between(start_date, end_date, cache_data, options)
 
+    assert_equal(cache_data, @subject.find(start_date, start_date, options))
     assert_equal(cache_data, @subject.find(start_date, end_date, options))
   end
 
   def test_find_returns_nil_if_no_match_is_found
     start_date = Date.civil(2015, 1, 1)
     end_date = Date.civil(2015, 1, 1)
-    cache_data =  [{:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day", :regions=>[:us]}]
+    cache_data = [{:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day", :regions=>[:us]}]
     options = :us
     @subject.cache_between(start_date, end_date, cache_data, options)
 
     assert_nil(@subject.find(Date.civil(2015, 7, 1), Date.civil(2015, 12, 1), options))
+    assert_nil(@subject.find(Date.civil(2015, 7, 1), Date.civil(2015, 12, 1), options))
   end
 
   def test_cache_between_returns_error_if_dates_are_missing
     start_date = Date.civil(2015, 1, 1)
     end_date = Date.civil(2015, 1, 1)
-    cache_data =  [{:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day", :regions=>[:us]}]
+    cache_data = [{:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day", :regions=>[:us]}]
     options = :us
 
     assert_raise ArgumentError do
@@ -45,7 +86,7 @@ class CacheRepoTests < Test::Unit::TestCase
   def test_cache_between_returns_error_if_dates_are_invalid
     start_date = Date.civil(2015, 1, 1)
     end_date = Date.civil(2015, 1, 1)
-    cache_data =  [{:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day", :regions=>[:us]}]
+    cache_data = [{:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day", :regions=>[:us]}]
     options = :us
 
     assert_raise ArgumentError do
@@ -70,7 +111,7 @@ class CacheRepoTests < Test::Unit::TestCase
   def test_reset_clears_cache
     start_date = Date.civil(2015, 1, 1)
     end_date = Date.civil(2015, 1, 1)
-    cache_data =  [{:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day", :regions=>[:us]}]
+    cache_data = [{:date=>Date.civil(2015, 1, 1), :name=>"New Year's Day", :regions=>[:us]}]
     options = :us
     @subject.cache_between(start_date, end_date, cache_data, options)
 

data/test/holidays/definition/repository/test_holidays_by_month.rb

@@ -109,7 +109,7 @@ class HolidaysByMonthRepoTests < Test::Unit::TestCase
     assert_equal(expected, @subject.all)
   end
 
-  def test_add_is_successful_and_updates_regions_to_existing_matching_definitions
+  def test_add_is_successful_if_only_region_is_different_and_updates_regions_to_existing_matching_definitions
     target_holidays = {0 => [:mday => 1, :name => "Test", :regions => [:test2]]}
 
     @subject.add(@existing_holidays_by_month)
@@ -152,4 +152,124 @@ class HolidaysByMonthRepoTests < Test::Unit::TestCase
       @subject.find_by_month(-1)
     end
   end
+
+  def test_add_is_successful_if_only_function_is_different
+    initial_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test], :function=>"easter(year)", :function_arguments=>[:year]}]}
+
+    @subject.add(initial_holidays)
+
+    second_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test2], :function=>"orthodox_easter(year)", :function_arguments=>[:year]}]}
+    @subject.add(second_holidays)
+
+    expected = {
+      0 => [
+        {
+          :function=>"easter(year)",
+          :function_arguments=>[:year],
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test]
+        },
+        {
+          :function=>"orthodox_easter(year)",
+          :function_arguments=>[:year],
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test2]
+        }
+      ]
+    }
+
+    assert_equal(expected, @subject.all)
+  end
+
+  def test_add_is_successful_if_only_function_modifier_is_different
+    initial_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test], :function=>"easter(year)", :function_modifier=>1, :function_arguments=>[:year]}]}
+
+    @subject.add(initial_holidays)
+
+    second_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test2], :function=>"easter(year)", :function_modifier=>2, :function_arguments=>[:year]}]}
+    @subject.add(second_holidays)
+
+    expected = {
+      0 => [
+        {
+          :function=>"easter(year)",
+          :function_arguments=>[:year],
+          :function_modifier=>1,
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test]
+        },
+        {
+          :function=>"easter(year)",
+          :function_arguments=>[:year],
+          :function_modifier=>2,
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test2]
+        }
+      ]
+    }
+
+    assert_equal(expected, @subject.all)
+  end
+
+  def test_add_is_successful_if_only_observed_is_different
+    initial_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test], :observed=>"to_weekday_if_weekend(year)", :function_arguments=>[:year]}]}
+
+    @subject.add(initial_holidays)
+
+    second_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test2], :observed =>"to_friday_if_saturday(year)", :function_arguments=>[:year]}]}
+    @subject.add(second_holidays)
+
+    expected = {
+      0 => [
+        {
+          :observed =>"to_weekday_if_weekend(year)",
+          :function_arguments=>[:year],
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test]
+        },
+        {
+          :observed =>"to_friday_if_saturday(year)",
+          :function_arguments=>[:year],
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test2]
+        }
+      ]
+    }
+
+    assert_equal(expected, @subject.all)
+  end
+
+  def test_add_is_successful_if_only_year_ranges_is_different
+    initial_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test], :year_ranges => {:from => 1990}}]}
+
+    @subject.add(initial_holidays)
+
+    second_holidays = {0=> [{:mday => 1, :name=>"Test", :regions=>[:test2], :year_ranges => {:until => 2002}}]}
+    @subject.add(second_holidays)
+
+    expected = {
+      0 => [
+        {
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test],
+          :year_ranges => {:from => 1990}
+        },
+        {
+          :mday=>1,
+          :name=>"Test",
+          :regions=>[:test2],
+          :year_ranges => {:until => 2002}
+        }
+      ]
+    }
+
+    assert_equal(expected, @subject.all)
+  end
 end

data/test/holidays/definition/repository/test_proc_result_cache.rb

@@ -40,6 +40,13 @@ class ProcResultCacheRepoTests < Test::Unit::TestCase
     assert_equal(Date.civil(2015, 1, 31), @subject.lookup(function, function_argument))
   end
 
+  def test_lookup_accepts_symbol_as_function_argument
+    function = lambda { |symbol| symbol }
+    function_argument = :test
+
+    assert_equal(:test, @subject.lookup(function, function_argument))
+  end
+
   def test_accepts_multiple_arguments_for_functions
     function = lambda { |year, month, day| Date.civil(year, month, day) + 1 }
     year = 2016
@@ -76,7 +83,7 @@ class ProcResultCacheRepoTests < Test::Unit::TestCase
       @subject.lookup(function, function_argument)
     end
 
-    funtion_argument = Proc.new { |arg1| "arg1" + "something"}
+    function_argument = Proc.new { |arg1| "arg1" + "something"}
     assert_raise ArgumentError do
       @subject.lookup(function, function_argument)
     end