Merge pull request #488 from cyberious/master

(maint) Fix test to not assume is_pe fact on > 4.0.0 puppet

Author: hunner

spec/acceptance/fqdn_rand_string_spec.rb

@@ -4,7 +4,8 @@
 describe 'fqdn_rand_string function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
   describe 'success' do
     let(:facts_d) do
-      if fact('is_pe', '--puppet') == "true"
+      puppet_version = (on default, puppet('--version')).output.chomp
+      if puppet_version < '4.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'

spec/acceptance/fqdn_rotate_spec.rb

@@ -4,7 +4,8 @@
 describe 'fqdn_rotate function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
   describe 'success' do
     let(:facts_d) do
-      if fact('is_pe', '--puppet') == "true"
+      puppet_version = (on default, puppet('--version')).output.chomp
+      if puppet_version < '4.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'