beaker 4.38.1 → 4.40.0

data/spec/beaker/host/freebsd/pkg_spec.rb

@@ -24,9 +24,9 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { FreeBSDPkgTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { FreeBSDPkgTest.new(opts, logger) }
     let(:cond) do
       'TMPDIR=/dev/null ASSUME_ALWAYS_YES=1 PACKAGESITE=file:///nonexist pkg info -x "pkg(-devel)?\\$" > /dev/null 2>&1'
     end
@@ -48,6 +48,7 @@ module Beaker
         expect( instance ).to receive(:exec).with('',{:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.pkgng_active? ).to be true
       end
+
       it "returns false if pkgng is unavailable" do
         expect( instance ).to receive(:check_pkgng_sh).once.and_return("do you have pkgng?")
         expect( Beaker::Command ).to receive(:new).with("/bin/sh -c 'do you have pkgng?'", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
@@ -65,6 +66,7 @@ module Beaker
           instance.install_package('rsync')
         end
       end
+
       context "with pkgng" do
         it "runs the correct install command" do
           expect( instance ).to receive(:pkgng_active?).once.and_return(true)
@@ -84,6 +86,7 @@ module Beaker
           instance.check_for_package('rsync')
         end
       end
+
       context "with pkgng" do
         it "runs the correct checking command" do
           expect( instance ).to receive(:pkgng_active?).once.and_return(true)

data/spec/beaker/host/mac/exec_spec.rb

@@ -20,9 +20,9 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { MacExecTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { MacExecTest.new(opts, logger) }
 
     describe '#selinux_enabled?' do
       it 'does not call selinuxenabled' do

data/spec/beaker/host/mac_spec.rb

@@ -26,28 +26,28 @@ module Mac
       end
 
       it 'returns two strings that include the passed parameters' do
-        allow( host ).to receive( :link_exists? ) { true }
+        allow( host ).to receive( :link_exists? ).and_return(true)
         return1, return2 = host.puppet_agent_dev_package_info( 'pc1', 'pav1', :download_url => '' )
         expect( return1 ).to match( /pc1/ )
         expect( return2 ).to match( /pav1/ )
       end
 
       it 'gets the correct file type' do
-        allow( host ).to receive( :link_exists? ) { true }
+        allow( host ).to receive( :link_exists? ).and_return(true)
         _, return2 = host.puppet_agent_dev_package_info( 'pc2', 'pav2', :download_url => '' )
         expect( return2 ).to match( /\.dmg$/ )
       end
 
       it 'adds the version dot correctly if not supplied' do
         @platform = 'osx-10.12-x86_64'
-        allow( host ).to receive( :link_exists? ) { true }
+        allow( host ).to receive( :link_exists? ).and_return(true)
         release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC3', 'pav3', :download_url => '' )
         expect( release_path_end ).to match( /10\.12/ )
         expect( release_file ).to match( /10\.12/ )
       end
 
       it 'runs the correct install for osx platforms (newest link format)' do
-        allow( host ).to receive( :link_exists? ) { true }
+        allow( host ).to receive( :link_exists? ).and_return(true)
 
         release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC4', 'pav4', :download_url => '' )
         # verify the mac package name starts the name correctly
@@ -71,7 +71,7 @@ module Mac
       end
 
       it 'runs the correct install for osx platforms (old link format)' do
-        allow( host ).to receive( :link_exists? ) { false }
+        allow( host ).to receive( :link_exists? ).and_return(false)
 
         release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC8', 'pav8', :download_url => '' )
         # verify the mac package name starts the name correctly
@@ -84,7 +84,7 @@ module Mac
     end
 
     describe '#pe_puppet_agent_promoted_package_info' do
-      before :each do
+      before do
         @platform = "osx-10.15-x86_64"
       end
 

data/spec/beaker/host/pswindows/exec_spec.rb

@@ -20,9 +20,9 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { PSWindowsExecTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { PSWindowsExecTest.new(opts, logger) }
 
     context "rm" do
 
@@ -40,12 +40,12 @@ module Beaker
 
       it 'rm first' do
         expect(instance).to receive(:execute).with("del /s /q \"\\destination\\path\\of\\content\"").and_return(0)
-        expect(instance).to receive(:execute).with("move /y #{origin.gsub(/\//, '\\')} #{destination.gsub(/\//, '\\')}").and_return(0)
+        expect(instance).to receive(:execute).with("move /y #{origin.tr('/', '\\')} #{destination.tr('/', '\\')}").and_return(0)
         expect(instance.mv(origin, destination)).to eq(0)
       end
 
       it 'does not rm' do
-        expect( instance ).to receive(:execute).with("move /y #{origin.gsub(/\//, '\\')} #{destination.gsub(/\//, '\\')}").and_return(0)
+        expect( instance ).to receive(:execute).with("move /y #{origin.tr('/', '\\')} #{destination.tr('/', '\\')}").and_return(0)
         expect( instance.mv(origin, destination, false) ).to be === 0
       end
     end
@@ -57,6 +57,7 @@ module Beaker
 
       context 'file exists' do
         let(:stdout) { 'True' }
+
         it 'sets the modified_at date' do
           file = 'C:\path\to\file'
           expect(instance).to receive(:execute).with("powershell Test-Path #{file} -PathType Leaf")
@@ -69,6 +70,7 @@ module Beaker
 
       context 'file does not exist' do
         let(:stdout) { 'False' }
+
         it 'creates it and sets the modified_at date' do
           file = 'C:\path\to\file'
           expect(instance).to receive(:execute).with("powershell Test-Path #{file} -PathType Leaf")
@@ -104,6 +106,7 @@ module Beaker
         allow(instance).to receive(:execute)
                                .with(where_command, :accept_all_exit_codes => true).and_return(result)
       end
+
       let(:where_command) { "cmd /C \"where ruby\"" }
 
       context 'when only the environment variable PATH is used' do

data/spec/beaker/host/pswindows/file_spec.rb

@@ -20,13 +20,14 @@ module Beaker
       end
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { PSWindowsFileTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { PSWindowsFileTest.new(opts, logger) }
 
     describe '#cat' do
       let(:path) { '/path/to/cat' }
       let(:content) { 'file content' }
+
       it 'reads output for file' do
         expect(instance).to receive(:exec).and_return(double(stdout: content))
         expect(Beaker::Command).to receive(:new).with('powershell.exe', array_including("-Command type #{path}"))
@@ -36,6 +37,7 @@ module Beaker
 
     describe '#file_exist?' do
       let(:path) { '/path/to/test/file.txt' }
+
       context 'file exists' do
         it 'returns true' do
           expect(instance).to receive(:exec).and_return(double(stdout: "true\n"))
@@ -63,6 +65,7 @@ module Beaker
 
       context 'with dirname sent' do
         let(:name) { 'my_dir' }
+
         it 'returns the path to my_dir' do
           expect(Beaker::Command).to receive(:new).
             with('powershell.exe', array_including('-Command [System.IO.Path]::GetTempPath()')).

data/spec/beaker/host/pswindows_spec.rb

@@ -12,7 +12,7 @@ module PSWindows
     }
     let(:host)    {
       opts = options.merge(platform)
-      opts.merge!({ :is_cygwin => false })
+      opts[:is_cygwin] = false
       make_host( 'name', opts )
     }
 

data/spec/beaker/host/unix/exec_spec.rb

@@ -21,9 +21,9 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { UnixExecTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { UnixExecTest.new(opts, logger) }
 
     context "rm" do
 
@@ -65,7 +65,7 @@ module Beaker
       let(:host) { {'pathseparator' => ':'} }
 
       it 'returns a blank string if theres no env' do
-        expect( instance ).to receive( :is_powershell? ).never
+        expect( instance ).not_to receive( :is_powershell? )
         expect( instance.environment_string( {} ) ).to be == ''
       end
 
@@ -82,9 +82,9 @@ module Beaker
 
     describe '#ssh_permit_user_environment' do
       context 'When called without error' do
-        let (:directory) {'/directory'}
-        let (:ssh_command) {"echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"}
-        let (:ssh_move) {"mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"}
+        let(:directory) {'/directory'}
+        let(:ssh_command) {"echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"}
+        let(:ssh_move) {"mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"}
 
         platforms = PlatformHelpers::SYSTEMDPLATFORMS + PlatformHelpers::DEBIANPLATFORMS + PlatformHelpers::SYSTEMVPLATFORMS
 
@@ -96,7 +96,7 @@ module Beaker
             expect(Beaker::Command).to receive(:new).with(ssh_move)
             expect(Beaker::Command).to receive(:new).with(ssh_command)
             expect(instance).to receive(:ssh_service_restart)
-            expect{instance.ssh_permit_user_environment}.to_not raise_error
+            expect{instance.ssh_permit_user_environment}.not_to raise_error
           end
         end
       end
@@ -115,7 +115,7 @@ module Beaker
           opts['platform'] = platform
           expect(instance).to receive(:exec)
           expect(Beaker::Command).to receive(:new).with("systemctl restart sshd.service")
-          expect{instance.ssh_service_restart}.to_not raise_error
+          expect{instance.ssh_service_restart}.not_to raise_error
         end
       end
 
@@ -124,7 +124,7 @@ module Beaker
           opts['platform'] = platform
           expect(instance).to receive(:exec)
           expect(Beaker::Command).to receive(:new).with("service ssh restart")
-          expect{instance.ssh_service_restart}.to_not raise_error
+          expect{instance.ssh_service_restart}.not_to raise_error
         end
       end
 
@@ -133,7 +133,7 @@ module Beaker
           opts['platform'] = "#{platform}-arch"
           expect(instance).to receive(:exec)
           expect(Beaker::Command).to receive(:new).with("/sbin/service sshd restart")
-          expect{instance.ssh_service_restart}.to_not raise_error
+          expect{instance.ssh_service_restart}.not_to raise_error
         end
       end
 
@@ -230,13 +230,13 @@ module Beaker
       }
 
       # no-op response
-      let (:response) { double( 'response' ) }
-      let (:boot_time_initial_response) { double( 'response' ) }
+      let(:response) { double( 'response' ) }
+      let(:boot_time_initial_response) { double( 'response' ) }
 
-      let (:boot_time_success_response) { double( 'response' ) }
-      let (:sleep_time) { 10 }
+      let(:boot_time_success_response) { double( 'response' ) }
+      let(:sleep_time) { 10 }
 
-      before :each do
+      before do
         # stubs enough to survive the first boot_time call & output parsing
         #   note: just stubs input-chain between calls, parsing methods still run
         allow(Beaker::Command).to receive(:new).with('last -F reboot || who -b').and_return(:boot_time_command_stub)
@@ -253,8 +253,8 @@ module Beaker
         check_cmd_output.each do |check_os, cmd_opts|
           cmd_opts.each do |cmd_name, cmd_outputs|
             context "on '#{check_os}' with the '#{cmd_name}' command" do
-              let (:boot_time_initial_stdout) { cmd_outputs[:initial] }
-              let (:boot_time_success_stdout) { cmd_outputs[:success] }
+              let(:boot_time_initial_stdout) { cmd_outputs[:initial] }
+              let(:boot_time_success_stdout) { cmd_outputs[:success] }
 
               it 'passes with defaults' do
                 expect(instance).to receive(:sleep).with(sleep_time)
@@ -290,7 +290,7 @@ module Beaker
               end
 
               context 'command errors' do
-                before :each do
+                before do
                   allow(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).at_least(:once)
                 end
 
@@ -310,7 +310,7 @@ module Beaker
 
                 context 'incorrect time string' do
                   context 'original time' do
-                    let (:boot_time_initial_stdout) { 'boot bad' }
+                    let(:boot_time_initial_stdout) { 'boot bad' }
 
                     it 'raises a reboot failure' do
                       # Handle the 'retry'
@@ -323,7 +323,7 @@ module Beaker
                   end
 
                   context 'current time' do
-                    let (:boot_time_success_stdout) { 'boot bad' }
+                    let(:boot_time_success_stdout) { 'boot bad' }
 
                     it 'raises a reboot failure' do
                       expect(instance).to receive(:exec).with(:shutdown_command_stub, anything).and_return(response).once
@@ -345,8 +345,8 @@ module Beaker
         check_cmd_output.each do |check_os, cmd_opts|
           cmd_opts.each do |cmd_name, cmd_outputs|
             context "on '#{check_os}' with the '#{cmd_name}' command" do
-              let (:boot_time_initial_stdout) { cmd_outputs[:initial] }
-              let (:boot_time_success_stdout) { cmd_outputs[:initial] }
+              let(:boot_time_initial_stdout) { cmd_outputs[:initial] }
+              let(:boot_time_success_stdout) { cmd_outputs[:initial] }
 
               it 'raises RebootFailure' do
                 expect(instance).to receive(:sleep).with(sleep_time)
@@ -366,7 +366,7 @@ module Beaker
                 expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).once
                 expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_success_response).once
 
-                expect { instance.reboot(wait_time=sleep_time, max_connection_tries=9, boot_time_retries=10) }.to raise_error(Beaker::Host::RebootFailure, /Boot time did not reset/)
+                expect { instance.reboot(sleep_time, 9, 10) }.to raise_error(Beaker::Host::RebootFailure, /Boot time did not reset/)
               end
             end
           end

data/spec/beaker/host/unix/file_spec.rb

@@ -24,16 +24,16 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:platform) {
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:platform) {
       if @platform
         { 'platform' => Beaker::Platform.new( @platform) }
       else
         { 'platform' => Beaker::Platform.new( 'osx-10.9-x86_64' ) }
       end
     }
-    let (:instance) { UnixFileTest.new(opts.merge(platform), logger) }
+    let(:instance) { UnixFileTest.new(opts.merge(platform), logger) }
 
     describe '#repo_type' do
 
@@ -94,7 +94,7 @@ module Beaker
       ['centos','redhat'].each do |platform|
         it "sets the el portion correctly for '#{platform}'" do
           @platform = "#{platform}-5-x86_64"
-          allow( instance ).to receive( :is_pe? ) { false }
+          allow( instance ).to receive( :is_pe? ).and_return(false)
           filename = instance.repo_filename( 'pkg_name', 'pkg_version7' )
           expect( filename ).to match( /sion7\-el\-/ )
         end
@@ -102,21 +102,21 @@ module Beaker
 
       it 'sets the sles portion correctly for sles platforms' do
         @platform = 'sles-11-x86_64'
-        allow( instance ).to receive( :is_pe? ) { false }
+        allow( instance ).to receive( :is_pe? ).and_return(false)
         filename = instance.repo_filename( 'pkg_name', 'pkg_version7' )
         expect( filename ).to match( /sion7\-sles\-/ )
       end
 
       it 'sets the opensuse portion correctly for opensuse platforms' do
         @platform = 'opensuse-15-x86_64'
-        allow( instance ).to receive( :is_pe? ) { false }
+        allow( instance ).to receive( :is_pe? ).and_return(false)
         filename = instance.repo_filename( 'pkg_name', 'pkg_version7' )
         expect( filename ).to match( /sion7\-opensuse\-/ )
       end
 
       it 'builds the filename correctly for el-based platforms' do
         @platform = 'el-21-x86_64'
-        allow( instance ).to receive( :is_pe? ) { false }
+        allow( instance ).to receive( :is_pe? ).and_return(false)
         filename = instance.repo_filename( 'pkg_name', 'pkg_version8' )
         correct = 'pl-pkg_name-pkg_version8-el-21-x86_64.repo'
         expect( filename ).to be === correct
@@ -125,7 +125,7 @@ module Beaker
       it 'builds the filename correctly for redhatfips platforms' do
         @platform = 'el-7-x86_64'
         allow(instance).to receive(:[]).with('platform') { platform['platform'] }
-        expect(instance).to receive(:[]).with('packaging_platform') { 'redhatfips-7-x86_64' }
+        expect(instance).to receive(:[]).with('packaging_platform').and_return('redhatfips-7-x86_64')
         filename = instance.repo_filename('pkg_name', 'pkg_version')
         correct = 'pl-pkg_name-pkg_version-redhatfips-7-x86_64.repo'
         expect( filename ).to be === correct
@@ -133,7 +133,7 @@ module Beaker
 
       it 'adds in the PE portion of the filename correctly for el-based PE hosts' do
         @platform = 'el-21-x86_64'
-        allow( instance ).to receive( :is_pe? ) { true }
+        allow( instance ).to receive( :is_pe? ).and_return(true)
         filename = instance.repo_filename( 'pkg_name', 'pkg_version9' )
         correct = 'pl-pkg_name-pkg_version9-el-21-x86_64.repo'
         expect( filename ).to be === correct
@@ -155,7 +155,7 @@ module Beaker
 
       it 'adds wrlinux to variant on cisco platforms' do
         @platform = 'cisco_nexus-7-x86_64'
-        allow( instance ).to receive( :is_pe? ) { false }
+        allow( instance ).to receive( :is_pe? ).and_return(false)
         filename = instance.repo_filename( 'pkg_name', 'pkg_version12' )
         expect( filename ).to match( /sion12\-cisco\-wrlinux\-/ )
       end
@@ -194,8 +194,8 @@ module Beaker
     end
 
     describe '#chown' do
-      let (:user) { 'someuser' }
-      let (:path) { '/path/to/chown/on' }
+      let(:user) { 'someuser' }
+      let(:path) { '/path/to/chown/on' }
 
       it 'calls the system method' do
         expect( instance ).to receive( :execute ).with( "chown #{user} #{path}" ).and_return( 0 )
@@ -209,7 +209,8 @@ module Beaker
     end
 
     describe '#cat' do
-      let (:path) { '/path/to/cat/on' }
+      let(:path) { '/path/to/cat/on' }
+
       it 'calls cat for path' do
         expect( instance ).to receive( :execute ).with( "cat #{path}" ).and_return( 0 )
         expect( instance.cat( path ) ).to be === 0
@@ -239,8 +240,8 @@ module Beaker
     end
 
     describe '#chgrp' do
-      let (:group) { 'somegroup' }
-      let (:path) { '/path/to/chgrp/on' }
+      let(:group) { 'somegroup' }
+      let(:path) { '/path/to/chgrp/on' }
 
       it 'calls the system method' do
         expect( instance ).to receive( :execute ).with( "chgrp #{group} #{path}" ).and_return( 0 )
@@ -254,7 +255,7 @@ module Beaker
     end
 
     describe '#ls_ld' do
-      let (:path) { '/path/to/ls_ld' }
+      let(:path) { '/path/to/ls_ld' }
 
       it 'calls the system method' do
         expect( instance ).to receive( :execute ).with( "ls -ld #{path}" ).and_return( 0 )

data/spec/beaker/host/unix/pkg_spec.rb

@@ -28,9 +28,9 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { UnixPkgTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { UnixPkgTest.new(opts, logger) }
 
     context 'Package deployment tests' do
       path = '/some/file/path'
@@ -41,48 +41,48 @@ module Beaker
 
         it 'returns a warning if there is no file at the path specified' do
           expect(logger).to receive(:warn)
-          allow(File).to receive(:exists?).with(path).and_return(false)
+          allow(File).to receive(:exist?).with(path).and_return(false)
           instance.deploy_package_repo(path,name,version)
         end
 
         it 'calls #deploy_apt_repo for huaweios systems' do
           @opts = {'platform' => 'huaweios-is-me'}
           expect(instance).to receive(:deploy_apt_repo)
-          allow(File).to receive(:exists?).with(path).and_return(true)
+          allow(File).to receive(:exist?).with(path).and_return(true)
           instance.deploy_package_repo(path,name,version)
         end
 
         it 'calls #deploy_apt_repo for debian systems' do
           @opts = {'platform' => 'ubuntu-is-me'}
           expect(instance).to receive(:deploy_apt_repo)
-          allow(File).to receive(:exists?).with(path).and_return(true)
+          allow(File).to receive(:exist?).with(path).and_return(true)
           instance.deploy_package_repo(path,name,version)
         end
 
         it 'calls #deploy_yum_repo for el systems' do
           @opts = {'platform' => 'el-is-me'}
           expect(instance).to receive(:deploy_yum_repo)
-          allow(File).to receive(:exists?).with(path).and_return(true)
+          allow(File).to receive(:exist?).with(path).and_return(true)
           instance.deploy_package_repo(path,name,version)
         end
 
         it 'calls #deploy_zyp_repo for sles systems' do
           @opts = {'platform' => 'sles-is-me'}
           expect(instance).to receive(:deploy_zyp_repo)
-          allow(File).to receive(:exists?).with(path).and_return(true)
+          allow(File).to receive(:exist?).with(path).and_return(true)
           instance.deploy_package_repo(path,name,version)
         end
 
         it 'calls #deploy_zyp_repo for opensuse systems' do
           @opts = {'platform' => 'opensuse-is-me'}
           expect(instance).to receive(:deploy_zyp_repo)
-          allow(File).to receive(:exists?).with(path).and_return(true)
+          allow(File).to receive(:exist?).with(path).and_return(true)
           instance.deploy_package_repo(path,name,version)
         end
 
         it 'raises an error for unsupported systems' do
           @opts = {'platform' => 'windows-is-me'}
-          allow(File).to receive(:exists?).with(path).and_return(true)
+          allow(File).to receive(:exist?).with(path).and_return(true)
           expect{instance.deploy_package_repo(path,name,version)}.to raise_error(RuntimeError)
         end
       end
@@ -94,7 +94,7 @@ module Beaker
           expect(logger).to receive(:warn)
           allow(@opts['platform']).to receive(:codename).and_return(nil)
           expect(instance).to receive(:deploy_apt_repo).and_return(instance.deploy_apt_repo(path,name,version))
-          allow(File).to receive(:exists?).with(path).and_return(true)
+          allow(File).to receive(:exist?).with(path).and_return(true)
           instance.deploy_package_repo(path,name,version)
         end
       end
@@ -106,15 +106,16 @@ module Beaker
         pkg = 'sles_package'
         expect( Beaker::Command ).to receive( :new ).with( /^rpmkeys.*nightlies.puppetlabs.com.*/, anything, anything ).and_return('').ordered.once
         expect( Beaker::Command ).to receive(:new).with("zypper --gpg-auto-import-keys se -i --match-exact #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('').ordered.once
-        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0})).exactly(2).times
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0})).twice
         expect( instance.check_for_package(pkg) ).to be === true
       end
