Merge pull request #530 from puppetlabs/maint-opt_for_merge

(maint) - Opt for merge
puppetlabs · Jul 19, 2023 · 7222575 · 7222575
2 parents 9b627e8 + beeb79a
commit 7222575
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/moduleroot/spec/spec_helper.rb.erb b/moduleroot/spec/spec_helper.rb.erb
@@ -27,7 +27,7 @@ default_fact_files.each do |f|
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
+    default_facts.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