beaker 4.38.1 → 4.39.0

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
 

data/spec/beaker/host/unix_spec.rb

@@ -43,7 +43,7 @@ module Unix
 
       it 'sets release_path_end correctly' do
         @platform = 'solaris-10-arch'
-        allow( host ).to receive( :link_exists? ) { true }
+        allow( host ).to receive( :link_exists? ).and_return(true)
         release_path_end, _ = host.solaris_puppet_agent_dev_package_info(
           'pa_collection4', 'pa_version', opts )
         expect( release_path_end ).to be === "solaris/10/pa_collection4"
@@ -51,7 +51,7 @@ module Unix
 
       it 'sets the arch correctly for x86_64 platforms' do
         @platform = 'solaris-10-x86_64'
-        allow( host ).to receive( :link_exists? ) { true }
+        allow( host ).to receive( :link_exists? ).and_return(true)
         _, release_file = host.solaris_puppet_agent_dev_package_info(
           'pa_collection', 'pa_version', opts )
         expect( release_file ).to     match( /i386/   )
@@ -60,7 +60,7 @@ module Unix
 
       context 'sets release_file name appropriately for puppet-agent version' do
         context 'on solaris 10' do
-          before :each do
+          before do
             @platform = 'solaris-10-arch'
           end
 
@@ -75,14 +75,14 @@ module Unix
 
             context "#{pa_version}" do
               it "URL exists" do
-                allow( host ).to receive( :link_exists? ) { true }
+                allow( host ).to receive( :link_exists? ).and_return(true)
                 _, release_file = host.solaris_puppet_agent_dev_package_info(
                   'pa_collection', pa_version, opts )
                 expect( release_file ).to be === "puppet-agent-#{pa_version}-1.arch.pkg.gz"
               end
 
               it "fallback URL" do
-                allow( host ).to receive( :link_exists? ) { false }
+                allow( host ).to receive( :link_exists? ).and_return(false)
                 _, release_file = host.solaris_puppet_agent_dev_package_info(
                   'pa_collection', pa_version, opts )
                 expect( release_file ).to be === "puppet-agent-#{pa_version}.arch.pkg.gz"
@@ -92,7 +92,7 @@ module Unix
         end
 
         context 'on solaris 11' do
-          before :each do
+          before do
             @platform = 'solaris-11-arch'
           end
 
@@ -109,14 +109,14 @@ module Unix
 
             context "#{pa_version}" do
               it "URL exists" do
-                allow( host ).to receive( :link_exists? ) { true }
+                allow( host ).to receive( :link_exists? ).and_return(true)
                 _, release_file = host.solaris_puppet_agent_dev_package_info(
                   'pa_collection', pa_version, opts )
                 expect( release_file ).to be === "puppet-agent@#{pa_version_cleaned},5.11-1.arch.p5p"
               end
 
               it "fallback URL" do
-                allow( host ).to receive( :link_exists? ) { false }
+                allow( host ).to receive( :link_exists? ).and_return(false)
                 _, release_file = host.solaris_puppet_agent_dev_package_info(
                   'pa_collection', pa_version, opts )
                 expect( release_file ).to be === "puppet-agent@#{pa_version_cleaned},5.11.arch.p5p"

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

