rspec-puppet-facts.rb in simp-rspec-puppet-facts-3.6.1

- old
+ new

@@ -74,10 +74,11 @@
     masked_opts = filter_opts(opts, simp_h)
 
     rfh_h = {}
     rfh_h = Simp::RspecPuppetFacts::Shim.on_supported_os(masked_opts) unless masked_opts[:supported_os]&.empty?
 
-    merged_os_hash = rfh_h.merge(simp_h)
+    #merged_os_hash = rfh_h.merge(simp_h)  # we should NOT merge default facterdb factsets
+    merged_os_hash = simp_h
     h = merged_os_hash.select{|k,v| supported_os_strings(opts, merged_os_hash.keys).include? k}
 
     h.each do | os, facts |
       facter_ver=Facter.version.split('.')[0..1].join('.')
       facts_file = File.expand_path("../../facts/#{facter_ver}/#{os}.facts",