diff options
| author | Shubham Shinde <shubham.shinde@perforce.com> | 2024-06-12 21:18:02 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 21:18:02 +0530 |
| commit | a26f3eacc2e522286325df3441c7f2640af5d31e (patch) | |
| tree | 960b681a06d90bd48f353043efa63f0b684ebd44 /spec/spec_helper.rb | |
| parent | ba087586f36dbaa843a51c5aefd4542eca7ed6b0 (diff) | |
| parent | 3c62ed96375510ab568b6d1924122f0c5d87a0c7 (diff) | |
| download | puppet-mailalias_core-a26f3eacc2e522286325df3441c7f2640af5d31e.tar.gz puppet-mailalias_core-a26f3eacc2e522286325df3441c7f2640af5d31e.tar.bz2 | |
Merge pull request #54 from mhashizume/maint/main/beaker-bump
Beaker bump and PDK update
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6820ceb..ae7c1f6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -25,7 +25,8 @@ default_fact_files.each do |f| next unless File.exist?(f) && File.readable?(f) && File.size?(f) begin - default_facts.merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true)) + require 'deep_merge' + default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true)) rescue StandardError => e RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}" end @@ -33,7 +34,7 @@ end # read default_facts and merge them over what is provided by facterdb default_facts.each do |fact, value| - add_custom_fact fact, value + add_custom_fact fact, value, merge_facts: true end RSpec.configure do |c| |