+
       it "checks correctly on opensuse" do
         @opts = {'platform' => 'opensuse-is-me'}
         pkg = 'sles_package'
         expect( Beaker::Command ).to receive( :new ).with( /^rpmkeys.*nightlies.puppetlabs.com.*/, anything, anything ).and_return('').ordered.once
         expect( Beaker::Command ).to receive(:new).with("zypper --gpg-auto-import-keys se -i --match-exact #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('').ordered.once
-        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0})).exactly(2).times
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0})).twice
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -159,6 +160,7 @@ module Beaker
         expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
+
       it "checks correctly on debian" do
         @opts = {'platform' => 'debian-is-me'}
         pkg = 'debian_package'
@@ -226,12 +228,13 @@ module Beaker
       PlatformHelpers::DEBIANPLATFORMS.each do |platform|
         it "calls update for #{platform}" do
           @opts = {'platform' => platform}
-          instance.instance_variable_set("@apt_needs_update", true)
+          instance.instance_variable_set(:@apt_needs_update, true)
           expect(instance).to receive('execute').with("apt-get update")
-          expect{instance.update_apt_if_needed}.to_not raise_error
+          expect{instance.update_apt_if_needed}.not_to raise_error
         end
       end
     end
+
     context "install_package" do
 
       PlatformHelpers::DEBIANPLATFORMS.each do |platform|
