Merge pull request #500 from hunner/prep_4.8.0

Prep 4.8.0

2 files changed, 7 insertions, 9 deletions

diff --git a/spec/acceptance/ensure_resource_spec.rb b/spec/acceptance/ensure_resource_spec.rb
index 1cee53d..fe619a9 100755
--- a/spec/acceptance/ensure_resource_spec.rb
+++ b/spec/acceptance/ensure_resource_spec.rb
@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'ensure_resource function', :unless => fact('osfamily') =~ /windows/i do
+describe 'ensure_resource function', :unless => fact('osfamily') =~ /(windows|Suse)/i do
   describe 'success' do
     it 'ensure_resource a package' do
       apply_manifest('package { "rake": ensure => absent, provider => "gem", }')
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