holidays 6.6.1 → 8.8.0

data/test/defs/{test_defs_united_nations.rb → test_defs_unitednations.rb}

@@ -3,9 +3,9 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: definitions/united_nations.yaml
-class United_nationsDefinitionTests < Test::Unit::TestCase  # :nodoc:
+# Definitions loaded: definitions/unitednations.yaml
+class UnitednationsDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
-  def test_united_nations
+  def test_unitednations
   end
 end

data/test/defs/test_defs_us.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 # This file is generated by the Ruby Holiday gem.
 #
-# Definitions loaded: definitions/us.yaml, definitions/north_america_informal.yaml
+# Definitions loaded: definitions/us.yaml, definitions/northamericainformal.yaml
 class UsDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_us
@@ -87,10 +87,6 @@ assert_equal "Presidents' Day", (Holidays.on(Date.civil(2018, 2, 19), [:us])[0]
 assert_nil (Holidays.on(Date.civil(2018, 3, 5), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2019, 3, 4), [:us])[0] || {})[:name]
 
-    assert_equal "Casimir Pulaski Day", (Holidays.on(Date.civil(2017, 3, 6), [:us_il])[0] || {})[:name]
-assert_equal "Casimir Pulaski Day", (Holidays.on(Date.civil(2018, 3, 5), [:us_il])[0] || {})[:name]
-assert_equal "Casimir Pulaski Day", (Holidays.on(Date.civil(2019, 3, 4), [:us_il])[0] || {})[:name]
-
     assert_nil (Holidays.on(Date.civil(2017, 3, 7), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2018, 3, 6), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2019, 3, 5), [:us])[0] || {})[:name]
@@ -127,7 +123,7 @@ assert_equal "Seward's Day", (Holidays.on(Date.civil(2019, 3, 25), [:us_ak])[0]
 assert_equal "Emancipation Day", (Holidays.on(Date.civil(2022, 4, 15), [:us_dc, :us_ca], [:observed])[0] || {})[:name]
 assert_equal "Emancipation Day", (Holidays.on(Date.civil(2028, 4, 17), [:us_dc, :us_ca], [:observed])[0] || {})[:name]
 
-    assert_equal "Emancipation Day", (Holidays.on(Date.civil(2017, 4, 16), [:us_dc, :us_ca])[0] || {})[:name]
+    assert_equal "Emancipation Day", (Holidays.on(Date.civil(2017, 4, 16), [:us_dc])[0] || {})[:name]
 
     assert_nil (Holidays.on(Date.civil(2017, 4, 17), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2018, 4, 16), [:us])[0] || {})[:name]
