holidays 7.1.0 → 8.5.0

data/lib/holidays/definition/repository/holidays_by_month.rb

@@ -41,7 +41,15 @@ module Holidays
         private
 
         def definition_exists?(existing_def, target_def)
-          existing_def[:name] == target_def[:name] && existing_def[:wday] == target_def[:wday] && existing_def[:mday] == target_def[:mday] && existing_def[:week] == target_def[:week] && existing_def[:function] == target_def[:function] && existing_def[:type] == target_def[:type] && existing_def[:observed] == target_def[:observed] && existing_def[:year_ranges] == target_def[:year_ranges]
+          existing_def[:name] == target_def[:name] &&
+          existing_def[:wday] == target_def[:wday] &&
+          existing_def[:mday] == target_def[:mday] &&
+          existing_def[:week] == target_def[:week] &&
+          existing_def[:function] == target_def[:function] &&
+          existing_def[:function_modifier] == target_def[:function_modifier] &&
+          existing_def[:type] == target_def[:type] &&
+          existing_def[:observed] == target_def[:observed] &&
+          existing_def[:year_ranges] == target_def[:year_ranges]
         end
       end
     end

data/lib/holidays/finder/context/search.rb

@@ -24,39 +24,11 @@ module Holidays
                   next unless @rules[:year_range].call(year, h[:year_ranges])
                 end
 
-                current_month = month
-                current_day = h[:mday]
-
-                if h[:function]
-                  result = @custom_method_processor.call(
-                    build_custom_method_input(year, current_month, current_day, h[:regions]),
-                    h[:function], h[:function_arguments], h[:function_modifier],
-                  )
-
-                  #FIXME The result should always be present, see https://github.com/holidays/holidays/issues/204 for more information
-                  if result
-                    current_month = result.month
-                    current_day = result.mday
-                  else
-                    current_month = nil
-                    current_day = nil
-                  end
-                else
-                  current_day = h[:mday] || @day_of_month_calculator.call(year, current_month, h[:week], h[:wday])
-                end
-
-                # Silently skip bad mdays
-                #TODO Should we be doing something different here? We have no concept of logging right now. Maybe we should add it?
-                begin
-                  date = Date.civil(year, current_month, current_day)
-                rescue; next; end
+                date = build_date(year, month, h)
+                next unless date
 
                 if observed_set?(options) && h[:observed]
-                  date = @custom_method_processor.call(
-                    build_custom_method_input(date.year, date.month, date.day, regions),
-                    h[:observed],
-                    [:date],
-                  )
+                  date = build_observed_date(date, regions, h)
                 end
 
                 holidays << {:date => date, :name => h[:name], :regions => h[:regions]}
@@ -93,6 +65,29 @@ module Holidays
           options && options.include?(:observed) == true
         end
 
+        def build_date(year, month, h)
+          if h[:function]
+            holiday = custom_holiday(year, month, h)
+            #FIXME The result should always be present, see https://github.com/holidays/holidays/issues/204 for more information
+            current_month = holiday&.month
+            current_day = holiday&.mday
+          else
+            current_month = month
+            current_day = h[:mday] || @day_of_month_calculator.call(year, month, h[:week], h[:wday])
+          end
+
+          # Silently skip bad mdays
+          #TODO Should we be doing something different here? We have no concept of logging right now. Maybe we should add it?
+          Date.civil(year, current_month, current_day) rescue nil
+        end
+
+        def custom_holiday(year, month, h)
+          @custom_method_processor.call(
+            build_custom_method_input(year, month, h[:mday], h[:regions]),
+            h[:function], h[:function_arguments], h[:function_modifier],
+          )
+        end
+
         def build_custom_method_input(year, month, day, regions)
           {
             year: year,
@@ -101,6 +96,14 @@ module Holidays
             region: regions.first, #FIXME This isn't ideal but will work for our current use case...
           }
         end
+
+        def build_observed_date(date, regions, h)
+          @custom_method_processor.call(
+            build_custom_method_input(date.year, date.month, date.day, regions),
+            h[:observed],
+            [:date],
+          )
+        end
       end
     end
   end

data/lib/holidays/finder/rules/year_range.rb

@@ -1,49 +1,30 @@
-# Please note that only one condition needs to match in order for `call` to return `true.
-# See the test file for this class for specific examples.
 module Holidays
   module Finder
     module Rules
       class YearRange
         class << self
