From fb6169672668208972ef8755418100c1c32b318e Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 8 Aug 2016 10:57:39 +0200 Subject: modulesync 0.12.0 --- spec/spec_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 92c8cbe..2d8b165 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,8 +7,8 @@ RSpec.configure do |c| puppetversion: Puppet.version, facterversion: Facter.version } - default_facts += YAML.read_file('default_facts.yml') if File.exist?('default_facts.yml') - default_facts += YAML.read_file('default_facts.yml') if File.exist?('default_module_facts.yml') + default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__)) + default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__)) c.default_facts = default_facts end -- cgit v1.2.3