holidays 4.2.0 → 8.4.1

data/test/{test_holidays_between.rb → integration/test_holidays_between.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__)) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 require "#{Holidays::DEFINITIONS_PATH}/ca"
 
@@ -8,16 +8,16 @@ require "#{Holidays::DEFINITIONS_PATH}/ca"
 # NOTE: this test is a mixture of integration and unit tests. It's messy and bad.
 # I am not fixing it here because I am trying to clean up the 'between' use case
 # and don't want to bite off more than I can chew.
-require "#{Holidays::DEFINITIONS_PATH}/north_america"
+require "#{Holidays::DEFINITIONS_PATH}/northamerica"
 
-class HolidaysTests < Test::Unit::TestCase
+class HolidaysBetweenTests < Test::Unit::TestCase
   def setup
     @date = Date.civil(2008,1,1)
     @subject = Holidays.method(:between)
   end
 
   def teardown
-    Holidays::DefinitionFactory.cache_repository.reset!
+    Holidays::Factory::Definition.cache_repository.reset!
   end
 
   def test_between
@@ -41,12 +41,22 @@ class HolidaysTests < Test::Unit::TestCase
     end
   end
 
+  def test_between_raises_error_if_end_date_is_before_start_date
+    assert_raise ArgumentError do
+      @subject.call(Date.civil(2019, 2, 1), Date.civil(2019, 1, 1), :us)
+    end
+
+    assert_raise ArgumentError do
+      @subject.call(Date.civil(2008,7,2), Date.civil(2000,7,2), :ca)
+    end
+  end
+
   def test_cached_holidays_are_returned_if_present
     start_date = Date.civil(2015, 1, 1)
     end_date = Date.civil(2015, 1, 31)
     options = [:us, :informal]
 
-    Holidays::DefinitionFactory.cache_repository.expects(:find).with(start_date, end_date, options).returns({cached: 'data'})
+    Holidays::Factory::Definition.cache_repository.expects(:find).with(start_date, end_date, options).returns({cached: 'data'})
 
     assert_equal({cached: 'data'}, @subject.call(start_date, end_date, *options))
   end
@@ -56,13 +66,9 @@ class HolidaysTests < Test::Unit::TestCase
     end_date = Date.civil(2015, 1, 31)
     options = [:us]
 
-    options_parser_mock = mock()
-    Holidays::OptionFactory.stubs(:parse_options).returns(options_parser_mock)
-    options_parser_mock.expects(:call).with(options).returns([[:us], false, false])
-
     between_mock = mock()
-    Holidays::UseCaseFactory.stubs(:between).returns(between_mock)
-    between_mock.expects(:call).with(start_date, end_date, {2015 => [0, 1, 2], 2014 => [0, 12]}, [:us], false, false)
+    Holidays::Factory::Finder.stubs(:between).returns(between_mock)
+    between_mock.expects(:call).with(start_date, end_date, [:us])
 
     @subject.call(start_date, end_date, *options)
   end
@@ -72,13 +78,9 @@ class HolidaysTests < Test::Unit::TestCase
     end_date = Date.civil(2015, 1, 31)
     options = [:us]
 
-    dates_driver_builder_mock = mock()
-    Holidays::UseCaseFactory.stubs(:dates_driver_builder).returns(dates_driver_builder_mock)
-    dates_driver_builder_mock.expects(:call).with(start_date, end_date).returns({2015 => [0, 1, 2]})
-
     between_mock = mock()
-    Holidays::UseCaseFactory.stubs(:between).returns(between_mock)
-    between_mock.expects(:call).with(start_date, end_date, {2015 => [0, 1, 2]}, [:us], false, false)
+    Holidays::Factory::Finder.stubs(:between).returns(between_mock)
+    between_mock.expects(:call).with(start_date, end_date, [:us])
 
     @subject.call(start_date, end_date, *options)
   end

data/test/integration/test_multiple_regions.rb