@@ -197,6 +193,10 @@ assert_equal "King Kamehameha I Day", (Holidays.on(Date.civil(2022, 6, 10), [:us
 
     assert_equal "King Kamehameha I Day", (Holidays.on(Date.civil(2017, 6, 11), [:us_hi])[0] || {})[:name]
 
+    assert_nil (Holidays.on(Date.civil(2021, 6, 19), [:us], [:observed])[0] || {})[:name]
+
+    assert_equal "Juneteenth National Independence Day", (Holidays.on(Date.civil(2021, 6, 18), [:us], [:observed])[0] || {})[:name]
+
     assert_equal "Emancipation Day in Texas", (Holidays.on(Date.civil(2017, 6, 19), [:us_tx])[0] || {})[:name]
 
     assert_nil (Holidays.on(Date.civil(2017, 6, 20), [:us])[0] || {})[:name]
@@ -303,9 +303,9 @@ assert_equal "Nevada Day", (Holidays.on(Date.civil(2019, 10, 25), [:us_nv])[0] |
 assert_nil (Holidays.on(Date.civil(2018, 11, 6), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2021, 11, 2), [:us])[0] || {})[:name]
 
-    assert_equal "Election Day", (Holidays.on(Date.civil(2017, 11, 7), [:us_de, :us_hi, :us_il, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
-assert_equal "Election Day", (Holidays.on(Date.civil(2018, 11, 6), [:us_de, :us_hi, :us_il, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
-assert_equal "Election Day", (Holidays.on(Date.civil(2021, 11, 2), [:us_de, :us_hi, :us_il, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
+    assert_equal "Election Day", (Holidays.on(Date.civil(2017, 11, 7), [:us_de, :us_hi, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
+assert_equal "Election Day", (Holidays.on(Date.civil(2018, 11, 6), [:us_de, :us_hi, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
+assert_equal "Election Day", (Holidays.on(Date.civil(2021, 11, 2), [:us_de, :us_hi, :us_in, :us_mt, :us_nj, :us_ny, :us_pa, :us_ri])[0] || {})[:name]
 
     assert_equal "Veterans Day", (Holidays.on(Date.civil(2017, 11, 10), [:us], [:observed])[0] || {})[:name]
 assert_equal "Veterans Day", (Holidays.on(Date.civil(2018, 11, 12), [:us], [:observed])[0] || {})[:name]
@@ -355,9 +355,9 @@ assert_equal "Christmas Eve (Holiday)", (Holidays.on(Date.civil(2028, 12, 22), [
 assert_nil (Holidays.on(Date.civil(2022, 12, 26), [:us])[0] || {})[:name]
 assert_nil (Holidays.on(Date.civil(2027, 12, 27), [:us])[0] || {})[:name]
 
-    assert_equal "Christmas Day", (Holidays.on(Date.civil(2021, 12, 27), [:us], [:observed])[0] || {})[:name]
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2021, 12, 24), [:us], [:observed])[0] || {})[:name]
 assert_equal "Christmas Day", (Holidays.on(Date.civil(2022, 12, 26), [:us], [:observed])[0] || {})[:name]
-assert_equal "Christmas Day", (Holidays.on(Date.civil(2027, 12, 27), [:us], [:observed])[0] || {})[:name]
+assert_equal "Christmas Day", (Holidays.on(Date.civil(2027, 12, 24), [:us], [:observed])[0] || {})[:name]
 
     assert_equal "Christmas Day", (Holidays.on(Date.civil(2017, 12, 25), [:us])[0] || {})[:name]
 

data/test/holidays/core_extensions/test_date.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../../test_helper'
 
+require 'date'
 require 'holidays/core_extensions/date'
 
 class Date
@@ -114,8 +115,8 @@ class CoreExtensionDateTests < Test::Unit::TestCase
 
   def test_datetime_holiday?
     # in situations with activesupport
-    assert DateTime.now.to_date.holiday?('test') if DateTime.now.respond_to?(:to_date)
-    assert DateTime.now.holiday?('test')
+    assert DateTime.civil(2008, 1, 1).to_date.holiday?('ca')
+    assert DateTime.civil(2008, 1, 1).holiday?('ca')
   end
 
 end

data/test/holidays/definition/context/test_generator.rb

@@ -17,12 +17,15 @@ class GeneratorTests < Test::Unit::TestCase
     @test_parser = mock()
     @test_source_generator = mock()
 
+    @module_source_generator = mock()
+
     @generator = Holidays::Definition::Context::Generator.new(
       @custom_method_parser,
       @custom_method_source_decorator,
       @custom_methods_repository,
       @test_parser,
       @test_source_generator,
+      @module_source_generator,
     )
   end
 
@@ -99,12 +102,13 @@ class GeneratorTests < Test::Unit::TestCase
 
     @test_parser.expects(:call).with([{'given' => {'date' => '2013-06-20', 'regions' => ['custom_single_file']}, 'expect' => {'name' => 'Company Founding'}}]).returns(['parsed tests'])
 
+    @module_source_generator.expects(:call).with("test", ["test/data/test_single_custom_holiday_defs.yaml"], [:custom_single_file], ["      6 => [{:mday => 20, :name => \"Company Founding\", :regions => [:custom_single_file]}]"], "").returns("module source")
     @test_source_generator.expects(:call).with('test', ['test/data/test_single_custom_holiday_defs.yaml'], ['parsed tests']).returns("test source")
 
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
     module_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)[0]
 
-    expected_module_src = "# encoding: utf-8\nmodule Holidays\n  # This file is generated by the Ruby Holidays gem.\n  #\n  # Definitions loaded: test/data/test_single_custom_holiday_defs.yaml\n  #\n  # All the definitions are available at https://github.com/holidays/holidays\n  module TEST # :nodoc:\n    def self.defined_regions\n      [:custom_single_file]\n    end\n\n    def self.holidays_by_month\n      {\n              6 => [{:mday => 20, :name => \"Company Founding\", :regions => [:custom_single_file]}]\n      }\n    end\n\n    def self.custom_methods\n      {\n        \n      }\n    end\n  end\nend\n"
+    expected_module_src = "module source"
 
     assert_equal expected_module_src, module_src
   end
@@ -115,6 +119,8 @@ class GeneratorTests < Test::Unit::TestCase
 
     @test_parser.expects(:call).with([{'given' => {'date' => '2013-06-20', 'regions' => ['custom_single_file']}, 'expect' => {'name' => 'Company Founding'}}]).returns(['parsed tests'])
 
+    @module_source_generator.expects(:call).returns("module_source")
+
     @test_source_generator.expects(:call).with('test', ['test/data/test_single_custom_holiday_defs.yaml'], ['parsed tests']).returns("test source")
 
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
@@ -137,31 +143,25 @@ class GeneratorTests < Test::Unit::TestCase
           :name => "after_year",
           :regions => [:custom_year_range_file],
           :mday => 1,
-          :year_ranges => [{"after" => 2016}]
+          :year_ranges => {:from => 2016}
         },
         {
           :name => "before_year",
           :regions => [:custom_year_range_file],
           :mday => 2,
-          :year_ranges => [{"before" => 2017}]
+          :year_ranges => {:until => 2017}
         },
         {
           :name => "between_year",
           :regions => [:custom_year_range_file],
           :mday => 3,
-          :year_ranges => [{"between" => 2016..2018}]
+          :year_ranges => {:between => 2016..2018 }
         },
         {
           :name => "limited_year",
           :regions => [:custom_year_range_file],
           :mday => 4,
-          :year_ranges => [{"limited" => [2016,2018,2019]}]
-        },
-        {
-          :name => "multiple_conditions",
-          :regions => [:custom_year_range_file],
-          :mday => 5,
-          :year_ranges => [{"before" => 2015}, {"after" => 2017}]
+          :year_ranges => {:limited => [2016,2018,2019]}
         }
       ]
     }
@@ -177,9 +177,11 @@ class GeneratorTests < Test::Unit::TestCase
 
     @test_source_generator.expects(:call).with('test', ['test/data/test_custom_year_range_holiday_defs.yaml'], ['parsed tests']).returns('test source')
 
+    @module_source_generator.expects(:call).with("test", ["test/data/test_custom_year_range_holiday_defs.yaml"], [:custom_year_range_file], ["      6 => [{:mday => 1, :year_ranges => { :from => 2016 },:name => \"after_year\", :regions => [:custom_year_range_file]},\n            {:mday => 2, :year_ranges => { :until => 2017 },:name => \"before_year\", :regions => [:custom_year_range_file]},\n            {:mday => 3, :year_ranges => { :between => 2016..2018 },:name => \"between_year\", :regions => [:custom_year_range_file]},\n            {:mday => 4, :year_ranges => { :limited => [2016, 2018, 2019] },:name => \"limited_year\", :regions => [:custom_year_range_file]}]"], "").returns('module_source')
+
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
     module_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)[0]
-    expected_module_src = "# encoding: utf-8\nmodule Holidays\n  # This file is generated by the Ruby Holidays gem.\n  #\n  # Definitions loaded: test/data/test_custom_year_range_holiday_defs.yaml\n  #\n  # All the definitions are available at https://github.com/holidays/holidays\n  module TEST # :nodoc:\n    def self.defined_regions\n      [:custom_year_range_file]\n    end\n\n    def self.holidays_by_month\n      {\n              6 => [{:mday => 1,  :year_ranges => [{:after => 2016}],:name => \"after_year\", :regions => [:custom_year_range_file]},\n            {:mday => 2,  :year_ranges => [{:before => 2017}],:name => \"before_year\", :regions => [:custom_year_range_file]},\n            {:mday => 3,  :year_ranges => [{:between => 2016..2018}],:name => \"between_year\", :regions => [:custom_year_range_file]},\n            {:mday => 4,  :year_ranges => [{:limited => [2016, 2018, 2019]}],:name => \"limited_year\", :regions => [:custom_year_range_file]},\n            {:mday => 5,  :year_ranges => [{:before => 2015},{:after => 2017}],:name => \"multiple_conditions\", :regions => [:custom_year_range_file]}]\n      }\n    end\n\n    def self.custom_methods\n      {\n        \n      }\n    end\n  end\nend\n"
+    expected_module_src = "module_source"
 
     assert_equal expected_module_src, module_src
   end
@@ -193,12 +195,13 @@ class GeneratorTests < Test::Unit::TestCase
 
     @test_parser.expects(:call).with([{'given' => {'date' => '2013-06-20', 'regions' => ['custom_single_file']}, 'expect' => {'name' => 'Company Founding'}}, {'given' => {'date' => '2015-01-01', 'regions' => ['custom_single_file']}, 'expect' => {'name' => 'Custom Holiday'}}]).returns(['parsed tests'])
 
+    @module_source_generator.expects(:call).with("test", ["test/data/test_single_custom_holiday_with_custom_procs.yaml"], [:custom_single_file], ["      0 => [{:function => \"custom_method(year, month)\", :function_arguments => [:year, :month], :function_modifier => 5, :name => \"Custom Holiday\", :regions => [:custom_single_file]}]", "      6 => [{:mday => 20, :name => \"Company Founding\", :regions => [:custom_single_file]}]"], "\"custom_method(year, month)\" => Proc.new { |year, month|\nsource_stuff\n},\n\n").returns("module source")
     @test_source_generator.expects(:call).with('test', ['test/data/test_single_custom_holiday_with_custom_procs.yaml'], ['parsed tests']).returns('test source')
 
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
     module_src = @generator.generate_definition_source("test", files, regions, rules_by_month, custom_methods, tests)[0]
 
-    expected_module_src = "# encoding: utf-8\nmodule Holidays\n  # This file is generated by the Ruby Holidays gem.\n  #\n  # Definitions loaded: test/data/test_single_custom_holiday_with_custom_procs.yaml\n  #\n  # All the definitions are available at https://github.com/holidays/holidays\n  module TEST # :nodoc:\n    def self.defined_regions\n      [:custom_single_file]\n    end\n\n    def self.holidays_by_month\n      {\n              0 => [{:function => \"custom_method(year, month)\", :function_arguments => [:year, :month], :function_modifier => 5, :name => \"Custom Holiday\", :regions => [:custom_single_file]}],\n      6 => [{:mday => 20, :name => \"Company Founding\", :regions => [:custom_single_file]}]\n      }\n    end\n\n    def self.custom_methods\n      {\n        \"custom_method(year, month)\" => Proc.new { |year, month|\nsource_stuff\n},\n\n\n      }\n    end\n  end\nend\n"
+    expected_module_src = "module source"
 
     assert_equal expected_module_src, module_src
   end
@@ -212,6 +215,7 @@ class GeneratorTests < Test::Unit::TestCase
 
     @test_parser.expects(:call).with([{'given' => {'date' => '2013-06-20', 'regions' => ['custom_single_file']}, 'expect' => {'name' => 'Company Founding'}}, {'given' => {'date' => '2015-01-01', 'regions' => ['custom_single_file']}, 'expect' => {'name' => 'Custom Holiday'}}]).returns(['parsed tests'])
 
+    @module_source_generator.expects(:call).returns("module_source")
     @test_source_generator.expects(:call).with('test', ['test/data/test_single_custom_holiday_with_custom_procs.yaml'], ['parsed tests']).returns('test source')
 
     regions, rules_by_month, custom_methods, tests = @generator.parse_definition_files(files)
@@ -219,11 +223,4 @@ class GeneratorTests < Test::Unit::TestCase
 
     assert_equal 'test source', test_src
   end
-
-  #TODO Missing test scenarios. Adding here so I don't forget when I split this
-  #     apart into smaller components.
-  #
-  #     1) If a year_range contains empty entries then we should blow up.
-  #     2) If year_range contains invalid (i.e. too many types per entry) then
-  #        we should blow up
 end

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

@@ -0,0 +1,268 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../test_helper'
+
+require 'holidays/definition/generator/module'
+
+class GeneratorModuleTests < Test::Unit::TestCase
+  def setup
+    @generator = Holidays::Definition::Generator::Module.new
+
+    @module_name = "TEST"
+    @files = ["file1.rb", "file2.rb"]
+    @regions = [:test, :test2]
+    @month_strings = ["first-string", "second-string"]
+    @custom_methods = "custom-methods"
+  end
+
+  def subject
+    @generator.call(
+      @module_name,
+      @files,
+      @regions,
+      @month_strings,
+      @custom_methods,
+    )
+  end
+
+  def test_generates_source
+    expected = <<-EOF
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: file1.rb, file2.rb
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module TEST # :nodoc:
+    def self.defined_regions
+      [:test, :test2]
+    end
+
+    def self.holidays_by_month
+      {
+          first-string,
+second-string
+      }
+    end
+
+    def self.custom_methods
+      {
+          custom-methods
+      }
+    end
+  end
+end
+EOF
+
+    assert_equal expected, subject
+  end
+
+  def test_module_name_more_than_one_word
+    @module_name = "TESTWITHHYPHEN"
+
+    expected = <<-EOF
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: file1.rb, file2.rb
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module TESTWITHHYPHEN # :nodoc:
+    def self.defined_regions
+      [:test, :test2]
+    end
+
+    def self.holidays_by_month
+      {
+          first-string,
+second-string
+      }
+    end
+
+    def self.custom_methods
+      {
+          custom-methods
+      }
+    end
+  end
+end
+EOF
+
+    assert_equal expected, subject
+  end
+
+  def test_generates_source_with_blank_custom_methods
+    @custom_methods = ""
+
+    expected = <<-EOF
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: file1.rb, file2.rb
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module TEST # :nodoc:
+    def self.defined_regions
+      [:test, :test2]
+    end
+
+    def self.holidays_by_month
+      {
+          first-string,
+second-string
+      }
+    end
+
+    def self.custom_methods
+      {
+          
+      }
+    end
+  end
+end
+EOF
+
+    assert_equal expected, subject
+  end
+
+  def test_generates_source_with_nil_custom_methods
+    @custom_methods = nil
+
+    expected = <<-EOF
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: file1.rb, file2.rb
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module TEST # :nodoc:
+    def self.defined_regions
+      [:test, :test2]
+    end
+
+    def self.holidays_by_month
+      {
+          first-string,
+second-string
+      }
+    end
+
+    def self.custom_methods
+      {
+          
+      }
+    end
+  end
+end
+EOF
+
+    assert_equal expected, subject
+  end
+
+  def test_generates_source_with_symbol_module_name
+    @module_name = :test
+
+    expected = <<-EOF
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: file1.rb, file2.rb
+  #
+  # All the definitions are available at https://github.com/holidays/holidays
+  module TEST # :nodoc:
+    def self.defined_regions
+      [:test, :test2]
+    end
+
+    def self.holidays_by_month
+      {
+          first-string,
+second-string
+      }
+    end
+
+    def self.custom_methods
+      {
+          custom-methods
+      }
+    end
+  end
+end
+EOF
+
+    assert_equal expected, subject
+  end
+
+  def test_raise_error_if_module_name_is_blank
+    @module_name = ""
+    assert_raises ArgumentError do
+      subject
+    end
+  end
+
+  def test_raise_error_if_module_name_is_nil
+    @module_name = nil
+    assert_raises ArgumentError do
+      subject
+    end
+  end
+
+  def test_raise_error_if_files_are_empty
+    @files = []
+
+    assert_raises ArgumentError do
+      subject
+    end
+  end
+
+  def test_raise_error_if_files_are_not_all_strings
+    @files = [:test, 1]
+
+    assert_raises ArgumentError do
+      subject
+    end
+  end
+
+  def test_raise_error_if_files_is_nil
+    @files = nil
+
+    assert_raises ArgumentError do
+      subject
+    end
+  end
+
+  def test_raise_error_if_regions_are_empty
+    @regions = []
+
+    assert_raises ArgumentError do
+      subject
+    end
+  end
+
+  def test_raise_error_if_regions_is_nil
+    @regions = nil
+
+    assert_raises ArgumentError do
+      subject
+    end
+  end
+
+  def test_raise_error_if_month_strings_are_empty
+    @month_strings = []
+
+    assert_raises ArgumentError do
+      subject
+    end
+  end
+
+  def test_raise_error_if_month_strings_is_nil
+    @month_strings = nil
+
+    assert_raises ArgumentError do
+      subject
+    end
+  end
+end

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