-          BEFORE = :before
-          AFTER = :after
+          UNTIL = :until
+          FROM = :from
           LIMITED = :limited
           BETWEEN = :between
 
-          #TODO Can we just accept symbols here? Why accept strings?
-          VALID_OPERATORS = [
-            BEFORE, BEFORE.to_s,
-            AFTER, AFTER.to_s,
-            LIMITED, LIMITED.to_s,
-            BETWEEN, BETWEEN.to_s
-          ]
-
-          def call(target_year, year_range_definitions)
-            validate!(target_year, year_range_definitions)
-
-            matched = false
-            year_range_definitions.each do |range_defs|
-              next unless range_defs.is_a?(Hash) && range_defs.length == 1
-
-              operator = range_defs.keys.first
-              year_range = range_defs.values.first
-
-              case operator
-              when BEFORE, BEFORE.to_s
-                matched = target_year <= year_range
-              when AFTER, AFTER.to_s
-                matched = target_year >= year_range
-              when LIMITED, LIMITED.to_s
-                if year_range.is_a?(Array)
-                  matched = year_range.include?(target_year)
-                else
-                  matched = year_range == target_year
-                end
-              when BETWEEN, BETWEEN.to_s
-                matched = year_range.cover?(target_year)
-              end
-
-              break if matched == true
+          def call(target_year, year_range_defs)
+            validate!(target_year, year_range_defs)
+
+            operator = year_range_defs.keys.first
+            rule_value = year_range_defs[operator]
+
+            case operator
+            when UNTIL
+              matched = target_year <= rule_value
+            when FROM
+              matched = target_year >= rule_value
+            when LIMITED
+              matched = rule_value.include?(target_year)
+            when BETWEEN
+              matched = rule_value.cover?(target_year)
+            else
+              matched = false
             end
 
             matched
@@ -54,25 +35,20 @@ module Holidays
           def validate!(target_year, year_ranges)
             raise ArgumentError.new("target_year must be a number") unless target_year.is_a?(Integer)
             raise ArgumentError.new("year_ranges cannot be missing") if year_ranges.nil? || year_ranges.empty?
+            raise ArgumentError.new("year_ranges must contain a hash with a single operator") unless year_ranges.is_a?(Hash) && year_ranges.size == 1
 
-            year_ranges.each do |range|
-              raise ArgumentError.new("year_ranges must include only hashes") unless range.is_a?(Hash)
-              raise ArgumentError.new("year_ranges cannot include empty hashes") if range.empty?
-              raise ArgumentError.new("year_ranges entries can only include one operator") unless range.count == 1
-
-              operator = range.keys.first
-              range = range.values.first
+            operator = year_ranges.keys.first
+            value = year_ranges[operator]
 
-              raise ArgumentError.new("Invalid operator found: '#{operator}'") unless VALID_OPERATORS.include?(operator)
+            raise ArgumentError.new("Invalid operator found: '#{operator}'") unless [UNTIL, FROM, LIMITED, BETWEEN].include?(operator)
 
-              case operator
-              when BEFORE, BEFORE.to_s, AFTER, AFTER.to_s
-                raise ArgumentError.new(":before and :after operator value must be a number, received: '#{range}'") unless range.is_a?(Integer)
-              when LIMITED, LIMITED.to_s
-                raise ArgumentError.new(":limited operator value must be an array, received: '#{range}'") unless range.is_a?(Array) || range.is_a?(Integer)
-              when BETWEEN, BETWEEN.to_s
-                raise ArgumentError.new(":between operator value must be a range, received: '#{range}'") unless range.is_a?(Range)
-              end
+            case operator
+            when UNTIL, FROM
+              raise ArgumentError.new("#{UNTIL} and #{FROM} operator value must be a number, received: '#{value}'") unless value.is_a?(Integer)
+            when LIMITED
+              raise ArgumentError.new(":limited operator value must be an array containing at least one integer value, received: '#{value}'") unless value.is_a?(Array) && value.size >= 1 && value.all? { |v| v.is_a?(Integer) }
+            when BETWEEN
+              raise ArgumentError.new(":between operator value must be a range, received: '#{value}'") unless value.is_a?(Range)
             end
           end
         end

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '7.1.0'
+  VERSION = '8.5.0'
 end

data/lib/holidays.rb

@@ -40,6 +40,8 @@ module Holidays
 
       start_date, end_date = get_date(start_date), get_date(end_date)
 
