summaryrefslogtreecommitdiff
path: root/spec/spec_helper_acceptance.rb
diff options
context:
space:
mode:
authorHunter Haugen <hunter@puppetlabs.com>2015-08-10 16:15:54 -0700
committerHunter Haugen <hunter@puppetlabs.com>2015-08-10 16:30:27 -0700
commitdfa98b89f7a5513cccc5a4ded4b119dee39d1a59 (patch)
treef442a3edeb8a4432014124898303844f55df76e4 /spec/spec_helper_acceptance.rb
parent061d0c29fc54391f3e713e9ed76da3933b19083b (diff)
Prep 4.8.0
Diffstat (limited to 'spec/spec_helper_acceptance.rb')
-rwxr-xr-xspec/spec_helper_acceptance.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 03ff993..406fcb6 100755
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -35,15 +35,13 @@ end
RSpec.shared_context "with faked facts" do
let(:facts_d) do
- puppet_version = (on default, puppet('--version')).output.chomp
- if Puppet::Util::Package.versioncmp(puppet_version, '4.0.0') < 0 && fact('is_pe', '--puppet') == "true"
- if fact('osfamily') =~ /windows/i
- if fact('kernelmajversion').to_f < 6.0
- 'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d'
- else
- 'C:/ProgramData/PuppetLabs/facter/facts.d'
- end
+ if fact('osfamily') =~ /windows/i
+ if fact('kernelmajversion').to_f < 6.0
+ 'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d'
else
+ 'C:/ProgramData/PuppetLabs/facter/facts.d'
+ end
+ elsif fact('is_pe', '--puppet') == "true"
'/etc/puppetlabs/facter/facts.d'
end
else