holidays 9.1.0 → 9.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c423e457490bf307e7fabdfc2744e0e8621eb6f0a783e593023f562dccd8ad68
-  data.tar.gz: a6ce029fecfb730da6d6b6a0a75f4c7b718937d5a95d0d03fc407df58083ecb7
+  metadata.gz: f0f84e8d40a176b0172092f8884b09567b06a4cd870a082920fbb274acb6b43f
+  data.tar.gz: bde696d82c96c50a14e5defad021c14aa541456c2eee281580b9e0fe5f1bee07
 SHA512:
-  metadata.gz: 9f2885529f2b22865d406bd38bafa8f169c94df37c4f7c6b51eef95d5aa2085cd29c0d4f9b9c8f3d2d2cb2ac887f984ba5521ecf279c548ec755b8a44ccb007a
-  data.tar.gz: 9c1aeaf7d210fe849d1977f931e625b895e8bced4924a26643a47e3edaca75451743ca036e864e8772901df92738fb612251195bfdf62b494ad01a3935c5eb91
+  metadata.gz: 90aa255cd3e08574b8b796fee989123b473a6dcb45ad522c053272a6299e03c8b84b0852ec7c9a1c8c3a2db1420f23ce963403b7439239cbe6b4f5a7b6fa35d9
+  data.tar.gz: 0e1bc79739ba0a46b6ebd80b2eb3453dde2eed2ab18db95c0088d42dba7505a01587052f7cb38fbc0f546e363ce2bde23a2ae09ae67b06d8280fcf6bfc4728e2

data/.github/workflows/ruby.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.2', '3.3', '3.4', 'ruby-head', '4.0']
+        ruby-version: ['3.2', '3.3', '3.4', '4.0', 'ruby-head', 'jruby-10.0.4.0']
     env:
       BUNDLER_NO_OLD_RUBYGEMS_WARNING: true
     steps:
@@ -20,6 +20,7 @@ jobs:
       uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 #v1.299.0
       with:
         ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run tests
       run: make test

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Ruby Holidays Gem CHANGELOG
 
+## 9.1.2
+
+* Fix bug ([#344](https://github.com/holidays/holidays/issues/344)) where holidays with the same name and function but different implementations across regions would return incorrect results depending on region load order. When multiple regions are queried simultaneously, each region's function implementation is now evaluated independently and all matching results are returned.
+
+## 9.1.1
+
+* Update to [v6.0.1 definitions](https://github.com/holidays/definitions/releases/tag/v6.0.1). Please see the changelog for the definition details.
+
 ## 9.1.0
 
 * Update to [v6.0.0 definitions](https://github.com/holidays/definitions/releases/tag/v6.0.0). Please see the changelog for the definition details.

data/Gemfile

@@ -1,3 +1,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development do
+  gem 'irb'
+  gem 'rdoc'
+end

data/Makefile

@@ -1,4 +1,3 @@
-default: test
 
 setup: update-defs
 	bundle install
@@ -9,6 +8,15 @@ generate:
 test:
 	bundle exec rake test
 
+test-smoke:
+	bundle exec rake test:smoke
+
+test-integration:
+	bundle exec rake test:integration
+
+test-e2e:
+	bundle exec rake test:e2e
+
 console:
 	bundle exec rake console
 
@@ -27,11 +35,14 @@ update-defs: definitions/
 definitions: point-to-defs-master
 
 point-to-defs-branch:
-	git submodule add -b $(BRANCH) git@github.com:$(USER)/definitions.git definitions/
+	git submodule add -b $(BRANCH) https://github.com/$(USER)/definitions.git ./definitions/
 
 point-to-defs-master:
 	git submodule add https://github.com/holidays/definitions definitions/
 
+reset-defs-to-master:
+	git -C definitions checkout $$(git ls-tree origin/master -- definitions | awk '{print $$3}')
+
 clean-defs:
 	git rm -f definitions
 	rm -rf .git/modules/definitions
@@ -42,4 +53,4 @@ clean:
 	rm -rf reports
 	rm -rf coverage
 
-.PHONY: setup test generate console build push update-defs test-region clean-defs point-to-defs-master point-to-defs-branch clean definitions
+.PHONY: setup test test-smoke test-integration test-e2e generate console build push update-defs test-region reset-defs-to-master clean-defs point-to-defs-master point-to-defs-branch clean definitions

data/README.md

@@ -18,8 +18,7 @@ This gem is tested with the following ruby versions:
   * 3.3
   * 3.4
   * 4.0
-  * JRuby 9.2.21.0
-  * JRuby 9.4.2.0
+  * JRuby 10.0.4.0
 
 ## Semver
 

data/Rakefile

@@ -15,6 +15,25 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/test_*.rb']
 end
 
+task 'test:smoke' do
+  ENV['SMOKE_TEST'] = '1'
+end
+
+Rake::TestTask.new('test:smoke') do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/smoke/test_*.rb']
+end
+
+Rake::TestTask.new('test:integration') do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/integration/test_*.rb']
+end
+
+Rake::TestTask.new('test:e2e') do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/e2e/test_*.rb']
+end
+
 task :default => :test
 
 desc "Run tests for only a single region. Do not provide sub regions. Example (without quotes): 'rake test_region jp'"

data/doc/MAINTAINERS.md

@@ -55,15 +55,13 @@ sections below.
   * If all of the tests pass, update the `lib/holidays/version.rb` file to the new version. Reference the above [semver](http://semver.org/) rules for how to update versions.
   * Make a branch on your fork and update the [CHANGELOG](../CHANGELOG.md) to reflect the latest changes. You do not need to put in all of the definition changes in this update, you can simply reference the other repository. See other entries in the CHANGELOG for examples.
   * Open a PR against the new branch and merge it (another maintainer will need to review before you can merge)
-  * Once the branch is merged, pull down the latest master from Github and run `make build`. This will generate a new `gem` file with the new version. The new version number is pulled from the above `version.rb` update.
-  * If the build was successful then you can run the following to push up to rubygems.org: `GEM=<gem> make push`. Example: `GEM=holidays-6.2.0.gem make push`
+  * Once the branch is merged, the release GitHub Actions workflow will automatically build the gem and push it to rubygems.org. No local steps are required.
 * Does this update require functionality additions or bug fixes? If YES, then:
   * Run `make test` and ensure that all of the tests pass. If any tests fail then do *not* merge and contact a [core member](https://github.com/orgs/holidays/teams/core/members) for assistance.
   * If all of the tests pass, make a branch on your fork and update the [CHANGELOG](../CHANGELOG.md) to reflect the latest changes.
   * Update the `lib/holidays/version.rb` file to the new version. Reference the above [semver](http://semver.org/) rules for how to update versions.
   * Open a PR against the new branch and merge it (another maintainer will need to review before you can merge)
-  * Once the branch is merged, pull down the latest master from Github and run `make build`. This will generate a new `gem` file with the new version. The new version number is pulled from the above `version.rb` update.
-  * If the build was successful then you can run the following to push up to rubygems.org: `GEM=<gem> make push`. Example: `GEM=holidays-6.2.0.gem make push`
+  * Once the branch is merged, the release GitHub Actions workflow will automatically build the gem and push it to rubygems.org. No local steps are required.
 
 You are done! The latest version should be uploaded to rubygems.org. You can go to view the [holidays page](https://rubygems.org/gems/holidays) to verify that the latest version is available.
 

data/holidays.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.licenses      = ['MIT']
   gem.required_ruby_version = '>= 3.2'
-  gem.add_development_dependency 'bundler', '>= 2'
+  gem.add_development_dependency 'bundler', '>= 4'
   gem.add_development_dependency 'rake', '~> 13'
   gem.add_development_dependency 'simplecov', '~> 0.16'
   gem.add_development_dependency 'test-unit', '~> 3'
-  gem.add_development_dependency 'mocha', '~> 2'
-  gem.add_development_dependency 'pry', '~> 0.12'
+  gem.add_development_dependency 'mocha', '~> 3'
+  gem.add_development_dependency 'pry', '~> 0.16'
 end

data/lib/generated_definitions/bg.rb

@@ -17,8 +17,9 @@ module Holidays
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Holy Saturday", :regions => [:bg_en]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Велика събота", :regions => [:bg_bg]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:bg_en]},
-            {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Възкресение Христово. Великден", :regions => [:bg_bg, :bg_bg]},
-            {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:bg_en]}],
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Възкресение Христово. Великден", :regions => [:bg_bg]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:bg_en]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Великденски понеделник", :regions => [:bg_bg]}],
       1 => [{:mday => 1, :name => "New Year's Day", :regions => [:bg_en]},
             {:mday => 1, :name => "Нова година", :regions => [:bg_bg]}],
       3 => [{:mday => 3, :name => "Liberation Day", :regions => [:bg_en]},

data/lib/generated_definitions/cy.rb

@@ -25,7 +25,8 @@ module Holidays
       4 => [{:mday => 1, :name => "Εθνική Ημέρα Κύπρου", :regions => [:cy]}],
       5 => [{:mday => 1, :name => "Πρωτομαγιά", :regions => [:cy]}],
       8 => [{:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:cy]}],
-      10 => [{:mday => 28, :name => "Επέτειος του Όχι", :regions => [:cy]}],
+      10 => [{:mday => 1, :name => "Ημέρα Ανεξαρτησίας της Κύπρου", :regions => [:cy]},
+            {:mday => 28, :name => "Επέτειος του Όχι", :regions => [:cy]}],
       12 => [{:mday => 25, :name => "Χριστούγεννα", :regions => [:cy]},
             {:mday => 26, :name => "Δεύτερη ημέρα των Χριστουγέννων", :regions => [:cy]}]
       }

data/lib/generated_definitions/europe.rb

@@ -154,8 +154,9 @@ module Holidays
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Holy Saturday", :regions => [:bg_en]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => -1, :name => "Велика събота", :regions => [:bg_bg]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:bg_en]},
-            {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Възкресение Христово. Великден", :regions => [:bg_bg, :bg_bg]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :name => "Възкресение Христово. Великден", :regions => [:bg_bg]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:bg_en]},
+            {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Великденски понеделник", :regions => [:bg_bg]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Великдень", :regions => [:ua]},
             {:function => "orthodox_easter(year)", :function_arguments => [:year], :function_modifier => 49, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Трійця", :regions => [:ua]}],
       1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:at]},

data/lib/holidays/definition/context/function_processor.rb

@@ -12,7 +12,7 @@ module Holidays
         def call(input, func_id, desired_func_args, func_modifier = nil)
           validate!(input, func_id, desired_func_args)
 
-          function = @custom_methods_repo.find(func_id)
+          function = @custom_methods_repo.find(func_id, input[:region])
           raise Holidays::FunctionNotFound.new("Unable to find function with id '#{func_id}'") if function.nil?
 
           calculate(input, function, parse_arguments(input, desired_func_args), func_modifier)

data/lib/holidays/definition/context/merger.rb

@@ -9,12 +9,28 @@ module Holidays
           @custom_methods_repo = custom_methods_repo
         end
 
-        def call(target_regions, target_holidays, target_custom_methods)
-          #FIXME Does this need to come in this exact order? God I hope not.
-          # If not then we should swap the order so it matches the init.
+        def call(target_regions, target_holidays, target_custom_methods, target_custom_method_sources = {})
           @regions_repo.add(target_regions)
           @holidays_repo.add(target_holidays)
-          @custom_methods_repo.add(target_custom_methods)
+          @custom_methods_repo.add(
+            target_custom_methods,
+            target_custom_method_sources,
+            derive_function_regions(target_holidays),
+          )
+        end
+
+        private
+
+        # Builds a map of {func_id => [regions]} from the holiday definitions
+        # so the custom_methods repo knows which regions each function belongs to.
+        def derive_function_regions(holidays_by_month)
+          holidays_by_month.each_with_object({}) do |(_, definitions), result|
+            definitions.each do |defn|
+              next unless defn[:function]
+              result[defn[:function]] ||= []
+              result[defn[:function]] |= Array(defn[:regions])
+            end
+          end
         end
       end
     end

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

@@ -4,21 +4,49 @@ module Holidays
       class CustomMethods
         def initialize
           @custom_methods = {}
+          @custom_method_sources = {}
+          @regional_overrides = {}
         end
 
-        # This performs a merge that overwrites any conflicts.
-        # While this is not ideal I'm leaving it as-is since I have no
-        # evidence of any current definitions that will cause an issue.
-        #
-        # FIXME: this should probably return an error if a method with the
-        # same ID already exists.
-        def add(new_custom_methods)
+        # When a conflict is detected the method is stored as a regional override keyed by its regions.
+        # find() then resolves the right implementation at lookup time using the queried region.
+        def add(new_custom_methods, new_sources = {}, function_regions = {})
           raise ArgumentError if new_custom_methods.nil?
-          @custom_methods.merge!(new_custom_methods)
+
+          new_custom_methods.each do |key, method|
+            new_source = new_sources[key]
+
+            if @custom_methods.key?(key)
+              existing_source = @custom_method_sources[key]
+
+              if new_source && existing_source && new_source != existing_source
+                regions = function_regions[key] || []
+                @regional_overrides[key] ||= []
+                @regional_overrides[key] << { regions: regions, proc: method }
+              else
+                @custom_methods[key] = method
+                @custom_method_sources[key] = new_source if new_source
+              end
+            else
+              @custom_methods[key] = method
+              @custom_method_sources[key] = new_source if new_source
+            end
+          end
         end
 
-        def find(method_id)
+        # Returns the proc for the given method_id.
+        #
+        # When a region is supplied, regional overrides are checked first so
+        # that conflicting methods with the same name but different logic each
+        # resolve to their own implementation.
+        def find(method_id, region = nil)
           raise ArgumentError if method_id.nil? || method_id.empty?
+
+          if region && @regional_overrides[method_id]
+            override = @regional_overrides[method_id].find { |o| o[:regions].include?(region) }
+            return override[:proc] if override
+          end
+
           @custom_methods[method_id]
         end
       end

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

@@ -24,14 +24,19 @@ module Holidays
                   next unless @rules[:year_range].call(year, h[:year_ranges])
                 end
 
-                date = build_date(year, month, h)
-                next unless date
-
-                if observed_set?(options) && h[:observed]
-                  date = build_observed_date(date, regions, h)
+                dates = if h[:function]
+                  custom_holidays(year, month, h, regions)
+                else
+                  date = build_date(year, month, h, regions)
+                  date ? [date] : []
                 end
 
-                holidays << {:date => date, :name => h[:name], :regions => h[:regions]}
+                dates.each do |d|
+                  if observed_set?(options) && h[:observed]
+                    d = build_observed_date(d, regions, h)
+                  end
+                  holidays << {:date => d, :name => h[:name], :regions => h[:regions]}
+                end
               end
             end
           end
@@ -68,36 +73,50 @@ 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
+        def build_date(year, month, h, queried_regions)
+          current_month = month
+          current_day = h[:mday] || @day_of_month_calculator.call(year, month, h[:week], h[:wday])
 
           # 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(
-            #FIXME This seems like a bug, we seem to expect the day in here in the au defs?
-            build_custom_method_input(year, month, h[:mday], h[:regions]),
-            h[:function], h[:function_arguments], h[:function_modifier],
-          )
+        def custom_holidays(year, month, h, queried_regions)
+          effective_regions = queried_regions & h[:regions]
+          effective_regions = [queried_regions.first] if effective_regions.empty?
+
+          effective_regions.each_with_object([]) do |region, dates|
+            result = @custom_method_processor.call(
+              { year: year, month: month, day: h[:mday], region: region },
+              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
+            next if result.nil?
+
+            date = Date.civil(year, result.month, result.mday) rescue nil
+            dates << date if date
+          end.uniq
         end
 
-        def build_custom_method_input(year, month, day, regions)
+        # When the queried region is :any (or no holiday_regions are provided), fall back
+        # to the holiday's own first region. Otherwise use the first queried region that
+        # also appears in the holiday's region list so that region-specific function
+        # implementations resolve correctly even when a holiday definition is shared across
+        # multiple regions.
+        def build_custom_method_input(year, month, day, queried_regions, holiday_regions = nil)
+          effective_region = if holiday_regions.nil? || queried_regions.include?(:any)
+            queried_regions.first
+          else
+            (queried_regions & holiday_regions).first || holiday_regions.first
+          end
+
           {
             year: year,
             month: month,
             day: day,
-            region: regions.first, #FIXME This isn't ideal but will work for our current use case...
+            region: effective_region,
           }
         end
 

data/lib/holidays/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = '9.1.0'
+  VERSION = '9.1.2'
 end

data/lib/holidays.rb

@@ -42,9 +42,8 @@ module Holidays
 
       raise ArgumentError if end_date < start_date
 
-      if cached_holidays = Factory::Definition.cache_repository.find(start_date, end_date, options)
-        return cached_holidays
-      end
+      cached_holidays = Factory::Definition.cache_repository.find(start_date, end_date, options)
+      return cached_holidays unless cached_holidays.nil?
 
       Factory::Finder.between.call(start_date, end_date, options)
     end
@@ -93,11 +92,17 @@ module Holidays
     def load_custom(*files)
       regions, rules_by_month, custom_methods, _ = Factory::Definition.file_parser.parse_definition_files(files)
 
+      # Capture source code before converting entities to Procs so the merger
+      # can detect genuine conflicts (same name, different logic).
+      method_sources = custom_methods.each_with_object({}) do |(key, entity), h|
+        h[key] = entity.source
+      end
+
       custom_methods.each do |method_key, method_entity|
         custom_methods[method_key] = Factory::Definition.custom_method_proc_decorator.call(method_entity)
       end
 
-      Factory::Definition.merger.call(regions, rules_by_month, custom_methods)
+      Factory::Definition.merger.call(regions, rules_by_month, custom_methods, method_sources)
 
       rules_by_month
     end

data/test/coverage_report.rb

@@ -1,10 +1,8 @@
 require 'simplecov'
 
-# 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
+# JRuby coverage reporting is inaccurate without --debug mode, resulting in
+# artificially low numbers. Skip the minimum coverage check under JRuby.
+SimpleCov.minimum_coverage 89 unless RUBY_PLATFORM == 'java' || ENV['SMOKE_TEST']
 
 SimpleCov.add_filter [
   # Apparently simplecov doesn't automatically filter 'spec' or 'test' so we

data/test/data/test_date_transform_conflict_region_1.yaml

@@ -0,0 +1,14 @@
+months:
+  1:
+  - name: Weekend Holiday
+    regions: [date_transform_conflict_1]
+    mday: 1
+    function: to_nearest_upcoming_weekend_day(date)
+
+methods:
+  to_nearest_upcoming_weekend_day:
+    arguments: date
+    ruby: |
+      days_until = (6 - date.wday) % 7
+      days_until = 7 if days_until == 0
+      date + days_until

data/test/data/test_date_transform_conflict_region_2.yaml

@@ -0,0 +1,14 @@
+months:
+  1:
+  - name: Weekend Holiday
+    regions: [date_transform_conflict_2]
+    mday: 1
+    function: to_nearest_upcoming_weekend_day(date)
+
+methods:
+  to_nearest_upcoming_weekend_day:
+    arguments: date
+    ruby: |
+      days_until = (7 - date.wday) % 7
+      days_until = 7 if days_until == 0
+      date + days_until

data/test/e2e/README.md

@@ -0,0 +1,52 @@
+# End-to-end tests
+
+End-user behavioral checks against the **real upstream definitions** in
+`/definitions`. These tests load actual region data and assert specific
+holiday names, dates, counts, and observed-date behavior, the kinds of
+expectations a consumer of the gem would care about.
+
+## Purpose
+
+These tests verify that the full pipeline, from upstream YAML through
+generation through gem processing to the public API, produces the results
+an end user expects for real-world regions. They complement fixture-based
+integration tests by catching content regressions in the gem's interaction
+with real definitions.
+
+## E2E tests vs. integration vs. smoke
+
+- **Smoke** (`test/smoke/`): only asserts nothing crashes. Run from the
+  upstream `holidays/definitions` CI.
+- **Integration** (`test/integration/`): verifies gem-wide behavior using
+  controlled fixture YAMLs. Stable across definitions changes.
+- **E2E** (this directory): verifies end-user-perceived behavior using real
+  upstream definitions. Expected to break when upstream definitions change,
+  on purpose.
+
+## Important
+
+These tests are tightly coupled to the contents of `/definitions`. When you
+update the definitions submodule and an upstream change shifts a holiday name,
+date, or count, the corresponding e2e test must be updated to match. That is
+working as intended: the test is the gem's record of what end users see, so
+updating it is part of accepting the upstream change.
+
+This directory is **not** run by the upstream `holidays/definitions` CI. Doing
+so would create a dependency loop where the definitions repo cannot ship a
+legitimate content change without also updating tests in this repo first.
+
+## What belongs here
+
+- Tests that assert specific holidays exist on specific dates for specific
+  regions using real definitions (e.g. `:ca` returns "Labour Day" on Sept 1, 2008).
+- Tests of observed-date behavior against real region rules.
+- Tests of sub-region inheritance, wildcards (`:ca_`), `:any`, and cross-region
+  conflicts using real data.
+- Region-count or holiday-count assertions for specific year/region combinations.
+
+## What does NOT belong here
+
+- Tests that don't depend on real definitions content. Those belong in
+  `integration/` (with fixtures) or `smoke/` (structural only).
+- Tests of a single file or class in isolation. Those are unit tests and
+  belong next to the code they cover.

data/test/e2e/data/test_multiple_regions_with_conflicts_region_3.yaml

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

data/test/{integration → e2e}/test_holidays.rb

@@ -237,7 +237,8 @@ class HolidaysTests < Test::Unit::TestCase
   end
 
   def test_load_all
-    Holidays.load_all
-    assert_equal 286, Holidays.available_regions.count
+    assert_nothing_raised do
+      Holidays.load_all
+    end
   end
 end