Merge pull request #251 from ThoughtCrhyme/WIN-280

(WIN-280) add skip() unless pattern to tests

Author: michaeltlombardi

spec/integration/puppet_x/puppetlabs/powershell_manager_spec.rb

@@ -178,8 +178,12 @@ def close_stream(stream, style = :inprocess)
         expect_different_manager_returned_than(manager, first_pid)
       end
 
-      context "on Windows", :if => Puppet::Util::Platform.windows? do
+      context "on Windows" do
         # On Windows we're using named pipes so these tests only apply on Windows.
+        before :each do
+          skip('Not on Windows platform') unless Puppet::Util::Platform.windows?   
+        end
+
         it "should create a new PowerShell manager host if the input stream is closed" do
           first_pid = manager.execute('[Diagnostics.Process]::GetCurrentProcess().Id')[:stdout]
 
@@ -655,12 +659,13 @@ def output_cmdlet(ps_command, ps_args)
       expect(result[:errormessage]).to match(/Working directory .+ does not exist/)
     end
 
-    it "should allow forward slashes in working directory", :if => Puppet::Util::Platform.windows? do
+    it "should allow forward slashes in working directory" do
+      skip('Not on Windows platform') unless Puppet::Util::Platform.windows?
       # Backslashes only apply on Windows filesystems
       work_dir = ENV["WINDIR"]
       forward_work_dir = work_dir.gsub('\\','/')
 
-      result = manager.execute('(Get-Location).Path',nil,work_dir)[:stdout]
+      result = manager.execute('(Get-Location).Path',nil,forward_work_dir)[:stdout]
 
       expect(result).to eq("#{work_dir}#{line_end}")
     end
@@ -810,18 +815,22 @@ def output_cmdlet(ps_command, ps_args)
 end
 end
 
-if Puppet::Util::Platform.windows? && PuppetX::PowerShell::PowerShellManager.supported?
-  describe "On Windows PowerShell" do
-    it_should_behave_like "a PowerShellManager",
-      Puppet::Type.type(:exec).provider(:powershell).command(:powershell),
-      Puppet::Type.type(:exec).provider(:powershell).powershell_args
+describe "On Windows PowerShell" do
+  before :each do
+    skip unless Puppet::Util::Platform.windows? && PuppetX::PowerShell::PowerShellManager.supported?
   end
+
+  it_should_behave_like "a PowerShellManager",
+    Puppet::Type.type(:exec).provider(:powershell).command(:powershell),
+    Puppet::Type.type(:exec).provider(:powershell).powershell_args
 end
 
-if PuppetX::PowerShell::PowerShellManager.supported_on_pwsh? && !Puppet::Type.type(:exec).provider(:pwsh).new().get_pwsh_command.nil?
-  describe "On PowerShell Core" do
-    it_should_behave_like "a PowerShellManager",
-      Puppet::Type.type(:exec).provider(:pwsh).new().get_pwsh_command,
-      Puppet::Type.type(:exec).provider(:pwsh).new().pwsh_args
+describe "On PowerShell Core" do
+  before :each do
+    skip unless PuppetX::PowerShell::PowerShellManager.supported_on_pwsh? && !Puppet::Type.type(:exec).provider(:pwsh).new().get_pwsh_command.nil?
   end
+
+  it_should_behave_like "a PowerShellManager",
+    Puppet::Type.type(:exec).provider(:pwsh).new().get_pwsh_command,
+    Puppet::Type.type(:exec).provider(:pwsh).new().pwsh_args
 end

spec/unit/provider/exec/powershell_spec.rb

@@ -141,7 +141,11 @@
   end
 
   describe 'when specifying a working directory' do
-    describe 'that does not exist on Windows', :if => Puppet.features.microsoft_windows? do
+    describe 'that does not exist on Windows' do
+      before :each do
+        skip('Not on Windows platform') unless Puppet.features.microsoft_windows?
+      end
+
       # This working directory error is specific to the PowerShell manager on Windows.
       let(:work_dir)  { "#{ENV['SYSTEMROOT']}\\some\\directory\\that\\does\\not\\exist" }
       let(:command)  { 'exit 0' }
@@ -154,7 +158,7 @@
     end
   end
 
-  describe 'when applying a catalog', :if => Puppet.features.microsoft_windows? do
+  describe 'when applying a catalog' do
     let(:manifest) { <<-MANIFEST
       exec { 'PS':
         command   => 'exit 0',
@@ -165,6 +169,7 @@
     let(:tmpdir) { Dir.mktmpdir('statetmp').encode!(Encoding::UTF_8) }
 
     before :each do
+      skip('Not on Windows platform') unless Puppet.features.microsoft_windows?
       # a statedir setting must now exist per the new transactionstore code
       # introduced in Puppet 4.6 for corrective changes, as a new YAML file
       # called transactionstore.yaml will be written under this path

spec/unit/provider/exec/pwsh_spec.rb

@@ -55,7 +55,8 @@ def execute_resource(*_args)
         provider.run_spec_override(command)
       end
 
-      it "should quote the path to the temp file", :if => Puppet.features.microsoft_windows? do
+      it "should quote the path to the temp file" do
+        skip('Not on Windows platform') unless Puppet.features.microsoft_windows?
         # Path quoting is only required on Windows
         path = 'C:\Users\albert\AppData\Local\Temp\puppet-powershell20130715-788-1n66f2j.ps1'
 

spec/unit/puppet_x/puppetlabs/powershell/compatible_powershell_version_spec.rb

@@ -4,8 +4,9 @@
 require 'puppet_x/puppetlabs/powershell/powershell_version'
 require 'puppet_x/puppetlabs/powershell/compatible_powershell_version'
 
-describe PuppetX::PuppetLabs::PowerShell::CompatiblePowerShellVersion, :if => Puppet::Util::Platform.windows? do
+describe PuppetX::PuppetLabs::PowerShell::CompatiblePowerShellVersion do
   before(:each) do
+    skip('Not on Windows platform') unless Puppet.features.microsoft_windows?
     @compat = PuppetX::PuppetLabs::PowerShell::CompatiblePowerShellVersion
   end
 

spec/unit/puppet_x/puppetlabs/powershell/powershell_version_spec.rb

@@ -3,8 +3,9 @@
 require 'puppet/type'
 require 'puppet_x/puppetlabs/powershell/powershell_version'
 
-describe PuppetX::PuppetLabs::PowerShell::PowerShellVersion, :if => Puppet::Util::Platform.windows? do
+describe PuppetX::PuppetLabs::PowerShell::PowerShellVersion do
   before(:each) do
+    skip('Not on Windows platform') unless Puppet.features.microsoft_windows?
     @ps = PuppetX::PuppetLabs::PowerShell::PowerShellVersion
   end