@@ -0,0 +1,71 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+require "#{Holidays::DEFINITIONS_PATH}/gb"
+require "#{Holidays::DEFINITIONS_PATH}/ie"
+
+class MultipleRegionsTests < Test::Unit::TestCase
+  # Simulate load of new environment where the repositories begin empty
+  def reset_cache
+    Holidays::Factory::Definition.instance_variable_set(:@regions_repo, nil)
+    Holidays::Factory::Definition.instance_variable_set(:@holidays_repo, nil)
+  end
+
+  def test_defining_holidays
+    h = Holidays.on(Date.new(2008, 12, 26), :ie)
+    assert_equal 'St. Stephen\'s Day', h[0][:name]
+
+    h = Holidays.on(Date.new(2008, 5, 9), :gb_)
+    assert_equal 'Liberation Day', (h[0] || {})[:name]
+
+    h = Holidays.on(Date.new(2008, 5, 9), :je)
+    assert_equal 'Liberation Day', h[0][:name]
+
+    h = Holidays.on(Date.new(2008, 5, 9), :gb)
+    assert h.empty?
+  end
+
+  def test_north_american_parent_region_lookup
+    assert_equal :ca, Holidays::PARENT_REGION_LOOKUP[:ca]
+    assert_equal :ca, Holidays::PARENT_REGION_LOOKUP[:ca_qc]
+    assert_equal :mx, Holidays::PARENT_REGION_LOOKUP[:mx]
+    assert_equal :mx, Holidays::PARENT_REGION_LOOKUP[:mx_pue]
+    assert_equal :us, Holidays::PARENT_REGION_LOOKUP[:us]
+    assert_equal :us, Holidays::PARENT_REGION_LOOKUP[:us_fl]
+  end
+
+  def test_north_american_subregion_caching
+    { ca: :ca_qc, mx: :mx_pue, us: :us_fl }.each do |region, subregion|
+      module_name = region.upcase
+
+      reset_cache
+      Holidays.on(Date.new(2018, 1, 1), region)  # Test check on regional holidays
+      assert_equal [region], Holidays::Factory::Definition.regions_repository.all_loaded, "Only Holidays::#{module_name} should be loaded"
+      holiday_regions = Holidays::Factory::Definition.holidays_by_month_repository.all.values.flatten.map { |h| h[:regions] }.uniq.flatten
+      assert_includes holiday_regions, region, 'Region holidays should be loaded'
+      assert_includes holiday_regions, subregion, 'Subregion holidays should be loaded'
+
+      reset_cache
+      Holidays.on(Date.new(2018, 1, 1), subregion)  # Test check on subregional holidays
+      assert_equal [region], Holidays::Factory::Definition.regions_repository.all_loaded, "Only Holidays::#{module_name} should be loaded"
+      holiday_regions = Holidays::Factory::Definition.holidays_by_month_repository.all.values.flatten.map { |h| h[:regions] }.uniq.flatten
+      assert_includes holiday_regions, region, 'Region holidays should be loaded'
+      assert_includes holiday_regions, subregion, 'Subregion holidays should be loaded'
+    end
+  end
+
+  def test_north_american_cross_region_caching
+    reset_cache
+    Holidays.on(Date.new(2018, 1, 1), :us)
+    assert_equal [:us], Holidays::Factory::Definition.regions_repository.all_loaded, 'Only Holidays::US should be loaded'
+    holiday_regions = Holidays::Factory::Definition.holidays_by_month_repository.all.values.flatten.map { |h| h[:regions] }.uniq.flatten
+    assert_includes holiday_regions, :us, 'Region holidays should be loaded'
+    assert_includes holiday_regions, :us_fl, 'Subregion holidays should be loaded'
+
+    Holidays.on(Date.new(2018, 1, 1), :ca)
+    assert_equal [:us, :ca], Holidays::Factory::Definition.regions_repository.all_loaded, 'Only Holidays::US and Holidays::CA should be loaded'
+    holiday_regions = Holidays::Factory::Definition.holidays_by_month_repository.all.values.flatten.map { |h| h[:regions] }.uniq.flatten
+    assert_includes holiday_regions, :us, 'Region holidays should be loaded'
+    assert_includes holiday_regions, :ca, 'Region holidays should be loaded'
+    assert_includes holiday_regions, :us_fl, 'Subregion holidays should be loaded'
+    assert_includes holiday_regions, :ca_qc, 'Subregion holidays should be loaded'
+  end
+end