@@ -391,6 +394,7 @@ module Beaker
         end
       end
     end
+
     context "install_package_with_rpm" do
 
       it "accepts a package as a single argument" do
@@ -433,9 +437,9 @@ module Beaker
 
     end
 
-    context '#pe_puppet_agent_promoted_package_install' do
+    describe '#pe_puppet_agent_promoted_package_install' do
       context 'on solaris platforms' do
-        before :each do
+        before do
           allow( subject ).to receive( :fetch_http_file )
           allow( subject ).to receive( :scp_to )
           allow( subject ).to receive( :configure_type_defaults_on )
@@ -477,7 +481,7 @@ module Beaker
         end
 
         context 'on solaris 10' do
-          before :each do
+          before do
             solaris_platform = Beaker::Platform.new('solaris-10-x86_64')
             @opts = {'platform' => solaris_platform}
           end
@@ -505,7 +509,7 @@ module Beaker
         end
 
         context 'on solaris 11' do
-          before :each do
+          before do
             solaris_platform = Beaker::Platform.new('solaris-11-x86_64')
             @opts = {'platform' => solaris_platform}
           end
@@ -526,7 +530,7 @@ module Beaker
       let( :platform      ) { @platform || 'fedora' }
       let( :version       ) { @version  || 6        }
 
-      before :each do
+      before do
         allow( instance ).to receive( :[] ).with( 'platform' ) { Beaker::Platform.new("#{platform}-#{version}-x86_64") }
       end
 
@@ -589,7 +593,7 @@ module Beaker
       let( :base_dir      ) { '/base/dir/fake'      }
       let( :download_file ) { 'download_file.txt'   }
 
-      before :each do
+      before do
         allow( instance ).to receive( :[] ).with( 'platform' ) {  Beaker::Platform.new("#{platform}-#{version}-x86_64")  }
       end
 
@@ -620,7 +624,7 @@ module Beaker
 
       context 'on solaris' do
 
-        before :each do
+        before do
           @platform = 'solaris'
         end