+      raise ArgumentError if end_date < start_date
+
       if cached_holidays = Factory::Definition.cache_repository.find(start_date, end_date, options)
         return cached_holidays
       end

data/test/coverage_report.rb

@@ -1,8 +1,26 @@
 require 'simplecov'
 
-SimpleCov.minimum_coverage 99
+# For reasons I don't understand jruby implementations report lower coverage
+# than other ruby versions. Ruby 2.5.3, for instance, is at 92%.
+#
+# We set the floor based on jruby so that all automated tests pass on Travis CI.
+SimpleCov.minimum_coverage 89
+
+SimpleCov.add_filter [
+  # Apparently simplecov doesn't automatically filter 'spec' or 'test' so we
+  # have to do it manually.
+  'test',
+
+  # Only filtered because I tend to not see value in testing factories.
+  'lib/holidays/factory/',
+
+  # jruby coverage flips out here and doesn't count much of the large date
+  # arrays used by this class. This results in an extremely low reported
+  # coverage for this specific file but only in jruby, not other ruby versions.
+  # Since it obliterates coverage percentages I'll filter it until I can come
+  # up with a solution.
+  'lib/holidays/date_calculator/lunar_date.rb',
+]
+
 SimpleCov.coverage_dir 'reports/coverage'
-SimpleCov.start do
-  add_filter 'lib/generated_definitions/'
-  add_filter 'lib/holidays/factory/'
-end
+SimpleCov.start

data/test/data/test_custom_year_range_holiday_defs.yaml

@@ -4,28 +4,24 @@ months:
     regions: [custom_year_range_file]
     mday: 1
     year_ranges:
-      - after: 2016
+      from: 2016
   - name: before_year
     regions: [custom_year_range_file]
     mday: 2
     year_ranges:
-      - before: 2017
+      until: 2017
   - name: between_year
     regions: [custom_year_range_file]
     mday: 3
     year_ranges:
-      - between: 2016..2018
+      between:
+        start: 2016
+        end: 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
+      limited: [2016,2018,2019]
 
 tests:
   - given:

data/test/data/test_multiple_regions_with_conflicts_region_1.yaml

@@ -0,0 +1,38 @@
+months:
+  0:
+  - name: With Function Modifier
+    regions: [multiple_with_conflict_1]
+    function: easter(year)
+    function_modifier: 60
+  - name: With Function Only Different Function Name
+    regions: [multiple_with_conflict_1]
+    function: conflict_custom_method_1(year)
+  - name: With Function Only Same Function Name
+    regions: [multiple_with_conflict_1]
+    function: conflict_custom_method_identical_name_between_regions(year)
+  - name: With Function Only Same Function Name - Region 1
+    regions: [multiple_with_conflict_1]
+    function: conflict_custom_method_identical_name_between_regions_but_different_holiday_names(year)
+  1:
+  - name: New Year's Day
+    regions: [multiple_with_conflict_1]
+    mday: 1
+    observed: to_monday_if_weekend(date)
+  10:
+  - name: Testing Conflict Month 10
+    regions: [multiple_with_conflict_1]
+    mday: 5
+
+methods:
+  conflict_custom_method_1:
+    arguments: year
+    ruby: |
+      Date.civil(year, 8, 1)
+  conflict_custom_method_identical_name_between_regions:
+    arguments: year
+    ruby: |
+      Date.civil(year, 9, 1)
+  conflict_custom_method_identical_name_between_regions_but_different_holiday_names:
+    arguments: year
+    ruby: |
+      Date.civil(year, 9, 15)

data/test/data/test_multiple_regions_with_conflicts_region_2.yaml

@@ -0,0 +1,38 @@
+months:
+  0:
+  - name: With Function Modifier
+    regions: [multiple_with_conflict_2]
+    function: easter(year)
+    function_modifier: 64
+  - name: With Function Only Different Function Name
+    regions: [multiple_with_conflict_2]
+    function: conflict_custom_method_2(year)
+  - name: With Function Only Same Function Name
+    regions: [multiple_with_conflict_2]
+    function: conflict_custom_method_identical_name_between_regions(year)
+  - name: With Function Only Same Function Name - Region 2
+    regions: [multiple_with_conflict_2]
+    function: conflict_custom_method_identical_name_between_regions_but_different_holiday_names(year)
+  1:
+  - name: New Year's Day
+    regions: [multiple_with_conflict_2]
+    mday: 1
+    observed: to_tuesday_if_sunday_or_monday_if_saturday(date)
+  10:
+  - name: Testing Conflict Month 10
+    regions: [multiple_with_conflict_2]
+    mday: 7
+
+methods:
+  conflict_custom_method_2:
+    arguments: year
+    ruby: |
+      Date.civil(year, 12, 1)
+  conflict_custom_method_identical_name_between_regions:
+    arguments: year
+    ruby: |
+      Date.civil(year, 11, 1)
+  conflict_custom_method_identical_name_between_regions_but_different_holiday_names:
+    arguments: year
+    ruby: |
+      Date.civil(year, 11, 15)