data/test/integration/test_multiple_regions_with_conflict.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+# See https://github.com/holidays/holidays/issues/344 for more info on why
+# these tests exist.
+class MultipleRegionsWithConflictsTests < Test::Unit::TestCase
+
+  def test_corpus_christi_returns_correctly_for_co_even_if_br_is_loaded_first
+    result = Holidays.on(Date.new(2014, 6, 19), :br)
+    assert_equal 1, result.count
+    assert_equal 'Corpus Christi', result.first[:name]
+
+    result = Holidays.on(Date.new(2014, 6, 23), :co)
+    assert_equal 1, result.count
+    assert_equal 'Corpus Christi', result.first[:name]
+  end
+
+  def test_custom_loaded_region_returns_correct_value_with_function_modifier_conflict_even_if_conflict_definition_is_loaded_first
+    Holidays.load_custom('test/data/test_multiple_regions_with_conflicts_region_1.yaml')
+    result = Holidays.on(Date.new(2019, 6, 20), :multiple_with_conflict_1)
+    assert_equal 1, result.count
+    assert_equal 'With Function Modifier', result.first[:name]
+
+    Holidays.load_custom('test/data/test_multiple_regions_with_conflicts_region_2.yaml')
+    result = Holidays.on(Date.new(2019, 6, 24), :multiple_with_conflict_2)
+    assert_equal 1, result.count
+    assert_equal 'With Function Modifier', result.first[:name]
+  end
+
+end

data/test/integration/test_nonstandard_regions.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
+
+class NonstandardRegionsHolidaysTests < Test::Unit::TestCase
+  def test_ecbtarget_christmas_day
+    h = Holidays.on(Date.new(2018,12,25), :ecbtarget)
+    assert_equal 'Christmas Day', h[0][:name]
+  end
+
+  def test_federalreserve_memorial_day
+    h = Holidays.on(Date.new(2018,5,28), :federalreserve)
+    assert_equal 'Memorial Day', h[0][:name]
+
+  end
+
+  def test_federalreservebanks_independence_day
+    h = Holidays.on(Date.new(2019,7,4), :federalreservebanks, :observed)
+    assert_equal 'Independence Day', h[0][:name]
+  end
+
+  def test_unitednations_international_day_of_families
+    h = Holidays.on(Date.new(2021,5,15), :unitednations)
+    assert_equal 'International Day of Families', h[0][:name]
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,4 @@
-require 'coveralls'
-Coveralls.wear!
+require File.dirname(__FILE__) + '/coverage_report'
 
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '../../lib/'))
 
@@ -11,12 +10,17 @@ require 'mocha/test_unit'
 require 'date'
 require 'holidays'
 require 'holidays/core_extensions/date'
+require 'holidays/core_extensions/time'
 
 # Loads core extension for use in various definition tests as necessary
 class Date
   include Holidays::CoreExtensions::Date
 end
 
+class Time
+  include Holidays::CoreExtensions::Time
+end
+
 module Holidays
   # Test region used for generating a holiday on Date.today
   module Test # :nodoc:
@@ -30,4 +34,4 @@ module Holidays
   end
 end
 
-Holidays::DefinitionFactory.merger.call(Holidays::Test::DEFINED_REGIONS, Holidays::Test::HOLIDAYS_BY_MONTH, Holidays::Test::CUSTOM_METHODS)
+Holidays::Factory::Definition.merger.call(Holidays::Test::DEFINED_REGIONS, Holidays::Test::HOLIDAYS_BY_MONTH, Holidays::Test::CUSTOM_METHODS)