Fix exclude windows test on ensure_package

Update to fix ensure_resource as well

Author: Travis Fields

spec/acceptance/ensure_packages_spec.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'ensure_packages function', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) || fact('osfamily') == 'windows') do
+describe 'ensure_packages function', :unless => fact('osfamily') =~ /windows/i do
   describe 'success' do
     it 'ensure_packages a package' do
       apply_manifest('package { "rake": ensure => absent, provider => "gem", }')

spec/acceptance/ensure_resource_spec.rb

@@ -1,8 +1,7 @@
 #! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-
-describe 'ensure_resource function', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) || fact('osfamily') == 'windows') do
+describe 'ensure_resource function', :unless => fact('osfamily') =~ /windows/ do
   describe 'success' do
     it 'ensure_resource a package' do
       apply_manifest('package { "rake": ensure => absent, provider => "gem", }')

spec/spec_helper_acceptance.rb

@@ -8,9 +8,13 @@
     install_pe
     on hosts, 'mkdir -p /etc/puppetlabs/facter/facts.d'
   else
-    install_puppet
-    on hosts, 'mkdir -p /etc/facter/facts.d'
-    on hosts, '/bin/touch /etc/puppet/hiera.yaml'
+    install_puppet :version => (ENV['PUPPET_VERSION'] ? ENV['PUPPET_VERSION'] : '3.7.2')
+    hosts.each do |host|
+      if host['platform'] !~ /windows/i
+        on host, 'mkdir -p /etc/facter/facts.d'
+        on host, '/bin/touch /etc/puppet/hiera.yaml'
+      end
+    end
   end
   hosts.each do |host|
     on host, "mkdir -p #{host['distmoduledir']}"
@@ -31,15 +35,7 @@
       default[:default_apply_opts].merge!({:parser => 'future'})
     end
     hosts.each do |host|
-      if host['platform'] !~ /windows/i
-        copy_root_module_to(host, :source => proj_root, :module_name => 'stdlib')
-      end
-
-    end
-    hosts.each do |host|
-      if host['platform'] =~ /windows/i
-        on host, puppet('plugin download')
-      end
+      copy_root_module_to(host, :source => proj_root, :module_name => 'stdlib')
     end
   end
 end