data/test/defs/test_defs_ar.rb

@@ -31,21 +31,37 @@ class ArDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Día de la Revolución de Mayo", (Holidays.on(Date.civil(2016, 5, 25), [:ar], [:informal])[0] || {})[:name]
 
-    assert_equal "Día de la Bandera", (Holidays.on(Date.civil(2016, 6, 20), [:ar], [:informal])[0] || {})[:name]
+    assert_equal "Paso a la Inmortalidad del General Martín Miguel de Güemes", (Holidays.on(Date.civil(2020, 6, 15), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Paso a la Inmortalidad del General Martín Miguel de Güemes", (Holidays.on(Date.civil(2021, 6, 21), [:ar], [:informal])[0] || {})[:name]
 
-    assert_equal "Feriado puente turístico", (Holidays.on(Date.civil(2016, 7, 8), [:ar], [:informal])[0] || {})[:name]
+    assert_nil (Holidays.on(Date.civil(2020, 6, 17), [:ar], [:informal])[0] || {})[:name]
+assert_nil (Holidays.on(Date.civil(2021, 6, 17), [:ar], [:informal])[0] || {})[:name]
+
+    assert_equal "Paso a la Inmortalidad del General Martín Miguel de Güemes", (Holidays.on(Date.civil(2016, 6, 20), [:ar], [:informal])[0] || {})[:name]
 
     assert_equal "Día de la Independencia", (Holidays.on(Date.civil(2016, 7, 9), [:ar], [:informal])[0] || {})[:name]
 
     assert_equal "Paso a la Inmortalidad del General José de San Martín", (Holidays.on(Date.civil(2016, 8, 15), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Paso a la Inmortalidad del General José de San Martín", (Holidays.on(Date.civil(2020, 8, 17), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Paso a la Inmortalidad del General José de San Martín", (Holidays.on(Date.civil(2021, 8, 16), [:ar], [:informal])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2016, 8, 17), [:ar], [:informal])[0] || {})[:name]
+assert_nil (Holidays.on(Date.civil(2021, 8, 17), [:ar], [:informal])[0] || {})[:name]
+
+    assert_equal "Día del Respeto a la Diversidad Cultural", (Holidays.on(Date.civil(2016, 10, 10), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Día del Respeto a la Diversidad Cultural", (Holidays.on(Date.civil(2021, 10, 11), [:ar], [:informal])[0] || {})[:name]
 
-    assert_equal "Día del Respeto a la Diversidad Cultural", (Holidays.on(Date.civil(2016, 10, 12), [:ar], [:informal])[0] || {})[:name]
+    assert_nil (Holidays.on(Date.civil(2021, 10, 12), [:ar], [:informal])[0] || {})[:name]
 
     assert_equal "Día de la Soberanía Nacional", (Holidays.on(Date.civil(2016, 11, 20), [:ar], [:informal])[0] || {})[:name]
 
     assert_equal "Inmaculada Concepción de María", (Holidays.on(Date.civil(2016, 12, 8), [:ar], [:informal])[0] || {})[:name]
 
-    assert_equal "Feriado puente turístico", (Holidays.on(Date.civil(2016, 12, 9), [:ar], [:informal])[0] || {})[:name]
+    assert_equal "Feriado con fines turísticos", (Holidays.on(Date.civil(2016, 7, 8), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Feriado con fines turísticos", (Holidays.on(Date.civil(2016, 12, 9), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Feriado con fines turísticos", (Holidays.on(Date.civil(2021, 5, 24), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Feriado con fines turísticos", (Holidays.on(Date.civil(2021, 10, 8), [:ar], [:informal])[0] || {})[:name]
+assert_equal "Feriado con fines turísticos", (Holidays.on(Date.civil(2021, 11, 22), [:ar], [:informal])[0] || {})[:name]
 
     assert_equal "Navidad", (Holidays.on(Date.civil(2016, 12, 25), [:ar], [:informal])[0] || {})[:name]
 

data/test/defs/test_defs_au.rb

@@ -196,5 +196,7 @@ assert_equal "Queen's Birthday", (Holidays.on(Date.civil(2016, 9, 26), [:au_wa])
 
     assert_equal "G20 Day", (Holidays.on(Date.civil(2014, 11, 14), [:au_qld_brisbane])[0] || {})[:name]
 
+    assert_nil (Holidays.on(Date.civil(2021, 4, 26), [:au_vic])[0] || {})[:name]
+
   end
 end

data/test/defs/test_defs_ca.rb

@@ -19,7 +19,7 @@ class CaDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Labour Day", (Holidays.on(Date.civil(2008, 9, 1), [:ca], [:informal])[0] || {})[:name]
 
-    assert_equal "Christmas Day", (Holidays.on(Date.civil(2008, 12, 25), [:ca], [:informal])[0] || {})[:name]
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2008, 12, 25), [:ca_on], [:informal])[0] || {})[:name]
 
     assert_equal "Family Day", (Holidays.on(Date.civil(1990, 2, 19), [:ca_ab])[0] || {})[:name]
 
@@ -201,16 +201,37 @@ assert_equal "Remembrance Day", (Holidays.on(Date.civil(2017, 11, 13), [:ca_ab,
 
     assert_equal "Canada Day", (Holidays.on(Date.civil(2017, 7, 3), [:ca], [:observed])[0] || {})[:name]
 
-    assert_equal "Christmas Day", (Holidays.on(Date.civil(2010, 12, 27), [:ca], [:observed])[0] || {})[:name]
+    assert_equal "National Day for Truth and Reconciliation", (Holidays.on(Date.civil(2021, 9, 30), [:ca])[0] || {})[:name]
 
-    assert_equal "Christmas Day", (Holidays.on(Date.civil(2012, 12, 25), [:ca], [:observed])[0] || {})[:name]
+    assert_equal "National Day for Truth and Reconciliation", (Holidays.on(Date.civil(2026, 9, 30), [:ca])[0] || {})[:name]
 
-    assert_equal "Christmas Day", (Holidays.on(Date.civil(2016, 12, 26), [:ca], [:observed])[0] || {})[:name]
+    assert_nil (Holidays.on(Date.civil(2020, 9, 30), [:ca])[0] || {})[:name]
 
-    assert_equal "Boxing Day", (Holidays.on(Date.civil(2010, 12, 28), [:ca_on], [:observed])[0] || {})[:name]
+    assert_nil (Holidays.on(Date.civil(1985, 9, 30), [:ca])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2010, 12, 25), [:ca_on])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2018, 12, 25), [:ca_on])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2022, 12, 25), [:ca_on])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2022, 12, 25), [:ca], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2010, 12, 24), [:ca_on], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2012, 12, 25), [:ca_on], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2016, 12, 26), [:ca_on], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2021, 12, 24), [:ca_ab, :ca_bc, :ca_mb, :ca_nb, :ca_nl, :ca_nt, :ca_ns, :ca_nu, :ca_pe, :ca_qc, :ca_sk, :ca_yt], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2021, 12, 27), [:ca_on], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2022, 12, 26), [:ca_on], [:observed])[0] || {})[:name]
+
+    assert_equal "Boxing Day", (Holidays.on(Date.civil(2010, 12, 27), [:ca_on], [:observed])[0] || {})[:name]
 assert_equal "Boxing Day", (Holidays.on(Date.civil(2012, 12, 26), [:ca_on], [:observed])[0] || {})[:name]
 assert_equal "Boxing Day", (Holidays.on(Date.civil(2015, 12, 28), [:ca_on], [:observed])[0] || {})[:name]