@@ -21,9 +21,9 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { WindowsExecTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { WindowsExecTest.new(opts, logger) }
 
     describe '#prepend_commands' do
       it 'sets spacing correctly if both parts are defined' do
@@ -63,7 +63,7 @@ module Beaker
     end
 
     describe '#cygwin_installed?' do
-      let (:response) { double( 'response' ) }
+      let(:response) { double( 'response' ) }
 
       it 'uses cygcheck to see if cygwin is installed' do
         expect( Beaker::Command ).to receive(:new).with("cygcheck --check-setup cygwin").and_return(:foo)

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

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 module Beaker
   describe Windows::File do
-    let (:user) { 'someuser' }
-    let (:group) { 'somegroup' }
-    let (:path) { 'C:\Foo\Bar' }
-    let (:newpath) { '/Foo/Bar' }
+    let(:user) { 'someuser' }
+    let(:group) { 'somegroup' }
+    let(:path) { 'C:\Foo\Bar' }
+    let(:newpath) { '/Foo/Bar' }
     let(:host)    { make_host( 'name', { :platform => 'windows' } ) }
 
 

data/spec/beaker/host/windows/group_spec.rb

@@ -9,26 +9,26 @@ module Beaker
     let(:instance) { WindowsGroupTest.new }
     let(:result) { double(:result, :stdout => group_list_output) }
     let(:group_list_output) do <<-EOS
-
-
-Name=Foo
-
-
-Name=Bar6
-
-
+
+
+Name=Foo
+
+
+Name=Bar6
+
+
       EOS
     end
 
     def add_group(group_name)
       group_list_output << <<-EOS
-Name=#{group_name}
-
-
+Name=#{group_name}
+
+
       EOS
     end
 
-    before(:each) do
+    before do
       expect( instance ).to receive(:execute).with(/wmic group where/).and_yield(result)
     end
 

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

@@ -24,17 +24,17 @@ module Beaker
 
     end
 
-    let (:opts)     { @opts || {} }
-    let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { WindowsPkgTest.new(opts, logger) }
+    let(:opts)     { @opts || {} }
+    let(:logger)   { double( 'logger' ).as_null_object }
+    let(:instance) { WindowsPkgTest.new(opts, logger) }
 
     describe '#install_package' do
-      before :each do
+      before do
         allow( instance ).to receive( :identify_windows_architecture )
       end
 
       context 'cygwin does not exist' do
-        before :each do
+        before do
           allow( instance ).to receive( :check_for_command ).and_return( false )
         end
 

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -25,6 +25,7 @@ describe Beaker do
 
   shared_examples 'enables_root_login' do |platform, commands, non_cygwin|
     subject { dummy_class.new }
+
     it "can enable root login on #{platform}" do
       hosts = make_hosts( { :platform => platform, :is_cygwin => non_cygwin} )
 
@@ -40,61 +41,61 @@ describe Beaker do
     end
   end
 
-  it_should_behave_like 'enables_root_login', 'f5', []
+  it_behaves_like 'enables_root_login', 'f5', []
   # Non-cygwin Windows
-  it_should_behave_like 'enables_root_login', 'pswindows', [], false
+  it_behaves_like 'enables_root_login', 'pswindows', [], false
 
   # Non-cygwin Windows
-  it_should_behave_like 'enables_root_login', 'windows', [
+  it_behaves_like 'enables_root_login', 'windows', [
     "sed -ri 's/^#?PermitRootLogin /PermitRootLogin yes/' /etc/sshd_config"
   ], true
 
   # FreeBSD
-  it_should_behave_like 'enables_root_login', 'freesbd', [
+  it_behaves_like 'enables_root_login', 'freesbd', [
     "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""
   ], true
 
-  it_should_behave_like 'enables_root_login', 'osx-10.10', [
+  it_behaves_like 'enables_root_login', 'osx-10.10', [
     "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /etc/sshd_config",
     "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /etc/sshd_config"
   ]
 
-  it_should_behave_like 'enables_root_login', 'osx-10.11', [
+  it_behaves_like 'enables_root_login', 'osx-10.11', [
     "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config",
     "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config"
   ]
 
-  it_should_behave_like 'enables_root_login', 'osx-10.12', [
+  it_behaves_like 'enables_root_login', 'osx-10.12', [
       "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config",
       "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config"
   ]
 
-  it_should_behave_like 'enables_root_login', 'osx-10.13', [
+  it_behaves_like 'enables_root_login', 'osx-10.13', [
       "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config",
       "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config"
   ]
 
   # Solaris
-  it_should_behave_like 'enables_root_login', 'solaris-10', [
+  it_behaves_like 'enables_root_login', 'solaris-10', [
     "sudo -E svcadm restart network/ssh",
     "sudo gsed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"
   ], true
 
-  it_should_behave_like 'enables_root_login', 'solaris-11', [
+  it_behaves_like 'enables_root_login', 'solaris-11', [
     "sudo -E svcadm restart network/ssh",
     "sudo gsed -i -e 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config",
     "if grep \"root::::type=role\" /etc/user_attr; then sudo rolemod -K type=normal root; else echo \"root user already type=normal\"; fi"
   ], true
 
   ['debian','ubuntu','cumulus'].each do | deb_like |
-    it_should_behave_like 'enables_root_login', deb_like, [
+    it_behaves_like 'enables_root_login', deb_like, [
       "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
       "sudo su -c \"service ssh restart\""
     ]
   end
 
   ['centos','el-','redhat','fedora','eos'].each do | redhat_like |
-    it_should_behave_like 'enables_root_login', redhat_like, [
+    it_behaves_like 'enables_root_login', redhat_like, [
       "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
       "sudo -E /sbin/service sshd reload"
     ]
@@ -241,7 +242,7 @@ describe Beaker do
     it "does nothing on non debian/ubuntu/cumulus hosts" do
       host = make_host( 'testhost', { :platform => 'windows' } )
 
-      expect( Beaker::Command ).to receive( :new ).never
+      expect( Beaker::Command ).not_to receive( :new )
 
       subject.apt_get_update( host )
 
@@ -318,7 +319,7 @@ describe Beaker do
       hosts = make_hosts( { :platform => 'solaris-11' } )
 
       expect( Beaker::Command ).to receive( :new ).with( "/usr/bin/pkg unset-publisher solaris || :" ).exactly( 3 ).times
-      hosts.each do |host|
+      hosts.each do |_host|
         expect( Beaker::Command ).to receive( :new ).with( "/usr/bin/pkg set-publisher -g %s solaris" % ips_pkg_repo ).once
       end
 
@@ -329,7 +330,7 @@ describe Beaker do
     it "does nothing for non ubuntu/debian/cumulus/solaris-11 hosts" do
       hosts = make_hosts( { :platform => 'windows' } )
 
-      expect( Beaker::Command ).to receive( :new ).never
+      expect( Beaker::Command ).not_to receive( :new )
 
       subject.proxy_config( hosts, options )
 
@@ -368,10 +369,10 @@ describe Beaker do
 
     end
 
-    it "should do nothing for non el-5/6 hosts" do
+    it "does nothing for non el-5/6 hosts" do
       hosts = make_hosts( { :platform => Beaker::Platform.new('windows-version-arch') } )
 
-      expect( Beaker::Command ).to receive( :new ).never
+      expect( Beaker::Command ).not_to receive( :new )
 
       subject.add_el_extras( hosts, options )
 
@@ -513,17 +514,21 @@ describe Beaker do
 
       context "with cygwin" do
         let(:cygwin) { true }
-        before(:each) do
+
+        before do
           expect( Beaker::Command ).to receive( :new ).with( "cat /cygdrive/c/Windows/System32/drivers/etc/hosts" ).once
         end
+
         include_examples 'find domain name'
       end
 
       context "without cygwin" do
         let(:cygwin) { false }
-        before(:each) do
+
+        before do
           expect( Beaker::Command ).to receive( :new ).with( 'type C:\Windows\System32\drivers\etc\hosts' ).once
         end
+
         include_examples 'find domain name'
       end
     end
@@ -535,7 +540,7 @@ describe Beaker do
           :stdout => stdout,
         } ) }
 
-        before(:each) do
+        before do
           expect( Beaker::Command ).to receive( :new ).with( "cat /etc/resolv.conf" ).once
         end
 
@@ -618,6 +623,7 @@ describe Beaker do
   context "package_proxy" do
 
     subject { dummy_class.new }
+
     proxyurl = "http://192.168.2.100:3128"
 
     it "can set proxy config on a debian/ubuntu/cumulus host" do