Merge pull request #298 from puppetlabs/maint/remove_ps_interpolate_method

(maint) Remove interpolate_powershell method

Author: sheenaajay

spec/acceptance/exec_powershell_spec.rb

@@ -243,8 +243,8 @@
     }
 
     after(:each) do
-      run_shell(interpolate_powershell("Remove-Item Env:\\superspecial -ErrorAction Ignore;exit 0"))
-      run_shell(interpolate_powershell("Remove-Item Env:\\outside -ErrorAction Ignore;exit 0"))
+      run_shell(PuppetLitmus::Util.interpolate_powershell("Remove-Item Env:\\superspecial -ErrorAction Ignore;exit 0"))
+      run_shell(PuppetLitmus::Util.interpolate_powershell("Remove-Item Env:\\outside -ErrorAction Ignore;exit 0"))
     end
 
     it 'should not see environment variable from previous run' do
@@ -258,7 +258,7 @@
     it 'should see environment variables set outside of session' do
       # Setup the environment variable outside of Puppet
 
-      run_shell(interpolate_powershell("$env:outside='1'"))
+      run_shell(PuppetLitmus::Util.interpolate_powershell("$env:outside='1'"))
 
       # Test to see if initial run sees the environment variable
       apply_manifest(envar_leak_test_pp, expect_changes: true)

spec/acceptance/exec_pwsh_spec.rb

@@ -280,8 +280,8 @@ def platform_string(windows, posix)
       after(:each) do
         # Due to https://tickets.puppetlabs.com/browse/BKR-1088, need to use different commands
         if windows_platform?
-          run_shell(interpolate_powershell("Remove-Item Env:\\superspecial -ErrorAction Ignore;exit 0"))
-          run_shell(interpolate_powershell("Remove-Item Env:\\outside -ErrorAction Ignore;exit 0"))
+          run_shell(PuppetLitmus::Util.interpolate_powershell("Remove-Item Env:\\superspecial -ErrorAction Ignore;exit 0"))
+          run_shell(PuppetLitmus::Util.interpolate_powershell("Remove-Item Env:\\outside -ErrorAction Ignore;exit 0"))
         else
           run_shell('unset superspecial')
           run_shell('unset outside')
@@ -301,7 +301,7 @@ def platform_string(windows, posix)
 
         # Due to https://tickets.puppetlabs.com/browse/BKR-1088, need to use different commands
         if windows_platform?
-          run_shell(interpolate_powershell("\$env:outside='1'"))
+          run_shell(PuppetLitmus::Util.interpolate_powershell("\$env:outside='1'"))
         else
           run_shell('export outside=1')
         end

spec/spec_helper_acceptance_local.rb

@@ -1,4 +1,5 @@
 require 'puppet_litmus'
+require 'puppet_litmus/util'
 require 'singleton'
 
 class Helper
@@ -32,7 +33,7 @@ def uninstall_pwsh
             when 'darwin'
               'brew cask uninstall powershell'
             when 'windows'
-              interpolate_powershell('Get-Command pwsh | ForEach-Object { Remove-Item -Path (Split-Path -Parent $_.Path) -Recurse -Force }')
+              PuppetLitmus::Util.interpolate_powershell('Get-Command pwsh | ForEach-Object { Remove-Item -Path (Split-Path -Parent $_.Path) -Recurse -Force }')
             end
   Helper.instance.run_shell(command)
 end
@@ -50,11 +51,6 @@ def cleanup_files
   Helper.instance.apply_manifest(absent_files_manifest, catch_failures: true)
 end
 
-def interpolate_powershell(command)
-  encoded_command = Base64.strict_encode64(command.encode('UTF-16LE'))
-  "powershell.exe -NoProfile -EncodedCommand #{encoded_command}"
-end
-
 def relative_folder(relative_path)
   expanded_path = File.expand_path(File.join(File.dirname(__FILE__), relative_path))
   Dir.open(expanded_path) if File.exist?(expanded_path)