-assert_equal "Boxing Day", (Holidays.on(Date.civil(2016, 12, 27), [:ca_on], [:observed])[0] || {})[:name]
 
     assert_nil (Holidays.on(Date.civil(2015, 6, 21), [:ca_yt])[0] || {})[:name]
 
@@ -220,13 +241,23 @@ assert_equal "Boxing Day", (Holidays.on(Date.civil(2016, 12, 27), [:ca_on], [:ob
 
     assert_equal "National Aboriginal Day", (Holidays.on(Date.civil(2018, 6, 21), [:ca_yt])[0] || {})[:name]
 
-    assert_equal "Terry Fox Day", (Holidays.on(Date.civil(2019, 8, 5), [:ca_mb])[0] || {})[:name]
+    assert_equal "Terry Fox Day", (Holidays.on(Date.civil(2019, 8, 5), [:ca_mb], [:informal])[0] || {})[:name]
+
+    assert_equal "Terry Fox Day", (Holidays.on(Date.civil(2020, 8, 3), [:ca_mb], [:informal])[0] || {})[:name]
+
+    assert_nil (Holidays.on(Date.civil(2020, 8, 3), [:ca_mb])[0] || {})[:name]
+
+    assert_equal "Terry Fox Day", (Holidays.on(Date.civil(2015, 8, 3), [:ca_mb], [:informal])[0] || {})[:name]
+
+    assert_equal "Terry Fox Day", (Holidays.on(Date.civil(2045, 8, 7), [:ca_mb], [:informal])[0] || {})[:name]
+
+    assert_equal "Nunavut Day", (Holidays.on(Date.civil(2020, 7, 9), [:ca_nu])[0] || {})[:name]
 
-    assert_equal "Terry Fox Day", (Holidays.on(Date.civil(2020, 8, 3), [:ca_mb])[0] || {})[:name]
+    assert_equal "Nunavut Day", (Holidays.on(Date.civil(2021, 7, 9), [:ca_nu])[0] || {})[:name]
 
-    assert_equal "Terry Fox Day", (Holidays.on(Date.civil(2015, 8, 3), [:ca_mb])[0] || {})[:name]
+    assert_nil (Holidays.on(Date.civil(2019, 7, 9), [:ca_nu])[0] || {})[:name]
 
-    assert_equal "Terry Fox Day", (Holidays.on(Date.civil(2045, 8, 7), [:ca_mb])[0] || {})[:name]
+    assert_nil (Holidays.on(Date.civil(2018, 7, 9), [:ca_nu])[0] || {})[:name]
 
     assert_equal "Groundhog Day", (Holidays.on(Date.civil(2013, 2, 2), [:us], [:informal])[0] || {})[:name]
 

data/test/defs/test_defs_ch.rb

@@ -43,5 +43,9 @@ class ChDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Näfelser Fahrt", (Holidays.on(Date.civil(2014, 4, 3), [:ch_gl])[0] || {})[:name]
 
+    assert_equal "Zibelemärit", (Holidays.on(Date.civil(2014, 11, 24), [:ch_be])[0] || {})[:name]
+
+    assert_equal "Zibelemärit", (Holidays.on(Date.civil(2020, 11, 23), [:ch_be])[0] || {})[:name]
+
   end
 end

data/test/defs/test_defs_co.rb

@@ -45,11 +45,11 @@ class CoDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Día de la Ascensión", (Holidays.on(Date.civil(2017, 5, 29), [:co])[0] || {})[:name]
 
-    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2014, 6, 19), [:co])[0] || {})[:name]
+    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2014, 6, 23), [:co])[0] || {})[:name]
 
