diff options
| author | Igor Galić <i.galic@brainsware.org> | 2016-08-08 11:58:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-08 11:58:23 +0200 |
| commit | 1eda53a61567b6997bd0c01ee0d1693e15f2a9dc (patch) | |
| tree | b15b307a9d6e58698af9024f7686d6a60215607b /spec/spec_helper.rb | |
| parent | ea30561975cccbb589dfccc230f57158753fdd29 (diff) | |
| parent | fb6169672668208972ef8755418100c1c32b318e (diff) | |
Merge pull request #68 from voxpupuli/modulesync
modulesync 0.11.1
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |