Merge branch '1.0.x' to capture FutureParser tests and removal of tests/init.pp

Author: Travis Fields

spec/acceptance/exec_powershell_spec.rb

@@ -3,13 +3,13 @@
 describe 'powershell provider:' do #, :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   shared_examples 'should fail' do |manifest, error_check|
     it 'should throw an error' do
-      expect { apply_manifest(manifest, :catch_failures => true) }.to raise_error(error_check)
+      expect { apply_manifest(manifest, :catch_failures => true, :future_parser => FUTURE_PARSER) }.to raise_error(error_check)
     end
   end
 
   shared_examples 'apply success' do |manifest|
     it 'should succeed' do
-      apply_manifest(manifest, :catch_failures => true)
+      apply_manifest(manifest, :catch_failures => true, :future_parser => FUTURE_PARSER)
     end
   end
 
@@ -24,10 +24,10 @@
     MANIFEST
     it 'should not error on first run' do
       # Run it twice and test for idempotency
-      apply_manifest(p1, :catch_failures => true)
+      apply_manifest(p1, :catch_failures => true, :future_parser => FUTURE_PARSER)
     end
     it 'should be idempotent' do
-      expect(apply_manifest(p1, :catch_failures => true).exit_code).to be_zero
+      expect(apply_manifest(p1, :catch_failures => true, :future_parser => FUTURE_PARSER).exit_code).to be_zero
     end
   end
 
@@ -41,7 +41,7 @@
     MANIFEST
 
     describe file('c:/services.txt') do
-      apply_manifest(p2, :catch_failures => true)
+      apply_manifest(p2, :catch_failures => true, :future_parser => FUTURE_PARSER)
       it { should be_file }
       its(:content) { should match /puppet/ }
     end
@@ -69,7 +69,7 @@
     }
     MANIFEST
     describe file('c:/temp/services.csv') do
-      apply_manifest(p2, :catch_failures => true)
+      apply_manifest(p2, :catch_failures => true, :future_parser => FUTURE_PARSER)
       it { should be_file }
       its(:content) { should match /puppet/ }
     end
@@ -91,7 +91,7 @@
     }
     MANIFEST
     describe file(outfile) do
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_failures => true, :future_parser => FUTURE_PARSER)
       it { should be_file }
       its(:content) { should match /svchost/ }
     end
@@ -120,7 +120,7 @@
       }
     MANIFEST
     it 'should not fail' do
-      apply_manifest(padmin, :catch_failures => true)
+      apply_manifest(padmin, :catch_failures => true, :future_parser => FUTURE_PARSER)
     end
   end
 

spec/spec_helper_acceptance.rb

@@ -3,13 +3,14 @@
 
 
 UNSUPPORTED_PLATFORMS = ['debian', 'ubuntu', 'Solaris']
+FUTURE_PARSER = ENV['FUTURE_PARSER'] == 'true' || false
 
 unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
   is_foss = (ENV['IS_PE'] == 'no' || ENV['IS_PE'] == 'false') ? true : false
   if hosts.first.is_pe? && !is_foss
     install_pe
   else
-    version = ENV['PUPPET_VERSION'] || '3.6.2'
+    version = ENV['PUPPET_VERSION'] || '3.7.1'
     download_url = ENV['WIN_DOWNLOAD_URL'] || 'http://downloads.puppetlabs.com/windows/'
     hosts.each do |host|
       if host['platform'] =~ /windows/i