-    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2016, 5, 26), [:co])[0] || {})[:name]
+    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2016, 5, 30), [:co])[0] || {})[:name]
 
-    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2017, 6, 15), [:co])[0] || {})[:name]
+    assert_equal "Corpus Christi", (Holidays.on(Date.civil(2017, 6, 19), [:co])[0] || {})[:name]
 
     assert_equal "Sagrado Corazón", (Holidays.on(Date.civil(2014, 6, 30), [:co])[0] || {})[:name]
 

data/test/defs/test_defs_de.rb

@@ -79,5 +79,7 @@ class DeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Internationaler Frauentag", (Holidays.on(Date.civil(2019, 3, 8), [:de_be])[0] || {})[:name]
 
+    assert_equal "Tag der Befreiung", (Holidays.on(Date.civil(2020, 5, 8), [:de_be])[0] || {})[:name]
+
   end
 end

data/test/defs/test_defs_es.rb

@@ -131,5 +131,7 @@ class EsDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
     assert_equal "Fiesta Nacional de Cataluña", (Holidays.on(Date.civil(2009, 9, 11), [:es_ct])[0] || {})[:name]
 
+    assert_equal "Lunes de Pascua Granada", (Holidays.on(Date.civil(2020, 6, 1), [:es_ct])[0] || {})[:name]
+
   end
 end