beaker-puppet 1.29.0 → 3.0.0

data/spec/beaker-puppet/install_utils/foss_utils_spec.rb

@@ -17,90 +17,111 @@ end
 describe ClassMixedWithDSLInstallUtils do
   let(:metadata)      { @metadata ||= {} }
   let(:presets)       { Beaker::Options::Presets.new }
-  let(:opts)          { presets.presets.merge(presets.env_vars).merge({ :type => 'foss' }) }
-  let(:basic_hosts)   { make_hosts( { :pe_ver => '3.0',
-                                      :platform => 'linux',
-                                      :roles => [ 'agent' ],
-                                      :type  => 'foss' }, 4 ) }
-  let(:hosts)         { basic_hosts[0][:roles] = ['master', 'database', 'dashboard']
-                        basic_hosts[1][:platform] = 'windows'
-                        basic_hosts[2][:platform] = 'osx-10.9-x86_64'
-                        basic_hosts[3][:platform] = 'eos'
-                        basic_hosts  }
-  let(:hosts_sorted)  { [ hosts[1], hosts[0], hosts[2], hosts[3] ] }
-  let(:winhost)       { make_host( 'winhost', { :platform => Beaker::Platform.new('windows-2008r2-64'),
-                                                :pe_ver => '3.0',
-                                                :working_dir => '/tmp',
-                                                :type => 'foss',
-                                                :is_cygwin => true} ) }
-  let(:winhost_non_cygwin) { make_host( 'winhost_non_cygwin', { :platform => 'windows',
-                                                :pe_ver => '3.0',
-                                                :working_dir => '/tmp',
-                                                :type => 'foss',
-                                                :is_cygwin => 'false' } ) }
-
-  let(:machost)       { make_host( 'machost', { :platform => 'osx-10.9-x86_64',
-                                                :pe_ver => '3.0',
-                                                :type => 'foss',
-                                                :working_dir => '/tmp' } ) }
-  let(:freebsdhost9)   { make_host( 'freebsdhost9', { :platform => 'freebsd-9-x64',
-                                                :pe_ver => '3.0',
-                                                :working_dir => '/tmp' } ) }
-  let(:freebsdhost10)   { make_host( 'freebsdhost10', { :platform => 'freebsd-10-x64',
-                                                :pe_ver => '3.0',
-                                                :working_dir => '/tmp' } ) }
-  let(:unixhost)      { make_host( 'unixhost', { :platform => 'linux',
-                                                 :pe_ver => '3.0',
-                                                 :working_dir => '/tmp',
-                                                :type => 'foss',
-                                                 :dist => 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386' } ) }
-  let(:eoshost)       { make_host( 'eoshost', { :platform => 'eos',
-                                                :pe_ver => '3.0',
-                                                :working_dir => '/tmp',
-                                                :type => 'foss',
-                                                :dist => 'puppet-enterprise-3.7.1-rc0-78-gffc958f-eos-4-i386' } ) }
-  let(:el6hostaio)    { make_host( 'el6hostaio', { :platform => Beaker::Platform.new('el-6-i386'),
-                                                 :pe_ver => '3.0',
-                                                 :working_dir => '/tmp',
-                                                :type => 'aio',
-                                                 :dist => 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-centos-6-i386' } ) }
-  let(:el6hostfoss)   { make_host( 'el6hostfoss', { :platform => Beaker::Platform.new('el-6-i386'),
-                                                 :pe_ver => '3.0',
-                                                 :working_dir => '/tmp',
-                                                :type => 'foss',
-                                                 :dist => 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-centos-6-i386' } ) }
-
-  let(:win_temp)      { 'C:\\Windows\\Temp' }
+  let(:opts)          { presets.presets.merge(presets.env_vars).merge({ type: 'foss' }) }
+  let(:basic_hosts)   do
+    make_hosts({ pe_ver: '3.0',
+                 platform: 'linux',
+                 roles: ['agent'],
+                 type: 'foss', }, 4)
+  end
+  let(:hosts) do
+    basic_hosts[0][:roles] = %w[master database dashboard]
+    basic_hosts[1][:platform] = 'windows'
+    basic_hosts[2][:platform] = 'osx-10.9-x86_64'
+    basic_hosts[3][:platform] = 'eos'
+    basic_hosts
+  end
+  let(:hosts_sorted)  { [hosts[1], hosts[0], hosts[2], hosts[3]] }
+  let(:winhost)       do
+    make_host('winhost', { platform: Beaker::Platform.new('windows-2008r2-64'),
+                           pe_ver: '3.0',
+                           working_dir: '/tmp',
+                           type: 'foss',
+                           is_cygwin: true, })
+  end
+  let(:winhost_non_cygwin) do
+    make_host('winhost_non_cygwin', { platform: 'windows',
+                                      pe_ver: '3.0',
+                                      working_dir: '/tmp',
+                                      type: 'foss',
+                                      is_cygwin: 'false', })
+  end
+
+  let(:machost) do
+    make_host('machost', { platform: 'osx-10.9-x86_64',
+                           pe_ver: '3.0',
+                           type: 'foss',
+                           working_dir: '/tmp', })
+  end
+  let(:freebsdhost12) do
+    make_host('freebsdhost12', { platform: 'freebsd-12-amd64',
+                                 pe_ver: '3.0',
+                                 working_dir: '/tmp', })
+  end
+  let(:freebsdhost13) do
+    make_host('freebsdhost13', { platform: 'freebsd-13-amd64',
+                                 pe_ver: '3.0',
+                                 working_dir: '/tmp', })
+  end
+  let(:unixhost) do
+    make_host('unixhost', { platform: 'linux',
+                            pe_ver: '3.0',
+                            working_dir: '/tmp',
+                            type: 'foss',
+                            dist: 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386', })
+  end
+  let(:eoshost) do
+    make_host('eoshost', { platform: 'eos',
+                           pe_ver: '3.0',
+                           working_dir: '/tmp',
+                           type: 'foss',
+                           dist: 'puppet-enterprise-3.7.1-rc0-78-gffc958f-eos-4-i386', })
+  end
+  let(:el6hostaio) do
+    make_host('el6hostaio', { platform: Beaker::Platform.new('el-6-i386'),
+                              pe_ver: '3.0',
+                              working_dir: '/tmp',
+                              type: 'aio',
+                              dist: 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-centos-6-i386', })
+  end
+  let(:el6hostfoss) do
+    make_host('el6hostfoss', { platform: Beaker::Platform.new('el-6-i386'),
+                               pe_ver: '3.0',
+                               working_dir: '/tmp',
+                               type: 'foss',
+                               dist: 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-centos-6-i386', })
+  end
+
+  let(:win_temp) { 'C:\\Windows\\Temp' }
 
   context '#sanitize_opts' do
-    let(:opts) {
+    let(:opts) do
       {
-        :win_download_url => nil,
-        :dev_builds_url => '',
-        :release_yum_repo_url => 'https://apt.customserver.net/apt'
+        win_download_url: nil,
+        dev_builds_url: '',
+        release_yum_repo_url: 'https://apt.customserver.net/apt',
       }
-    }
+    end
 
     it 'honors any custom values' do
-      expect( subject.sanitize_opts(opts)).to include({release_yum_repo_url: 'https://apt.customserver.net/apt'})
+      expect(subject.sanitize_opts(opts)).to include({ release_yum_repo_url: 'https://apt.customserver.net/apt' })
     end
 
     it 'overwrites any nil values with pre-defined defaults' do
       default_win_url = described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:win_download_url]
-      expect( subject.sanitize_opts(opts)).to include({win_download_url: default_win_url})
+      expect(subject.sanitize_opts(opts)).to include({ win_download_url: default_win_url })
     end
 
     it 'keeps empty strings' do
-      expect( subject.sanitize_opts(opts)).to include({dev_builds_url: ''})
+      expect(subject.sanitize_opts(opts)).to include({ dev_builds_url: '' })
     end
 
     it 'adds any undefined defaults' do
       default_mac_url = described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:mac_download_url]
-      expect( subject.sanitize_opts(opts)).to include({mac_download_url: default_mac_url})
+      expect(subject.sanitize_opts(opts)).to include({ mac_download_url: default_mac_url })
     end
   end
 
-
   context '#configure_foss_defaults_on' do
     it 'uses aio paths for hosts with role aio' do
       hosts.each do |host|
@@ -112,7 +133,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect(subject).to receive(:add_aio_defaults_on).exactly(hosts.length).times
       expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
 
-      subject.configure_foss_defaults_on( hosts )
+      subject.configure_foss_defaults_on(hosts)
     end
 
     it 'uses no paths for hosts with no type' do
@@ -123,7 +144,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect(subject).to receive(:add_foss_defaults_on).never
       expect(subject).to receive(:add_puppet_paths_on).never
 
-      subject.configure_foss_defaults_on( hosts )
+      subject.configure_foss_defaults_on(hosts)
     end
 
     it 'uses aio paths for hosts with aio type (backwards compatability)' do
@@ -136,7 +157,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect(subject).to receive(:add_foss_defaults_on).never
       expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
 
-      subject.configure_foss_defaults_on( hosts )
+      subject.configure_foss_defaults_on(hosts)
     end
 
     it 'uses aio paths for hosts of version >= 4.0' do
@@ -149,7 +170,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect(subject).to receive(:add_foss_defaults_on).exactly(hosts.length).times
       expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
 
-      subject.configure_foss_defaults_on( hosts )
+      subject.configure_foss_defaults_on(hosts)
     end
 
     it 'uses foss paths for hosts of version < 4.0' do
@@ -161,7 +182,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect(subject).to receive(:add_aio_defaults_on).never
       expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
 
-      subject.configure_foss_defaults_on( hosts )
+      subject.configure_foss_defaults_on(hosts)
     end
 
     it 'uses foss paths for foss-like type foss-package' do
@@ -174,17 +195,16 @@ describe ClassMixedWithDSLInstallUtils do
       expect(subject).to receive(:add_aio_defaults_on).never
       expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
 
-      subject.configure_foss_defaults_on( hosts )
+      subject.configure_foss_defaults_on(hosts)
     end
-
   end
 
   context 'lookup_in_env' do
     it 'returns a default properly' do
       env_var = subject.lookup_in_env('noway', 'nonesuch', 'returnme')
-      expect(env_var).to be == 'returnme'
+      expect(env_var).to eq 'returnme'
       env_var = subject.lookup_in_env('noway', nil, 'returnme')
-      expect(env_var).to be == 'returnme'
+      expect(env_var).to eq 'returnme'
     end
     it 'finds correct env variable' do
       allow(ENV).to receive(:[]).with(nil).and_return(nil)
@@ -192,13 +212,13 @@ describe ClassMixedWithDSLInstallUtils do
       allow(ENV).to receive(:[]).with('NONESUCH').and_return('present')
       allow(ENV).to receive(:[]).with('NOWAY_PROJ_NONESUCH').and_return('exists')
       env_var = subject.lookup_in_env('nonesuch', 'noway-proj', 'fail')
-      expect(env_var).to be == 'exists'
+      expect(env_var).to eq 'exists'
       env_var = subject.lookup_in_env('nonesuch')
-      expect(env_var).to be == 'present'
+      expect(env_var).to eq 'present'
       env_var = subject.lookup_in_env('reallynone')
-      expect(env_var).to be == nil
-      env_var = subject.lookup_in_env('reallynone',nil,'default')
-      expect(env_var).to be == 'default'
+      expect(env_var).to eq nil # rubocop:disable Style/NilComparison
+      env_var = subject.lookup_in_env('reallynone', nil, 'default')
+      expect(env_var).to eq 'default'
     end
   end
 
@@ -209,21 +229,21 @@ describe ClassMixedWithDSLInstallUtils do
       allow(ENV).to receive(:[]).with('PUPPET_FORK').and_return(nil)
       allow(ENV).to receive(:[]).with('PUPPET_SERVER').and_return(nil)
       url = subject.build_giturl('puppet')
-      expect(url).to be == 'https://github.com/puppetlabs/puppet.git'
+      expect(url).to eq 'https://github.com/puppetlabs/puppet.git'
       url = subject.build_giturl('puppet', 'er0ck')
-      expect(url).to be == 'https://github.com/er0ck/puppet.git'
+      expect(url).to eq 'https://github.com/er0ck/puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'bitbucket.com')
-      expect(url).to be == 'https://bitbucket.com/er0ck-puppet.git'
+      expect(url).to eq 'https://bitbucket.com/er0ck-puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'https://')
-      expect(url).to be == 'https://github.com/er0ck/puppet.git'
+      expect(url).to eq 'https://github.com/er0ck/puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'https')
-      expect(url).to be == 'https://github.com/er0ck/puppet.git'
+      expect(url).to eq 'https://github.com/er0ck/puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'git@')
-      expect(url).to be == 'git@github.com:er0ck/puppet.git'
+      expect(url).to eq 'git@github.com:er0ck/puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'git')
-      expect(url).to be == 'git@github.com:er0ck/puppet.git'
+      expect(url).to eq 'git@github.com:er0ck/puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'ssh')
-      expect(url).to be == 'git@github.com:er0ck/puppet.git'
+      expect(url).to eq 'git@github.com:er0ck/puppet.git'
     end
 
     it 'uses ENV to build urls properly' do
@@ -232,36 +252,35 @@ describe ClassMixedWithDSLInstallUtils do
       allow(ENV).to receive(:[]).with('PUPPET_FORK').and_return('er0ck/repo')
       allow(ENV).to receive(:[]).with('PUPPET_SERVER').and_return('gitlab.com')
       url = subject.build_giturl('puppet')
-      expect(url).to be == 'https://gitlab.com/er0ck/repo-puppet.git'
+      expect(url).to eq 'https://gitlab.com/er0ck/repo-puppet.git'
       url = subject.build_giturl('puppet', 'er0ck')
-      expect(url).to be == 'https://gitlab.com/er0ck-puppet.git'
+      expect(url).to eq 'https://gitlab.com/er0ck-puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'bitbucket.com')
-      expect(url).to be == 'https://bitbucket.com/er0ck-puppet.git'
+      expect(url).to eq 'https://bitbucket.com/er0ck-puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'https://')
-      expect(url).to be == 'https://github.com/er0ck/puppet.git'
+      expect(url).to eq 'https://github.com/er0ck/puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'https')
-      expect(url).to be == 'https://github.com/er0ck/puppet.git'
+      expect(url).to eq 'https://github.com/er0ck/puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'git@')
-      expect(url).to be == 'git@github.com:er0ck/puppet.git'
+      expect(url).to eq 'git@github.com:er0ck/puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'git')
-      expect(url).to be == 'git@github.com:er0ck/puppet.git'
+      expect(url).to eq 'git@github.com:er0ck/puppet.git'
       url = subject.build_giturl('puppet', 'er0ck', 'github.com', 'ssh')
-      expect(url).to be == 'git@github.com:er0ck/puppet.git'
+      expect(url).to eq 'git@github.com:er0ck/puppet.git'
     end
   end
 
   context 'extract_repo_info_from' do
-    [{ :protocol => 'git', :path => 'git://github.com/puppetlabs/project.git' },
-     { :protocol => 'ssh', :path => 'git@github.com:puppetlabs/project.git' },
-     { :protocol => 'https', :path => 'https://github.com:puppetlabs/project' },
-     { :protocol => 'file', :path => 'file:///home/example/project' }
-    ].each do |type|
-      it "handles #{ type[:protocol] } uris" do
-        uri = "#{ type[:path] }#master"
+    [{ protocol: 'git', path: 'git://github.com/puppetlabs/project.git' },
+     { protocol: 'ssh', path: 'git@github.com:puppetlabs/project.git' },
+     { protocol: 'https', path: 'https://github.com:puppetlabs/project' },
+     { protocol: 'file', path: 'file:///home/example/project' },].each do |type|
+      it "handles #{type[:protocol]} uris" do
+        uri = "#{type[:path]}#master"
         repo_info = subject.extract_repo_info_from uri
-        expect( repo_info[:name] ).to be == 'project'
-        expect( repo_info[:path] ).to be ==  type[:path]
-        expect( repo_info[:rev] ).to  be == 'master'
+        expect(repo_info[:name]).to eq 'project'
+        expect(repo_info[:path]).to eq type[:path]
+        expect(repo_info[:rev]).to  eq 'master'
       end
     end
   end
@@ -269,66 +288,67 @@ describe ClassMixedWithDSLInstallUtils do
   context 'order_packages' do
     it 'orders facter, hiera before puppet, before anything else' do
       named_repos = [
-        { :name => 'puppet_plugin' }, { :name => 'puppet' }, { :name => 'facter' }
+        { name: 'puppet_plugin' }, { name: 'puppet' }, { name: 'facter' },
       ]
       ordered_repos = subject.order_packages named_repos
-      expect( ordered_repos[0][:name] ).to be == 'facter'
-      expect( ordered_repos[1][:name] ).to be == 'puppet'
-      expect( ordered_repos[2][:name] ).to be == 'puppet_plugin'
+      expect(ordered_repos[0][:name]).to eq 'facter'
+      expect(ordered_repos[1][:name]).to eq 'puppet'
+      expect(ordered_repos[2][:name]).to eq 'puppet_plugin'
     end
   end
 
   context 'find_git_repo_versions' do
     it 'returns a hash of :name => version' do
-      host        = double( 'Host' )
-      repository  = { :name => 'name' }
+      host        = double('Host')
+      repository  = { name: 'name' }
       path        = '/path/to/repo'
       cmd         = 'cd /path/to/repo/name && git describe || true'
       logger = double.as_null_object
 
-      allow( subject ).to receive( :metadata ).and_return( metadata )
-      expect( subject ).to receive( :logger ).and_return( logger )
-      expect( subject ).to receive( :on ).with( host, cmd ).and_yield
-      expect( subject ).to receive( :stdout ).and_return( '2' )
+      allow(subject).to receive(:metadata).and_return(metadata)
+      expect(subject).to receive(:logger).and_return(logger)
+      expect(subject).to receive(:on).with(host, cmd).and_yield
+      expect(subject).to receive(:stdout).and_return('2')
 
-      subject.instance_variable_set( :@metadata, {} )
-      version = subject.find_git_repo_versions( host, path, repository )
+      subject.instance_variable_set(:@metadata, {})
+      version = subject.find_git_repo_versions(host, path, repository)
 
-      expect( version ).to be == { 'name' => '2' }
+      expect(version).to be == { 'name' => '2' } # rubocop:ignore RSpec/Eq
     end
   end
 
   context 'install_puppet_from_rpm_on' do
     it 'installs puppet release repo when set' do
-      expect(subject).to receive(:install_puppetlabs_release_repo).with(el6hostaio,'puppet',{:puppet_collection => 'puppet'})
+      expect(subject).to receive(:install_puppetlabs_release_repo).with(el6hostaio, 'puppet',
+                                                                        { puppet_collection: 'puppet' })
 
-      subject.install_puppet_from_rpm_on( el6hostaio, {:puppet_collection => 'puppet'}  )
+      subject.install_puppet_from_rpm_on(el6hostaio, { puppet_collection: 'puppet' })
     end
 
     it 'installs PC1 release repo when AIO' do
-      expect(subject).to receive(:install_puppetlabs_release_repo).with(el6hostaio,'pc1',{})
+      expect(subject).to receive(:install_puppetlabs_release_repo).with(el6hostaio, 'pc1', {})
 
-      subject.install_puppet_from_rpm_on( el6hostaio, {}  )
+      subject.install_puppet_from_rpm_on(el6hostaio, {})
     end
 
     it 'installs non-PC1 package when not-AIO' do
-      expect(subject).to receive(:install_puppetlabs_release_repo).with(el6hostfoss,nil,{})
+      expect(subject).to receive(:install_puppetlabs_release_repo).with(el6hostfoss, nil, {})
 
-      subject.install_puppet_from_rpm_on( el6hostfoss, {}  )
+      subject.install_puppet_from_rpm_on(el6hostfoss, {})
     end
   end
 
   context 'install_puppet_from_freebsd_ports_on' do
-    it 'installs puppet on FreeBSD 9' do
-      expect(freebsdhost9).to receive(:install_package).with('puppet')
+    it 'installs puppet on FreeBSD 12' do
+      expect(freebsdhost12).to receive(:install_package).with('sysutils/puppet7')
 
-      subject.install_puppet_from_freebsd_ports_on( freebsdhost9, {}  )
+      subject.install_puppet_from_freebsd_ports_on(freebsdhost12, {})
     end
 
-    it 'installs puppet on FreeBSD 10' do
-      expect(freebsdhost10).to receive(:install_package).with('sysutils/puppet')
+    it 'installs puppet on FreeBSD 13' do
+      expect(freebsdhost13).to receive(:install_package).with('sysutils/puppet7')
 
-      subject.install_puppet_from_freebsd_ports_on( freebsdhost10, {}  )
+      subject.install_puppet_from_freebsd_ports_on(freebsdhost13, {})
     end
   end
 
@@ -340,206 +360,229 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
     it 'installs puppet on cygwin windows' do
-      allow(subject).to receive(:link_exists?).and_return( true )
-      expect(subject).to receive(:on).with(winhost, "curl --location --output \"#{win_temp}\\puppet-3.7.1-x64.msi\" --remote-name http://downloads.puppet.com/windows/puppet-3.7.1-x64.msi")
-      expect(subject).to receive(:on).with(winhost, " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
-      expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.7.1-x64.msi", {}, {:debug => nil})
+      allow(subject).to receive(:link_exists?).and_return(true)
+      expect(subject).to receive(:on).with(winhost,
+                                           "curl --location --output \"#{win_temp}\\puppet-3.7.1-x64.msi\" --remote-name http://downloads.puppet.com/windows/puppet-3.7.1-x64.msi")
+      expect(subject).to receive(:on).with(winhost,
+                                           " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
+      expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.7.1-x64.msi", {}, { debug: nil })
 
-      subject.install_puppet_from_msi( winhost, {:version => '3.7.1', :win_download_url => 'http://downloads.puppet.com/windows'}  )
+      subject.install_puppet_from_msi(winhost,
+                                      { version: '3.7.1', win_download_url: 'http://downloads.puppet.com/windows' })
     end
 
     it 'installs puppet on cygwin windows via proxy' do
-      allow(subject).to receive(:link_exists?).and_return( true )
-      expect(subject).to receive(:on).with(winhost, "curl -x https://proxy.com --location --output \"#{win_temp}\\puppet-3.7.1-x64.msi\" --remote-name http://downloads.puppet.com/windows/puppet-3.7.1-x64.msi")
-      expect(subject).to receive(:on).with(winhost, " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
-      expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.7.1-x64.msi", {}, {:debug => nil})
+      allow(subject).to receive(:link_exists?).and_return(true)
+      expect(subject).to receive(:on).with(winhost,
+                                           "curl -x https://proxy.com --location --output \"#{win_temp}\\puppet-3.7.1-x64.msi\" --remote-name http://downloads.puppet.com/windows/puppet-3.7.1-x64.msi")
+      expect(subject).to receive(:on).with(winhost,
+                                           " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
+      expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.7.1-x64.msi", {}, { debug: nil })
 
-      subject.install_puppet_from_msi( winhost, {:version => '3.7.1', :win_download_url => 'http://downloads.puppet.com/windows', :package_proxy => 'https://proxy.com'}  )
+      subject.install_puppet_from_msi(winhost,
+                                      { version: '3.7.1', win_download_url: 'http://downloads.puppet.com/windows',
+                                        package_proxy: 'https://proxy.com', })
     end
 
     it 'installs puppet on non-cygwin windows' do
-      allow(subject).to receive(:link_exists?).and_return( true )
+      allow(subject).to receive(:link_exists?).and_return(true)
 
       expect(winhost_non_cygwin).to receive(:mkdir_p).with('C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules')
 
-      expect(subject).to receive(:on).with(winhost_non_cygwin, instance_of( Beaker::Command )) do |host, beaker_command|
+      expect(subject).to receive(:on).with(winhost_non_cygwin, instance_of(Beaker::Command)) do |host, beaker_command|
         expect(beaker_command.command).to eq('powershell.exe')
-        expect(beaker_command.args).to eq(["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command $webclient = New-Object System.Net.WebClient; $webclient.DownloadFile('http://downloads.puppet.com/windows/puppet-3.7.1.msi','#{win_temp}\\puppet-3.7.1.msi')"])
+        expect(beaker_command.args).to eq(['-ExecutionPolicy Bypass', '-InputFormat None', '-NoLogo', '-NoProfile',
+                                           '-NonInteractive', "-Command $webclient = New-Object System.Net.WebClient; $webclient.DownloadFile('http://downloads.puppet.com/windows/puppet-3.7.1.msi','#{win_temp}\\puppet-3.7.1.msi')",])
       end.once
 
-      expect(subject).to receive(:install_msi_on).with(winhost_non_cygwin, "#{win_temp}\\puppet-3.7.1.msi", {}, {:debug => nil})
+      expect(subject).to receive(:install_msi_on).with(winhost_non_cygwin, "#{win_temp}\\puppet-3.7.1.msi", {},
+                                                       { debug: nil })
 
-      subject.install_puppet_from_msi( winhost_non_cygwin, {:version => '3.7.1', :win_download_url => 'http://downloads.puppet.com/windows'}   )
+      subject.install_puppet_from_msi(winhost_non_cygwin,
+                                      { version: '3.7.1', win_download_url: 'http://downloads.puppet.com/windows' })
     end
 
     it 'installs puppet on non-cygwin windows via proxy' do
-      allow(subject).to receive(:link_exists?).and_return( true )
+      allow(subject).to receive(:link_exists?).and_return(true)
 
       expect(winhost_non_cygwin).to receive(:mkdir_p).with('C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules')
 
-      expect(subject).to receive(:on).with(winhost_non_cygwin, instance_of( Beaker::Command )) do |host, beaker_command|
+      expect(subject).to receive(:on).with(winhost_non_cygwin, instance_of(Beaker::Command)) do |host, beaker_command|
         expect(beaker_command.command).to eq('powershell.exe')
-        expect(beaker_command.args).to eq(["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command $webclient = New-Object System.Net.WebClient; $webclient.Proxy = New-Object System.Net.WebProxy('https://proxy.com',$true); $webclient.DownloadFile('http://downloads.puppet.com/windows/puppet-3.7.1.msi','#{win_temp}\\puppet-3.7.1.msi')"])
+        expect(beaker_command.args).to eq(['-ExecutionPolicy Bypass', '-InputFormat None', '-NoLogo', '-NoProfile',
+                                           '-NonInteractive', "-Command $webclient = New-Object System.Net.WebClient; $webclient.Proxy = New-Object System.Net.WebProxy('https://proxy.com',$true); $webclient.DownloadFile('http://downloads.puppet.com/windows/puppet-3.7.1.msi','#{win_temp}\\puppet-3.7.1.msi')",])
       end.once
 
-      expect(subject).to receive(:install_msi_on).with(winhost_non_cygwin, "#{win_temp}\\puppet-3.7.1.msi", {}, {:debug => nil})
-
-      subject.install_puppet_from_msi( winhost_non_cygwin, {:version => '3.7.1', :win_download_url => 'http://downloads.puppet.com/windows', :package_proxy => 'https://proxy.com'})
+      expect(subject).to receive(:install_msi_on).with(winhost_non_cygwin, "#{win_temp}\\puppet-3.7.1.msi", {},
+                                                       { debug: nil })
 
+      subject.install_puppet_from_msi(winhost_non_cygwin,
+                                      { version: '3.7.1', win_download_url: 'http://downloads.puppet.com/windows',
+                                        package_proxy: 'https://proxy.com', })
     end
   end
 
   context 'clone_git_repo_on' do
     it 'does a ton of stuff it probably shouldnt' do
-      repo = { :name => 'puppet',
-               :path => 'git://my.server.net/puppet.git',
-               :rev => 'master' }
+      repo = { name: 'puppet',
+               path: 'git://my.server.net/puppet.git',
+               rev: 'master', }
       path = '/path/to/repos'
       host = { 'platform' => 'debian' }
       logger = double.as_null_object
 
-      allow( subject ).to receive( :metadata ).and_return( metadata )
-      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
+      allow(subject).to receive(:metadata).and_return(metadata)
+      allow(subject).to receive(:configure_foss_defaults_on).and_return(true)
 
-      expect( subject ).to receive( :logger ).exactly( 2 ).times.and_return( logger )
-      expect( subject ).to receive( :on ).exactly( 3 ).times
+      expect(subject).to receive(:logger).exactly(2).times.and_return(logger)
+      expect(subject).to receive(:on).exactly(3).times
 
-      subject.instance_variable_set( :@metadata, {} )
-      subject.clone_git_repo_on( host, path, repo )
+      subject.instance_variable_set(:@metadata, {})
+      subject.clone_git_repo_on(host, path, repo)
     end
 
     it 'allows a checkout depth of 1' do
-      repo   = { :name => 'puppet',
-                 :path => 'git://my.server.net/puppet.git',
-                 :rev => 'master',
-                 :depth => 1 }
+      repo   = { name: 'puppet',
+                 path: 'git://my.server.net/puppet.git',
+                 rev: 'master',
+                 depth: 1, }
 
       path   = '/path/to/repos'
       cmd    = "test -d #{path}/#{repo[:name]} || git clone --branch #{repo[:rev]} --depth #{repo[:depth]} #{repo[:path]} #{path}/#{repo[:name]}"
       host   = { 'platform' => 'debian' }
       logger = double.as_null_object
-      allow( subject ).to receive( :metadata ).and_return( metadata )
-      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
-      expect( subject ).to receive( :logger ).exactly( 2 ).times.and_return( logger )
-      expect( subject ).to receive( :on ).with( host, "test -d #{path} || mkdir -p #{path}", {:accept_all_exit_codes=>true} ).exactly( 1 ).times
+      allow(subject).to receive(:metadata).and_return(metadata)
+      allow(subject).to receive(:configure_foss_defaults_on).and_return(true)
+      expect(subject).to receive(:logger).exactly(2).times.and_return(logger)
+      expect(subject).to receive(:on).with(host, "test -d #{path} || mkdir -p #{path}",
+                                           { accept_all_exit_codes: true }).exactly(1).times
       # this is the the command we want to test
-      expect( subject ).to receive( :on ).with( host, cmd, {:accept_all_exit_codes=>true} ).exactly( 1 ).times
-      expect( subject ).to receive( :on ).with( host, "cd #{path}/#{repo[:name]} && git remote rm origin && git remote add origin #{repo[:path]} && git fetch origin +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/*:refs/remotes/origin/* && git clean -fdx && git checkout -f #{repo[:rev]}", {:accept_all_exit_codes=>true} ).exactly( 1 ).times
+      expect(subject).to receive(:on).with(host, cmd, { accept_all_exit_codes: true }).exactly(1).times
+      expect(subject).to receive(:on).with(host,
+                                           "cd #{path}/#{repo[:name]} && git remote rm origin && git remote add origin #{repo[:path]} && git fetch origin +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/*:refs/remotes/origin/* && git clean -fdx && git checkout -f #{repo[:rev]}", { accept_all_exit_codes: true }).exactly(1).times
 
-      subject.instance_variable_set( :@metadata, {} )
-      subject.clone_git_repo_on( host, path, repo )
+      subject.instance_variable_set(:@metadata, {})
+      subject.clone_git_repo_on(host, path, repo)
     end
 
     it 'allows a checkout depth with a rev from a specific branch' do
-      repo   = { :name => 'puppet',
-                 :path => 'git://my.server.net/puppet.git',
-                 :rev => 'a2340acddadfeafd234230faf',
-                 :depth => 50,
-                 :depth_branch => 'master' }
+      repo   = { name: 'puppet',
+                 path: 'git://my.server.net/puppet.git',
+                 rev: 'a2340acddadfeafd234230faf',
+                 depth: 50,
+                 depth_branch: 'master', }
 
       path   = '/path/to/repos'
       cmd    = "test -d #{path}/#{repo[:name]} || git clone --branch #{repo[:depth_branch]} --depth #{repo[:depth]} #{repo[:path]} #{path}/#{repo[:name]}"
       host   = { 'platform' => 'debian' }
-      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
+      allow(subject).to receive(:configure_foss_defaults_on).and_return(true)
       logger = double.as_null_object
-      allow( subject ).to receive( :metadata ).and_return( metadata )
-      expect( subject ).to receive( :logger ).exactly( 2 ).times.and_return( logger )
-      expect( subject ).to receive( :on ).with( host, "test -d #{path} || mkdir -p #{path}", {:accept_all_exit_codes=>true} ).exactly( 1 ).times
+      allow(subject).to receive(:metadata).and_return(metadata)
+      expect(subject).to receive(:logger).exactly(2).times.and_return(logger)
+      expect(subject).to receive(:on).with(host, "test -d #{path} || mkdir -p #{path}",
+                                           { accept_all_exit_codes: true }).exactly(1).times
       # this is the the command we want to test
-      expect( subject ).to receive( :on ).with( host, cmd, {:accept_all_exit_codes=>true} ).exactly( 1 ).times
-      expect( subject ).to receive( :on ).with( host, "cd #{path}/#{repo[:name]} && git remote rm origin && git remote add origin #{repo[:path]} && git fetch origin +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/*:refs/remotes/origin/* && git clean -fdx && git checkout -f #{repo[:rev]}", {:accept_all_exit_codes=>true} ).exactly( 1 ).times
+      expect(subject).to receive(:on).with(host, cmd, { accept_all_exit_codes: true }).exactly(1).times
+      expect(subject).to receive(:on).with(host,
+                                           "cd #{path}/#{repo[:name]} && git remote rm origin && git remote add origin #{repo[:path]} && git fetch origin +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/*:refs/remotes/origin/* && git clean -fdx && git checkout -f #{repo[:rev]}", { accept_all_exit_codes: true }).exactly(1).times
 
-      subject.instance_variable_set( :@metadata, {} )
-      subject.clone_git_repo_on( host, path, repo )
+      subject.instance_variable_set(:@metadata, {})
+      subject.clone_git_repo_on(host, path, repo)
     end
   end
 
   context 'install_from_git' do
     it 'does a ton of stuff it probably shouldnt' do
-      repo = { :name => 'puppet',
-               :path => 'git://my.server.net/puppet.git',
-               :rev => 'master' }
+      repo = { name: 'puppet',
+               path: 'git://my.server.net/puppet.git',
+               rev: 'master', }
       path = '/path/to/repos'
       host = { 'platform' => 'debian' }
       logger = double.as_null_object
 
-      allow( subject ).to receive( :metadata ).and_return( metadata )
-      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
+      allow(subject).to receive(:metadata).and_return(metadata)
+      allow(subject).to receive(:configure_foss_defaults_on).and_return(true)
 
-      expect( subject ).to receive( :logger ).exactly( 3 ).times.and_return( logger )
-      expect( subject ).to receive( :on ).exactly( 4 ).times
+      expect(subject).to receive(:logger).exactly(3).times.and_return(logger)
+      expect(subject).to receive(:on).exactly(4).times
 
-      subject.instance_variable_set( :@metadata, {} )
-      subject.install_from_git( host, path, repo )
+      subject.instance_variable_set(:@metadata, {})
+      subject.install_from_git(host, path, repo)
     end
 
     it 'should attempt to install ruby code' do
-      repo   = { :name => 'puppet',
-                 :path => 'git://my.server.net/puppet.git',
-                 :rev => 'master',
-                 :depth => 1 }
+      repo   = { name: 'puppet',
+                 path: 'git://my.server.net/puppet.git',
+                 rev: 'master',
+                 depth: 1, }
 
       path   = '/path/to/repos'
       cmd    = "test -d #{path}/#{repo[:name]} || git clone --branch #{repo[:rev]} --depth #{repo[:depth]} #{repo[:path]} #{path}/#{repo[:name]}"
       host   = { 'platform' => 'debian' }
       logger = double.as_null_object
-      allow( subject ).to receive( :metadata ).and_return( metadata )
-      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
-      expect( subject ).to receive( :logger ).exactly( 3 ).times.and_return( logger )
-      expect( subject ).to receive( :on ).with( host, "test -d #{path} || mkdir -p #{path}", {:accept_all_exit_codes=>true} ).exactly( 1 ).times
-      expect( subject ).to receive( :on ).with( host, cmd, {:accept_all_exit_codes=>true} ).exactly( 1 ).times
-      expect( subject ).to receive( :on ).with( host, "cd #{path}/#{repo[:name]} && git remote rm origin && git remote add origin #{repo[:path]} && git fetch origin +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/*:refs/remotes/origin/* && git clean -fdx && git checkout -f #{repo[:rev]}", {:accept_all_exit_codes=>true} ).exactly( 1 ).times
-      expect( subject ).to receive( :on ).with( host, "cd #{path}/#{repo[:name]} && if [ -f install.rb ]; then ruby ./install.rb ; else true; fi", {:accept_all_exit_codes=>true} ).exactly( 1 ).times
-
-      subject.instance_variable_set( :@metadata, {} )
-      subject.install_from_git_on( host, path, repo )
+      allow(subject).to receive(:metadata).and_return(metadata)
+      allow(subject).to receive(:configure_foss_defaults_on).and_return(true)
+      expect(subject).to receive(:logger).exactly(3).times.and_return(logger)
+      expect(subject).to receive(:on).with(host, "test -d #{path} || mkdir -p #{path}",
+                                           { accept_all_exit_codes: true }).exactly(1).times
+      expect(subject).to receive(:on).with(host, cmd, { accept_all_exit_codes: true }).exactly(1).times
+      expect(subject).to receive(:on).with(host,
+                                           "cd #{path}/#{repo[:name]} && git remote rm origin && git remote add origin #{repo[:path]} && git fetch origin +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/*:refs/remotes/origin/* && git clean -fdx && git checkout -f #{repo[:rev]}", { accept_all_exit_codes: true }).exactly(1).times
+      expect(subject).to receive(:on).with(host,
+                                           "cd #{path}/#{repo[:name]} && if [ -f install.rb ]; then ruby ./install.rb ; else true; fi", { accept_all_exit_codes: true }).exactly(1).times
+
+      subject.instance_variable_set(:@metadata, {})
+      subject.install_from_git_on(host, path, repo)
     end
-   end
+  end
 
   describe '#install_puppet' do
     let(:hosts) do
-      make_hosts({:platform => platform })
+      make_hosts({ platform: platform })
     end
 
     before do
-      allow( subject ).to receive(:options).and_return(opts)
-      allow( subject ).to receive(:hosts).and_return(hosts)
-      allow( subject ).to receive(:on).and_return(Beaker::Result.new({},''))
+      allow(subject).to receive(:options).and_return(opts)
+      allow(subject).to receive(:hosts).and_return(hosts)
+      allow(subject).to receive(:on).and_return(Beaker::Result.new({}, ''))
     end
     context 'on el-6' do
       let(:platform) { Beaker::Platform.new('el-6-i386') }
       it 'installs' do
-        expect(hosts[0]).to receive(:install_package_with_rpm).with(/puppet-release-el-6\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
+        expect(hosts[0]).to receive(:install_package_with_rpm).with(/puppet-release-el-6\.noarch\.rpm/,
+                                                                    '--replacepkgs', { package_proxy: false })
         expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
       it 'installs in parallel' do
         InParallel::InParallelExecutor.logger = logger
         FakeFS.deactivate!
-        hosts.each{ |host|
-          allow(host).to receive(:install_package_with_rpm).with(/puppet-release-el-6\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
+        hosts.each do |host|
+          allow(host).to receive(:install_package_with_rpm).with(/puppet-release-el-6\.noarch\.rpm/, '--replacepkgs',
+                                                                 { package_proxy: false })
           allow(host).to receive(:install_package).with('puppet')
-        }
+        end
         opts[:run_in_parallel] = true
         # This will only get hit if forking processes is supported and at least 2 items are being submitted to run in parallel
-        expect( InParallel::InParallelExecutor ).to receive(:_execute_in_parallel).with(any_args).and_call_original.exactly(3).times
+        expect(InParallel::InParallelExecutor).to receive(:_execute_in_parallel).with(any_args).and_call_original.exactly(3).times
         subject.install_puppet(opts)
       end
       it 'installs specific version of puppet when passed :version' do
         expect(hosts[0]).to receive(:install_package).with('puppet-3')
-        subject.install_puppet( :version => '3' )
+        subject.install_puppet(version: '3')
       end
       it 'can install specific versions of puppets dependencies' do
         expect(hosts[0]).to receive(:install_package).with('puppet-3')
         expect(hosts[0]).to receive(:install_package).with('hiera-2001')
         expect(hosts[0]).to receive(:install_package).with('facter-1999')
-        subject.install_puppet( :version => '3', :facter_version => '1999', :hiera_version => '2001' )
+        subject.install_puppet(version: '3', facter_version: '1999', hiera_version: '2001')
       end
     end
     context 'on el-5' do
       let(:platform) { Beaker::Platform.new('el-5-i386') }
       it 'installs' do
-        expect(hosts[0]).to receive(:install_package_with_rpm).with(%r{puppet-release-el-5.noarch.rpm}, '--replacepkgs', {:package_proxy=>false})
+        expect(hosts[0]).to receive(:install_package_with_rpm).with(/puppet-release-el-5.noarch.rpm/, '--replacepkgs',
+                                                                    { package_proxy: false })
         expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
@@ -547,7 +590,8 @@ describe ClassMixedWithDSLInstallUtils do
     context 'on fedora' do
       let(:platform) { Beaker::Platform.new('fedora-18-x86_84') }
       it 'installs' do
-        expect(hosts[0]).to receive(:install_package_with_rpm).with(%r{puppet-release-fedora-18.noarch.rpm}, '--replacepkgs', {:package_proxy=>false})
+        expect(hosts[0]).to receive(:install_package_with_rpm).with(/puppet-release-fedora-18.noarch.rpm/,
+                                                                    '--replacepkgs', { package_proxy: false })
         expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
@@ -559,6 +603,13 @@ describe ClassMixedWithDSLInstallUtils do
         subject.install_puppet
       end
     end
+    context 'on freebsd' do
+      let(:platform) { Beaker::Platform.new('freebsd-13-amd64') }
+      it 'installs' do
+        expect(hosts[0]).to receive(:install_package).with('sysutils/puppet7')
+        subject.install_puppet
+      end
+    end
     context 'on debian' do
       PlatformHelpers::DEBIANPLATFORMS.each do |platform|
         let(:platform) { Beaker::Platform.new("#{platform}-ver-arch") }
@@ -573,14 +624,14 @@ describe ClassMixedWithDSLInstallUtils do
       it 'installs specific version of puppet when passed :version' do
         expect(hosts[0]).to receive(:install_package).with('puppet=3-1puppetlabs1')
         expect(hosts[0]).to receive(:install_package).with('puppet-common=3-1puppetlabs1')
-        subject.install_puppet( :version => '3' )
+        subject.install_puppet(version: '3')
       end
       it 'can install specific versions of puppets dependencies' do
         expect(hosts[0]).to receive(:install_package).with('facter=1999-1puppetlabs1')
         expect(hosts[0]).to receive(:install_package).with('hiera=2001-1puppetlabs1')
         expect(hosts[0]).to receive(:install_package).with('puppet-common=3-1puppetlabs1')
         expect(hosts[0]).to receive(:install_package).with('puppet=3-1puppetlabs1')
-        subject.install_puppet( :version => '3', :facter_version => '1999', :hiera_version => '2001' )
+        subject.install_puppet(version: '3', facter_version: '1999', hiera_version: '2001')
       end
     end
     context 'on windows' do
@@ -589,37 +640,40 @@ describe ClassMixedWithDSLInstallUtils do
       before :each do
         allow(winhost).to receive(:tmpdir).and_return(win_temp)
         allow(winhost).to receive(:is_cygwin?).and_return(true)
-        allow(subject).to receive(:link_exists?).and_return( true )
+        allow(subject).to receive(:link_exists?).and_return(true)
         allow(subject).to receive(:install_msi_on).with(any_args)
       end
 
       it 'installs specific version of puppet when passed :version' do
         hosts.each do |host|
-          if host != winhost
-            allow(subject).to receive(:on).with(host, anything)
-          else
+          if host == winhost
             expect(subject).to receive(:on).with(winhost, "curl -o \"#{win_temp}\\puppet-3.msi\" -O http://downloads.puppet.com/windows/puppet-3.msi")
-            expect(subject).to receive(:on).with(winhost, " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
-            expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.msi", {}, {:debug => nil}).exactly(1).times
+            expect(subject).to receive(:on).with(winhost,
+                                                 " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
+            expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.msi", {},
+                                                             { debug: nil }).exactly(1).times
+          else
+            allow(subject).to receive(:on).with(host, anything)
           end
         end
-        subject.install_puppet(:version => '3')
+        subject.install_puppet(version: '3')
       end
       it 'installs from custom url when passed :win_download_url' do
         hosts.each do |host|
-          if host != winhost
-            allow(subject).to receive(:on).with(host, anything)
-          else
+          if host == winhost
             expect(subject).to receive(:on).with(winhost, "curl -o \"#{win_temp}\\puppet-3.msi\" -O http://nightlies.puppet.com/puppet-latest/repos/windows/puppet-3.msi")
-            expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.msi", {}, {:debug => nil})
+            expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.msi", {}, { debug: nil })
+          else
+            allow(subject).to receive(:on).with(host, anything)
           end
         end
-        subject.install_puppet( :version => '3', :win_download_url => 'http://nightlies.puppet.com/puppet-latest/repos/windows' )
+        subject.install_puppet(version: '3',
+                               win_download_url: 'http://nightlies.puppet.com/puppet-latest/repos/windows')
       end
     end
     describe 'on unsupported platforms' do
       let(:platform) { Beaker::Platform.new('solaris-11-x86_64') }
-      let(:host) { make_host('henry', :platform => 'solaris-11-x86_64') }
+      let(:host) { make_host('henry', platform: 'solaris-11-x86_64') }
       let(:hosts) { [host] }
       it 'by default raises an error' do
         expect(subject).to_not receive(:on)
@@ -628,10 +682,10 @@ describe ClassMixedWithDSLInstallUtils do
       it 'falls back to installing from gem when given :default_action => "gem_install"' do
         result = double
         gem_env_string = '{"RubyGems Environment": [ {"GEM PATHS": [], "EXECUTABLE DIRECTORY": "/does/not/exist" } ] }'
-        allow( result ).to receive(:stdout).and_return gem_env_string
+        allow(result).to receive(:stdout).and_return gem_env_string
         allow(subject).to receive(:on).with(host, /gem environment/).and_return result
         expect(subject).to receive(:on).with(host, /gem install/)
-        subject.install_puppet :default_action => 'gem_install'
+        subject.install_puppet default_action: 'gem_install'
       end
     end
   end
@@ -640,13 +694,13 @@ describe ClassMixedWithDSLInstallUtils do
     context 'on debian' do
       PlatformHelpers::DEBIANPLATFORMS.each do |platform|
         let(:platform) { Beaker::Platform.new("#{platform}-ver-arch") }
-        let(:host) { make_host('testbox.test.local', :platform => "#{platform}") }
+        let(:host) { make_host('testbox.test.local', platform: "#{platform}") }
         it "it sets the puppet.conf file to the provided config on #{platform}" do
-          config = { 'main' => {'server' => 'testbox.test.local'} }
+          config = { 'main' => { 'server' => 'testbox.test.local' } }
           expected_config_string = "[main]\nserver=testbox.test.local\n\n"
 
-          expect( subject ).to receive( :create_remote_file ).with(
-              host, anything, expected_config_string
+          expect(subject).to receive(:create_remote_file).with(
+            host, anything, expected_config_string
           )
           subject.configure_puppet_on(host, config)
         end
@@ -654,13 +708,13 @@ describe ClassMixedWithDSLInstallUtils do
     end
     context 'on windows' do
       let(:platform) { 'windows-2008R2-amd64' }
-      let(:host) { make_host('testbox.test.local', :platform => 'windows-2008R2-amd64') }
+      let(:host) { make_host('testbox.test.local', platform: 'windows-2008R2-amd64') }
 
       it 'it sets the puppet.conf file to the provided config' do
-        config = { 'main' => {'server' => 'testbox.test.local'} }
+        config = { 'main' => { 'server' => 'testbox.test.local' } }
         expected_config_string = "[main]\nserver=testbox.test.local\n\n"
 
-        expect( subject ).to receive( :create_remote_file ).with(
+        expect(subject).to receive(:create_remote_file).with(
           host, anything, expected_config_string
         )
         subject.configure_puppet_on(host, config)
@@ -670,22 +724,22 @@ describe ClassMixedWithDSLInstallUtils do
 
   describe 'configure_puppet' do
     let(:hosts) do
-      make_hosts({:platform => platform })
+      make_hosts({ platform: platform })
     end
 
     before do
-      allow( subject ).to receive(:hosts).and_return(hosts)
-      allow( subject ).to receive(:on).and_return(Beaker::Result.new({},''))
+      allow(subject).to receive(:hosts).and_return(hosts)
+      allow(subject).to receive(:on).and_return(Beaker::Result.new({}, ''))
     end
 
     context 'on debian' do
       PlatformHelpers::DEBIANPLATFORMS.each do |platform|
         let(:platform) { Beaker::Platform.new("#{platform}-ver-arch") }
         it "calls configure_puppet_on correctly on #{platform}" do
-          config = { 'main' => {'server' => 'testbox.test.local'} }
-          expect( subject ).to receive( :configure_puppet_on ).with(
-              anything, config
-          ).exactly( hosts.length ).times
+          config = { 'main' => { 'server' => 'testbox.test.local' } }
+          expect(subject).to receive(:configure_puppet_on).with(
+            anything, config
+          ).exactly(hosts.length).times
           subject.configure_puppet(config)
         end
       end
@@ -695,157 +749,154 @@ describe ClassMixedWithDSLInstallUtils do
       let(:platform) { 'windows-2008R2-amd64' }
 
       it 'calls configure_puppet_on correctly' do
-        config = { 'main' => {'server' => 'testbox.test.local'} }
-        expect( subject ).to receive( :configure_puppet_on ).with(
+        config = { 'main' => { 'server' => 'testbox.test.local' } }
+        expect(subject).to receive(:configure_puppet_on).with(
           anything, config
-        ).exactly( hosts.length ).times
+        ).exactly(hosts.length).times
         subject.configure_puppet(config)
       end
     end
   end
 
-  describe "#install_puppetlabs_release_repo" do
-    let( :platform ) { Beaker::Platform.new('solaris-7-i386') }
-    let( :host ) do
+  describe '#install_puppetlabs_release_repo' do
+    let(:platform) { Beaker::Platform.new('solaris-7-i386') }
+    let(:host) do
       FakeHost.create('fakevm', platform.to_s)
     end
 
     before do
       allow(subject).to receive(:options) { opts }
-      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
+      allow(subject).to receive(:configure_foss_defaults_on).and_return(true)
     end
 
-    describe "When host is unsupported platform" do
-      let( :platform ) { Beaker::Platform.new('solaris-7-i386') }
+    describe 'When host is unsupported platform' do
+      let(:platform) { Beaker::Platform.new('solaris-7-i386') }
 
-      it "raises an exception." do
-        expect{
+      it 'raises an exception.' do
+        expect do
           subject.install_puppetlabs_release_repo host
-        }.to raise_error(RuntimeError, /No repository installation step for/)
+        end.to raise_error(RuntimeError, /No repository installation step for/)
       end
     end
 
-    describe "When host is a debian-like platform" do
-      let( :platform ) { Beaker::Platform.new('debian-7-i386') }
+    describe 'When host is a debian-like platform' do
+      let(:platform) { Beaker::Platform.new('debian-7-i386') }
 
-      it "downloads a deb file, installs, and updates the apt cache." do
-        expect(subject).to receive(:on).with( host, /wget .*/ ).ordered
-        expect(subject).to receive(:on).with( host, /dpkg .*/ ).ordered
-        expect(subject).to receive(:on).with( host, "apt-get update" ).ordered
+      it 'downloads a deb file, installs, and updates the apt cache.' do
+        expect(subject).to receive(:on).with(host, /wget .*/).ordered
+        expect(subject).to receive(:on).with(host, /dpkg .*/).ordered
+        expect(subject).to receive(:on).with(host, 'apt-get update').ordered
         subject.install_puppetlabs_release_repo host
       end
-
     end
-
   end
 
   describe '#install_puppetlabs_release_repo_on' do
-    let( :host ) do
-      FakeHost.create( 'fakevm', platform.to_s )
+    let(:host) do
+      FakeHost.create('fakevm', platform.to_s)
     end
 
     before :each do
-      allow( subject ).to receive( :options ) { opts }
+      allow(subject).to receive(:options) { opts }
     end
 
     context 'on el 7' do
-      let( :platform ) { Beaker::Platform.new( 'el-7-x86_64' ) }
+      let(:platform) { Beaker::Platform.new('el-7-x86_64') }
       it 'returns the correct url when repo is set to puppet8' do
-        expect( host ).to receive( :install_package_with_rpm ).with( /puppet8-release-el-7\.noarch\.rpm$/, '--replacepkgs', {:package_proxy=>false} )
-        subject.install_puppetlabs_release_repo_on( host, 'puppet8')
+        expect(host).to receive(:install_package_with_rpm).with(/puppet8-release-el-7\.noarch\.rpm$/,
+                                                                '--replacepkgs', { package_proxy: false })
+        subject.install_puppetlabs_release_repo_on(host, 'puppet8')
       end
       it 'returns the correct url when opts[:puppet_collection] is set to puppet14' do
-        expect( host ).to receive( :install_package_with_rpm ).with( /puppet14-release-el-7\.noarch\.rpm$/, '--replacepkgs', {:package_proxy=>false} )
-        subject.install_puppetlabs_release_repo_on( host, nil, {:puppet_collection => 'puppet14'})
+        expect(host).to receive(:install_package_with_rpm).with(/puppet14-release-el-7\.noarch\.rpm$/,
+                                                                '--replacepkgs', { package_proxy: false })
+        subject.install_puppetlabs_release_repo_on(host, nil, { puppet_collection: 'puppet14' })
       end
       it 'returns the correct url when both repo and opts[:puppet_collection] are nil' do
-        expect( host ).to receive( :install_package_with_rpm ).with( /puppet-release-el-7\.noarch\.rpm$/, '--replacepkgs', {:package_proxy=>false} )
-        subject.install_puppetlabs_release_repo_on( host )
+        expect(host).to receive(:install_package_with_rpm).with(/puppet-release-el-7\.noarch\.rpm$/,
+                                                                '--replacepkgs', { package_proxy: false })
+        subject.install_puppetlabs_release_repo_on(host)
       end
     end
 
     context 'on debian 8' do
-      let( :platform ) { Beaker::Platform.new( 'debian-8-i386' ) }
+      let(:platform) { Beaker::Platform.new('debian-8-i386') }
       it 'returns the correct url when repo is set to puppet4' do
-        expect( subject ).to receive( :on ).with( host, /puppet4-release-jessie\.deb$/ ).once
-        expect( subject ).to receive( :on ).with( host, "dpkg -i --force-all /tmp/puppet.deb" ).once
-        expect( subject ).to receive( :on ).with( host, "apt-get update" ).once
-        subject.install_puppetlabs_release_repo_on( host, 'puppet4' )
+        expect(subject).to receive(:on).with(host, /puppet4-release-jessie\.deb$/).once
+        expect(subject).to receive(:on).with(host, 'dpkg -i --force-all /tmp/puppet.deb').once
+        expect(subject).to receive(:on).with(host, 'apt-get update').once
+        subject.install_puppetlabs_release_repo_on(host, 'puppet4')
       end
       it 'returns the correct url when opts[:puppet_collection] is set to puppet7' do
-        expect( subject ).to receive( :on ).with( host, /puppet7-release-jessie\.deb$/ ).once
-        expect( subject ).to receive( :on ).with( host, "dpkg -i --force-all /tmp/puppet.deb" ).once
-        expect( subject ).to receive( :on ).with( host, "apt-get update" ).once
-        subject.install_puppetlabs_release_repo_on( host, nil, {:puppet_collection => 'puppet7'} )
+        expect(subject).to receive(:on).with(host, /puppet7-release-jessie\.deb$/).once
+        expect(subject).to receive(:on).with(host, 'dpkg -i --force-all /tmp/puppet.deb').once
+        expect(subject).to receive(:on).with(host, 'apt-get update').once
+        subject.install_puppetlabs_release_repo_on(host, nil, { puppet_collection: 'puppet7' })
       end
       it 'returns the correct url when both repo and opts[:puppet_collection] are nil' do
-        expect( subject ).to receive( :on ).with( host, /puppet-release-jessie\.deb$/ ).once
-        expect( subject ).to receive( :on ).with( host, "dpkg -i --force-all /tmp/puppet.deb" ).once
-        expect( subject ).to receive( :on ).with( host, "apt-get update" ).once
-        subject.install_puppetlabs_release_repo_on( host )
+        expect(subject).to receive(:on).with(host, /puppet-release-jessie\.deb$/).once
+        expect(subject).to receive(:on).with(host, 'dpkg -i --force-all /tmp/puppet.deb').once
+        expect(subject).to receive(:on).with(host, 'apt-get update').once
+        subject.install_puppetlabs_release_repo_on(host)
       end
     end
 
-
     context 'on cisco platforms' do
       context 'version 5' do
-        let( :platform ) { Beaker::Platform.new( 'cisco_nexus-7-x86_64' ) }
+        let(:platform) { Beaker::Platform.new('cisco_nexus-7-x86_64') }
 
         it 'calls host.install_package' do
-          expect( host ).to receive( :install_package ).with( /\.rpm$/ )
-          subject.install_puppetlabs_release_repo_on( host )
+          expect(host).to receive(:install_package).with(/\.rpm$/)
+          subject.install_puppetlabs_release_repo_on(host)
         end
       end
 
       context 'version 7' do
-        let( :platform ) { Beaker::Platform.new( 'cisco_ios_xr-6-x86_64' ) }
+        let(:platform) { Beaker::Platform.new('cisco_ios_xr-6-x86_64') }
 
         it 'uses yum localinstall to install the package' do
-          expect( subject ).to receive( :on ).with( host, /^yum.*localinstall.*\.rpm$/ )
-          subject.install_puppetlabs_release_repo_on( host )
+          expect(subject).to receive(:on).with(host, /^yum.*localinstall.*\.rpm$/)
+          subject.install_puppetlabs_release_repo_on(host)
         end
       end
     end
-
   end
 
-  describe "#install_puppetlabs_dev_repo" do
-    let( :package_name ) { "puppet" }
-    let( :package_version ) { "7.5.6" }
-    let( :host ) do
+  describe '#install_puppetlabs_dev_repo' do
+    let(:package_name) { 'puppet' }
+    let(:package_version) { '7.5.6' }
+    let(:host) do
       h = FakeHost.create('fakvm', platform.to_s, opts)
-      allow( h ).to receive( :link_exists? ).and_return( true )
+      allow(h).to receive(:link_exists?).and_return(true)
       h
     end
-    let( :logger_double ) do
+    let(:logger_double) do
       logger_double = Object.new
       allow(logger_double).to receive(:debug)
       allow(logger_double).to receive(:trace)
-      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
+      allow(subject).to receive(:configure_foss_defaults_on).and_return(true)
       subject.instance_variable_set(:@logger, logger_double)
       logger_double
     end
 
-    RSpec.shared_examples "install-dev-repo" do
-
+    RSpec.shared_examples 'install-dev-repo' do
       it "scp's files to SUT then modifies them with find-and-sed 2-hit combo" do
         allow(rez).to receive(:exit_code) { 0 }
         allow(subject).to receive(:link_exists?).and_return(true)
-        expect(subject).to receive(:scp_to).with( host, repo_config, /.*/ ).ordered
+        expect(subject).to receive(:scp_to).with(host, repo_config, /.*/).ordered
         subject.install_puppetlabs_dev_repo host, package_name, package_version
       end
-
     end
 
-    describe "When host is unsupported platform" do
-      let( :platform ) { Beaker::Platform.new('solaris-7-i386') }
+    describe 'When host is unsupported platform' do
+      let(:platform) { Beaker::Platform.new('solaris-7-i386') }
 
-      it "raises an exception." do
+      it 'raises an exception.' do
         # expect(subject).to receive(:on).with( host, /^mkdir -p .*$/ ).ordered
         allow(subject).to receive(:options) { opts }
-        expect{
+        expect do
           subject.install_puppetlabs_dev_repo host, package_name, package_version
-        }.to raise_error(RuntimeError, /No repository installation step for/)
+        end.to raise_error(RuntimeError, /No repository installation step for/)
       end
     end
 
@@ -854,161 +905,154 @@ describe ClassMixedWithDSLInstallUtils do
       # are expectations in the share examples, but aren't interesting
       # beyond those basic tests
       def stub_uninteresting_portions_of_install_puppetlabs_dev_repo!
-        allow(subject).to receive(:scp_to).with( host, repo_config, /.*/ ).ordered
+        allow(subject).to receive(:scp_to).with(host, repo_config, /.*/).ordered
       end
 
-      let( :repo_config ) { "repoconfig" }
-      let( :repo_dir ) { "repodir" }
-      let( :rez ) { double }
+      let(:repo_config) { 'repoconfig' }
+      let(:repo_dir) { 'repodir' }
+      let(:rez) { double }
 
       before do
         allow(subject).to receive(:fetch_http_file) { repo_config }
         allow(subject).to receive(:fetch_http_dir) { repo_dir }
-        allow(subject).to receive(:on).with(host, "apt-get update") { }
+        allow(subject).to receive(:on).with(host, 'apt-get update') {}
         allow(subject).to receive(:options) { opts }
-        allow(subject).to receive(:on).with( host, /^.* -d .*/, {:acceptable_exit_codes =>[0,1]} ).and_return(rez)
+        allow(subject).to receive(:on).with(host, /^.* -d .*/, { acceptable_exit_codes: [0, 1] }).and_return(rez)
       end
 
-      describe "that are debian-like" do
+      describe 'that are debian-like' do
         PlatformHelpers::DEBIANPLATFORMS.each do |platform|
           let(:platform) { Beaker::Platform.new("#{platform}-ver-arch") }
           before { allow(subject).to receive(:link_exists?).and_return(true) }
 
-          include_examples "install-dev-repo"
-
+          include_examples 'install-dev-repo'
         end
       end
 
-      describe "that are redhat-like" do
-        let( :platform ) { Beaker::Platform.new('el-7-i386') }
-        include_examples "install-dev-repo"
+      describe 'that are redhat-like' do
+        let(:platform) { Beaker::Platform.new('el-7-i386') }
+        include_examples 'install-dev-repo'
       end
     end
   end
 
   describe '#install_packages_from_local_dev_repo' do
-    let( :package_name ) { 'puppet-agent' }
-    let( :platform ) { @platform || 'other' }
-    let( :host ) do
+    let(:package_name) { 'puppet-agent' }
+    let(:platform) { @platform || 'other' }
+    let(:host) do
       FakeHost.create('fakvm', platform, opts)
     end
 
     before :each do
-      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
+      allow(subject).to receive(:configure_foss_defaults_on).and_return(true)
     end
 
     it 'sets the find command correctly for el-based systems' do
       @platform = 'el-1-3'
-      expect( subject ).to receive( :on ).with( host, /\*\.rpm.+rpm\s-ivh/ )
-      subject.install_packages_from_local_dev_repo( host, package_name )
+      expect(subject).to receive(:on).with(host, /\*\.rpm.+rpm\s-ivh/)
+      subject.install_packages_from_local_dev_repo(host, package_name)
     end
 
     it 'sets the find command correctly for debian-based systems' do
       @platform = 'debian-1-3'
-      expect( subject ).to receive( :on ).with( host, /\*\.deb.+dpkg\s-i/ )
-      subject.install_packages_from_local_dev_repo( host, package_name )
+      expect(subject).to receive(:on).with(host, /\*\.deb.+dpkg\s-i/)
+      subject.install_packages_from_local_dev_repo(host, package_name)
     end
 
     it 'fails correctly for systems not accounted for' do
       @platform = 'eos-1-3'
-      expect{ subject.install_packages_from_local_dev_repo( host, package_name ) }.to raise_error RuntimeError
+      expect { subject.install_packages_from_local_dev_repo(host, package_name) }.to raise_error RuntimeError
     end
-
   end
 
   describe '#msi_link_path' do
-    let( :opts )     { { :puppet_agent_version => 'VERSION', :win_download_url => 'http://downloads.puppet.com/windows' } }
-    let( :platform ) { 'windows' }
-    let( :host )     { { :platform => platform, 'dist' => 'puppet-agent-VERSION-x64' } }
+    let(:opts)     { { puppet_agent_version: 'VERSION', win_download_url: 'http://downloads.puppet.com/windows' } }
+    let(:platform) { 'windows' }
+    let(:host)     { { :platform => platform, 'dist' => 'puppet-agent-VERSION-x64' } }
 
     it 'returns the right link when puppet collection is set' do
-      allow(subject).to receive(:link_exists?).with(anything()).and_return( true )
+      allow(subject).to receive(:link_exists?).with(anything).and_return(true)
 
-      expect(subject.msi_link_path( host, opts.merge({:puppet_collection => 'puppet'}) )).to eq "#{opts[:win_download_url]}/puppet/puppet-agent-VERSION-x64.msi"
+      expect(subject.msi_link_path(host,
+                                   opts.merge({ puppet_collection: 'puppet' }))).to eq "#{opts[:win_download_url]}/puppet/puppet-agent-VERSION-x64.msi"
     end
 
     it 'returns the right link when puppet collection is not set' do
-      expect(subject).to receive(:link_exists?).with(anything()).and_return( true )
+      expect(subject).to receive(:link_exists?).with(anything).and_return(true)
 
-      expect(subject.msi_link_path( host, opts )).to eq "#{opts[:win_download_url]}/puppet-agent-VERSION-x64.msi"
+      expect(subject.msi_link_path(host, opts)).to eq "#{opts[:win_download_url]}/puppet-agent-VERSION-x64.msi"
     end
 
     it 'returns error when link incorrect' do
-      allow(subject).to receive(:link_exists?).with(anything()).and_return( false )
+      allow(subject).to receive(:link_exists?).with(anything).and_return(false)
 
-      expect{
-        subject.msi_link_path( host, opts )
-      }.to raise_error(RuntimeError, /Puppet MSI at http:\/\/downloads.puppet.com\/windows\/puppet-agent-VERSION-x64.msi does not exist!/)
+      expect do
+        subject.msi_link_path(host, opts)
+      end.to raise_error(RuntimeError,
+                         %r{Puppet MSI at http://downloads.puppet.com/windows/puppet-agent-VERSION-x64.msi does not exist!})
     end
   end
 
   describe '#install_puppet_agent_from_msi_on' do
-    let( :opts )     { { :puppet_agent_version => 'VERSION', :win_download_url => 'http://downloads.puppet.com/windows' } }
-    let( :platform ) { 'windows' }
-    let( :host )     { { :platform => platform } }
+    let(:opts)     { { puppet_agent_version: 'VERSION', win_download_url: 'http://downloads.puppet.com/windows' } }
+    let(:platform) { 'windows' }
+    let(:host)     { { platform: platform } }
 
     it 'uses x86 msi when host is_x86_64 and install_32 is set on the host' do
       host['install_32'] = true
 
-      expect( host ).to receive( :is_x86_64? ).and_return( true )
-      expect( subject ).to receive( :install_a_puppet_msi_on ).with( host, opts )
-
-      subject.install_puppet_agent_from_msi_on( host, opts )
-      expect( host['dist'] ).to be == "puppet-agent-VERSION-x86"
+      expect(host).to receive(:is_x86_64?).and_return(true)
+      expect(subject).to receive(:install_a_puppet_msi_on).with(host, opts)
 
+      subject.install_puppet_agent_from_msi_on(host, opts)
+      expect(host['dist']).to eq 'puppet-agent-VERSION-x86'
     end
 
     it 'uses x86 msi when host is_x86_64 and install_32 is set on the options' do
       opts['install_32'] = true
 
-      expect( host ).to receive( :is_x86_64? ).and_return( true )
-      expect( subject ).to receive( :install_a_puppet_msi_on ).with( host, opts )
-
-      subject.install_puppet_agent_from_msi_on( host, opts )
-      expect( host['dist'] ).to be == "puppet-agent-VERSION-x86"
+      expect(host).to receive(:is_x86_64?).and_return(true)
+      expect(subject).to receive(:install_a_puppet_msi_on).with(host, opts)
 
+      subject.install_puppet_agent_from_msi_on(host, opts)
+      expect(host['dist']).to eq 'puppet-agent-VERSION-x86'
     end
 
     it 'uses x86 msi when host is_x86_64 and ruby_arch is x86 on the host' do
       host['ruby_arch'] = 'x86'
 
-      expect( host ).to receive( :is_x86_64? ).and_return( true )
-      expect( subject ).to receive( :install_a_puppet_msi_on ).with( host, opts )
-
-      subject.install_puppet_agent_from_msi_on( host, opts )
-      expect( host['dist'] ).to be == "puppet-agent-VERSION-x86"
+      expect(host).to receive(:is_x86_64?).and_return(true)
+      expect(subject).to receive(:install_a_puppet_msi_on).with(host, opts)
 
+      subject.install_puppet_agent_from_msi_on(host, opts)
+      expect(host['dist']).to eq 'puppet-agent-VERSION-x86'
     end
 
     it 'uses x86 msi when host !is_x86_64' do
+      expect(host).to receive(:is_x86_64?).and_return(false)
+      expect(subject).to receive(:install_a_puppet_msi_on).with(host, opts)
 
-      expect( host ).to receive( :is_x86_64? ).and_return( false )
-      expect( subject ).to receive( :install_a_puppet_msi_on ).with( host, opts )
-
-      subject.install_puppet_agent_from_msi_on( host, opts )
-      expect( host['dist'] ).to be == "puppet-agent-VERSION-x86"
-
+      subject.install_puppet_agent_from_msi_on(host, opts)
+      expect(host['dist']).to eq 'puppet-agent-VERSION-x86'
     end
 
     it 'uses x64 msi when host is_x86_64, no install_32 and ruby_arch != x86' do
+      expect(host).to receive(:is_x86_64?).and_return(true)
+      expect(subject).to receive(:install_a_puppet_msi_on).with(host, opts)
 
-      expect( host ).to receive( :is_x86_64? ).and_return( true )
-      expect( subject ).to receive( :install_a_puppet_msi_on ).with( host, opts )
-
-      subject.install_puppet_agent_from_msi_on( host, opts )
-      expect( host['dist'] ).to be == "puppet-agent-VERSION-x64"
-
+      subject.install_puppet_agent_from_msi_on(host, opts)
+      expect(host['dist']).to eq 'puppet-agent-VERSION-x64'
     end
   end
 
   describe '#install_cert_on_windows' do
     before do
-      allow(subject).to receive(:on).and_return(Beaker::Result.new({},''))
+      allow(subject).to receive(:on).and_return(Beaker::Result.new({}, ''))
     end
 
     context 'on windows' do
       let(:platform) { 'windows-2008R2-amd64' }
-      let(:host) { make_host('testbox.test.local', :platform => 'windows-2008R2-amd64') }
+      let(:host) { make_host('testbox.test.local', platform: 'windows-2008R2-amd64') }
 
       it 'should install all 3 certs' do
         cert = 'geotrust_global_ca'
@@ -1048,452 +1092,13 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
-  describe '#install_puppet_agent_dev_repo_on' do
-    let( :package_name ) { 'puppet-agent' }
-    let( :platform ) { @platform || 'other' }
-    let( :host ) do
-      FakeHost.create( 'fakvm', platform, opts )
-    end
-
-    before :each do
-      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
-    end
-
-    it 'raises an exception when host platform is unsupported' do
-      platform = Object.new()
-      allow(platform).to receive(:to_array) { ['ptan', '5', 'x4']}
-      host = basic_hosts.first
-      host['platform'] = platform
-      opts = { :version => '0.1.0' }
-      allow( subject ).to receive( :options ).and_return( {} )
-
-      expect{
-        subject.install_puppet_agent_dev_repo_on( host, opts )
-      }.to raise_error(RuntimeError, /No repository installation step for/)
-    end
-
-    it 'runs the correct install for el-based platforms' do
-      platform = Object.new()
-      allow(platform).to receive(:to_array) { ['el', '5', 'x4']}
-      host = basic_hosts.first
-      host['platform'] = platform
-      sha_value = 'ereiuwoiur'
-      opts = { :version => '0.1.0', :puppet_agent_sha => sha_value }
-      allow( subject ).to receive( :options ).and_return( {} )
-
-      expect( subject ).to receive( :install_puppetlabs_dev_repo ).with(
-        host, 'puppet-agent', sha_value, nil, anything )
-      expect( host ).to receive( :install_package ).with( 'puppet-agent' )
-
-      subject.install_puppet_agent_dev_repo_on( host, opts )
-    end
-
-    it 'runs the correct install for el-based platforms on s390x architectures' do
-      platform = Object.new()
-      allow(platform).to receive(:to_array) { ['el', '5', 's390x'] }
-      host = basic_hosts.first
-      host['platform'] = platform
-      sha_value = 'ereiuwoiur'
-      opts = { :version => '0.1.0', :puppet_agent_sha => sha_value }
-      allow( subject ).to receive( :options ).and_return( {} )
-
-      release_path_end = 'fake_release_path_end'
-      release_file = 'fake_29835_release_file'
-      expect( host ).to receive( :puppet_agent_dev_package_info ).and_return(
-        [ release_path_end, release_file ] )
-
-      expect(subject).not_to receive(:install_puppetlabs_dev_repo)
-      expect(host).not_to receive(:install_package)
-
-      expect(subject).to receive(:fetch_http_file).once.with(/#{release_path_end}$/, release_file, /\/el$/)
-      expect(subject).to receive(:scp_to).once.with(host, /#{release_file}$/, anything)
-      expect(subject).to receive(:on).ordered.with(host, /rpm -ivh.*#{release_file}$/)
-
-      subject.install_puppet_agent_dev_repo_on( host, opts )
-    end
-
-    it 'runs the correct agent install for el-based platforms on ec2 hypervisor' do
-      platform = Object.new()
-      allow(platform).to receive(:to_array) { ['el', '5', 'x4'] }
-      host = basic_hosts.first
-      host['platform'] = platform
-      host['hypervisor'] = 'ec2'
-      sha_value = 'ereiuwoiur'
-      opts = { :version => '0.1.0', :puppet_agent_sha => sha_value }
-      allow( subject ).to receive( :options ).and_return( {} )
-
-      release_path_end = 'fake_release_path_end'
-      release_file = 'fake_29835_release_file'
-      expect( host ).to receive( :puppet_agent_dev_package_info ).and_return(
-        [ release_path_end, release_file ] )
-
-      expect(subject).not_to receive(:install_puppetlabs_dev_repo)
-      expect(host).not_to receive(:install_package)
-
-      expect(subject).to receive(:fetch_http_file).once.with(/#{release_path_end}$/, release_file, /\/el$/)
-      expect(subject).to receive(:scp_to).once.with(host, /#{release_file}$/, anything)
-      expect(subject).to receive(:on).ordered.with(host, /rpm -ivh.*#{release_file}$/)
-
-      subject.install_puppet_agent_dev_repo_on( host, opts )
-    end
-
-    it 'runs the correct install for debian-based platforms' do
-      platform = Object.new()
-      allow(platform).to receive(:to_array) { ['debian', '5', 'x4']}
-      host = basic_hosts.first
-      host['platform'] = platform
-      sha_value = 'ereigregerge'
-      opts = { :version => '0.1.0', :puppet_agent_sha => sha_value }
-      allow( subject ).to receive( :options ).and_return( {} )
-
-      expect( subject ).to receive( :install_puppetlabs_dev_repo ).with(
-        host, 'puppet-agent', sha_value, nil, anything )
-      expect( host ).to receive( :install_package ).with( 'puppet-agent' )
-
-      subject.install_puppet_agent_dev_repo_on( host, opts )
-    end
-
-    it 'runs the correct install for windows platforms' do
-      host = winhost
-      external_copy_base = 'tmp_install_windows_copy_base_1325'
-      allow( host ).to receive( :external_copy_base ).and_return( external_copy_base )
-      opts = { :version => '0.1.0' }
-      allow( subject ).to receive( :options ).and_return( {} )
-      copied_path = "#{win_temp}\\puppet-agent-0.1.0-x64.msi"
-      mock_echo = Object.new()
-      allow( mock_echo ).to receive( :raw_output ).and_return( copied_path )
-
-      expect(subject).to receive(:fetch_http_file).once.with(/\/windows$/, 'puppet-agent-0.1.0-x64.msi', /\/windows$/)
-      expect(subject).to receive(:scp_to).once.with(host, /\/puppet-agent-0.1.0-x64.msi$/, /#{external_copy_base}/)
-      expect(subject).to receive(:install_msi_on).with(host, copied_path, {}, {:debug => nil}).once
-      expect(subject).to receive(:on).ordered.with(host, /echo/).and_return(mock_echo)
-
-      subject.install_puppet_agent_dev_repo_on( host, opts )
-    end
-
-    it 'runs the correct install for osx platforms' do
-      platform = Object.new()
-      allow(platform).to receive(:to_array) { ['osx', '10.9', 'x86_64', 'mavericks']}
-      host = machost
-      host['platform'] = platform
-      sha_value = 'runs the correct install for osx platforms'
-      copy_dir_external = 'fake_15_copy_dir_external'
-      opts = {
-        :version => '0.1.0',
-        :puppet_agent_sha => sha_value,
-        :copy_dir_external => copy_dir_external
-      }
-
-      release_path_end = 'fake_release_path_end'
-      release_file = 'fake_29835_release_file'
-      expect( host ).to receive( :puppet_agent_dev_package_info ).and_return(
-        [ release_path_end, release_file ] )
-
-      expect(subject).to receive(:fetch_http_file).once.with(/#{release_path_end}$/, release_file, /\/osx$/)
-      expect(subject).to receive(:scp_to).once.with(host, /#{release_file}$/, copy_dir_external)
-      # the star is necessary, as that's not the entire filename, & we rely on
-      # the globbing to get this right on OSX SUTs
-      expect(host).to receive( :install_package ).with( /^puppet-agent-0.1.0\*$/ )
-
-      subject.install_puppet_agent_dev_repo_on( host, opts )
-    end
-
-    it 'runs the correct install for solaris platforms' do
-      @platform = 'solaris-10-x86_64'
-      opts = { :version => '0.1.0' }
-      allow( subject ).to receive( :options ).and_return( {} )
-
-      release_path_end = 'fake_release_path_end'
-      release_file = 'fake_sol10_8495_release_file'
-      expect( host ).to receive( :puppet_agent_dev_package_info ).and_return(
-        [ release_path_end, release_file ] )
-
-      expect( subject ).to receive( :fetch_http_file ).once.with(
-        /#{release_path_end}$/, release_file, anything )
-      expect( subject ).to receive( :scp_to ).once.with(
-        host, /#{release_file}$/, anything )
-
-      expect( host ).to receive( :solaris_install_local_package )
-
-      allow( subject ).to receive( :configure_type_defaults_on )
-      subject.install_puppet_agent_dev_repo_on( host, opts )
-    end
-
-    it 'allows you to override the local copy directory' do
-      # only applies to hosts that don't go down the
-      # install_puppetlabs_dev_repo route
-      platform = Object.new()
-      allow( platform ).to receive( :to_array ) { ['eos', '5', 'x4'] }
-      host = eoshost
-      host['platform'] = platform
-      sha_value = 'dahdahdahdah'
-      copy_base_local_override = 'face'
-      opts = {
-        :version => '0.1.0',
-        :copy_base_local => copy_base_local_override,
-        :puppet_agent_sha => sha_value
-      }
-      allow( subject ).to receive( :options ).and_return( {} )
-
-      allow( host ).to receive( :puppet_agent_dev_package_info ).and_return( ['', ''] )
-
-      allow( host ).to receive( :get_remote_file).once.with(anything)
-      allow( host ).to receive( :install_from_file )
-
-      subject.install_puppet_agent_dev_repo_on( host, opts )
-    end
-
-    it 'allows you to override the external copy directory' do
-      platform = Object.new()
-      allow(platform).to receive(:to_array) { ['osx', '5', 'x4']}
-      host = basic_hosts.first
-      host['platform'] = platform
-      copy_dir_custom = 'muppetsBB8-1435'
-      opts = { :version => '0.1.0', :copy_dir_external => copy_dir_custom }
-      allow( subject ).to receive( :options ).and_return( {} )
-
-      allow( host ).to receive( :puppet_agent_dev_package_info ).and_return( ['', ''] )
-
-      allow( subject ).to receive( :fetch_http_file ).once
-      expect( subject ).to receive( :scp_to ).once.with(
-        host, anything, /#{copy_dir_custom}/ )
-      allow( host ).to receive( :install_package )
-
-      subject.install_puppet_agent_dev_repo_on( host, opts )
-    end
-
-    it 'copies package to the cygwin root directory and installs it' do
-      @platform = 'windows-7-x86_64'
-      expect( subject ).to receive( :install_msi_on ).with( any_args )
-      copy_base = 'copy_base_cygwin'
-      allow( host ).to receive( :external_copy_base ).and_return( copy_base )
-      expect( subject ).to receive( :scp_to ).with( host, /puppet-agent-1\.0\.0-x64\.msi/, /#{copy_base}/ )
-      expect( subject ).to receive( :configure_type_defaults_on ).with(host)
-      expect( subject ).to receive( :fetch_http_file ).with( /[^\/]\z/, anything, anything )
-      subject.install_puppet_agent_dev_repo_on( host, opts.merge({ :puppet_agent_version => '1.0.0' }) )
-    end
-
-    it 'installs on different hosts without erroring' do
-      mhosts = hosts
-      mhosts[3] = eoshost
-
-      mhosts.each_with_index do |host, index|
-        platform = Object.new()
-        if index == 0
-          allow(platform).to receive(:to_array) { ['solaris', '5', 'x4']}
-          allow(host).to receive(:external_copy_base) {'/host0'}
-        elsif index == 1
-          allow(platform).to receive(:to_array) { ['windows', '5', 'x4']}
-          allow(host).to receive(:external_copy_base) {'/host1'}
-        elsif index == 2
-          allow(platform).to receive(:to_array) { ['osx', '5', 'x4']}
-          allow(host).to receive(:external_copy_base) {'/host2'}
-        elsif index == 3
-          allow(platform).to receive(:to_array) { ['eos', '5', 'x4']}
-          allow(host).to receive(:external_copy_base) {'/host3'}
-        end
-        host['platform'] = platform
-        allow(host).to receive(:puppet_agent_dev_package_info).with(any_args).and_return(["test", "blah"])
-      end
-
-      expect( subject ).to receive(:add_role).with( any_args ).exactly(mhosts.length).times
-
-      expect( subject ).to receive(:fetch_http_file).with( any_args ).exactly(3).times
-      expect( subject ).to receive(:scp_to).with( any_args ).exactly(3).times
-
-      expect( subject ).to receive(:install_msi_on).with( mhosts[1], 'xyz', {}, anything).exactly(1).times
-      expect( mhosts[0] ).to receive(:solaris_install_local_package).with( "blah", "/host0" ).exactly(1).times
-      expect( mhosts[2] ).to receive(:install_package).with( any_args ).exactly(1).times
-      expect( mhosts[3] ).to receive(:install_from_file).with( "blah" ).exactly(1).times
-
-      result = object_double(Beaker::Result.new({}, "foo"), :raw_output=> "xyz")
-      allow(subject).to receive(:on).with(mhosts[1], anything).and_return(result)
-
-      expect( subject ).to receive(:configure_type_defaults_on).with( any_args ).exactly(mhosts.length).times
-
-      subject.install_puppet_agent_dev_repo_on( mhosts, opts.merge({:puppet_agent_version => '1.0.0' }) )
-    end
-
-    it 'installs on different hosts with options specifying :copy_dir_external' do
-      mhosts = hosts
-      mhosts[3] = eoshost
-
-      mhosts.each_with_index do |host, index|
-        platform = Object.new()
-        if index == 0
-          allow(platform).to receive(:to_array) { ['solaris', '5', 'x4']}
-          allow(host).to receive(:external_copy_base) {'/host0'}
-        elsif index == 1
-          allow(platform).to receive(:to_array) { ['windows', '5', 'x4']}
-          allow(host).to receive(:external_copy_base) {'/host1'}
-        elsif index == 2
-          allow(platform).to receive(:to_array) { ['osx', '5', 'x4']}
-          allow(host).to receive(:external_copy_base) {'/host2'}
-        elsif index == 3
-          allow(platform).to receive(:to_array) { ['eos', '5', 'x4']}
-          allow(host).to receive(:external_copy_base) {'/host3'}
-        end
-        allow(host).to receive(:puppet_agent_dev_package_info).with(any_args).and_return(["test", "/blah"])
-        host['platform'] = platform
-      end
-
-      expect( subject ).to receive(:add_role).with( any_args ).exactly(mhosts.length).times
-
-      expect( subject ).to receive(:fetch_http_file).with( any_args ).exactly(3).times
-      expect( subject ).to receive(:scp_to).with( any_args ).exactly(3).times
-
-      expect( subject ).to receive(:install_msi_on).with(mhosts[1], 'xyz', {}, anything ).exactly(1).times
-      expect( mhosts[0] ).to receive(:solaris_install_local_package).with( '/blah', '/tmp').exactly(1).times
-      expect( mhosts[2] ).to receive(:install_package).with( any_args ).exactly(1).times
-      expect( mhosts[3] ).to receive(:install_from_file).with( '/blah').exactly(1).times
-      expect( mhosts[0] ).to receive(:external_copy_base).with( no_args ).exactly(0).times
-      expect( mhosts[1] ).to receive(:external_copy_base).with( no_args ).exactly(0).times
-      expect( mhosts[2] ).to receive(:external_copy_base).with( no_args ).exactly(0).times
-      expect( mhosts[3] ).to receive(:external_copy_base).with( no_args ).exactly(0).times
-
-      result = object_double(Beaker::Result.new({}, "foo"), :raw_output=> "xyz")
-      allow(subject).to receive(:on).with(mhosts[1], anything).and_return(result)
-
-      expect( subject ).to receive(:configure_type_defaults_on).with( any_args ).exactly(mhosts.length).times
-
-      subject.install_puppet_agent_dev_repo_on( mhosts, opts.merge({:puppet_agent_version => '1.0.0', :copy_dir_external => '/tmp' }) )
-    end
-  end
-
-  describe '#install_puppet_agent_pe_promoted_repo_on' do
-    let( :package_name ) { 'puppet-agent' }
-    let( :platform ) { @platform || 'other' }
-    let( :host ) do
-      FakeHost.create( 'fakvm', platform, opts )
-    end
-
-    before :each do
-      allow( subject ).to receive( :configure_foss_defaults_on ).and_return( true )
-      allow( subject ).to receive( :install_msi_on ).with( any_args )
-    end
-
-    def test_fetch_http_file_no_ending_slash(platform)
-      @platform = platform
-      allow( subject ).to receive( :scp_to )
-      allow( subject ).to receive( :configure_type_defaults_on ).with(host)
-
-      expect( subject ).to receive( :fetch_http_file ).with( /[^\/]\z/, anything, anything )
-      subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
-    end
-
-    context 'on windows' do
-
-      it 'calls fetch_http_file with no ending slash' do
-        test_fetch_http_file_no_ending_slash( 'windows-7-x86_64' )
-      end
-    end
-
-    it 'calls fetch_http_file with no ending slash' do
-      test_fetch_http_file_no_ending_slash( 'debian-5-x86_64' )
-    end
-
-    context 'when setting different agent versions' do
-      let( :host ) { basic_hosts.first }
-      let( :platform ) { Object.new() }
-      let( :downloadurl ) { 'http://pm.puppet.com' }
-      before :each do
-        allow( platform ).to receive( :to_array ) { ['el', '6', 'x4'] }
-        allow( subject ).to receive( :options ).and_return( opts )
-        allow( subject ).to receive( :scp_to )
-        allow( subject ).to receive( :configure_type_defaults_on ).with( host )
-      end
-
-      it 'sets correct file paths when agent version is set to latest' do
-        host['platform'] = platform
-        agentversion = 'latest'
-        collection = 'puppet'
-        opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}" }
-
-        expect(subject).to receive(:fetch_http_file).once.with(
-          /pm\.puppet\.com\/puppet-agent\/.*\/#{agentversion}\/repos/,
-          /puppet-agent-el-6*/,
-          /\/el$/
-        )
-        expect(host).to receive(:pe_puppet_agent_promoted_package_install).with(
-          anything,
-          /puppet-agent-el-6*/,
-          /.*\/el\/6\/#{collection}\/.*rpm/,
-          /puppet-agent-el-6/,
-          anything
-        )
-        subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
-      end
-
-      it 'sets correct file paths for agent version 1.x.x' do
-        host['platform'] = platform
-        agentversion = '1.x.x'
-        collection = 'pc1'
-        opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}"}
-
-        expect(subject).to receive(:fetch_http_file).once.with(
-          /pm\.puppet\.com\/puppet-agent\/.*\/#{agentversion}\/repos/,
-          /puppet-agent-el-6*/,/\/el$/
-        )
-        expect(host).to receive(:pe_puppet_agent_promoted_package_install).with(
-          anything,
-          /puppet-agent-el-6*/,
-          /.*\/el\/6\/#{collection}\/.*rpm/,
-          /puppet-agent-el-6/,
-          anything
-        )
-        subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
-      end
-
-      it 'sets correct file paths for agent version >= 5.5.4' do
-        host['platform'] = platform
-        agentversion = '5.5.4'
-        collection = 'puppet5'
-        opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}"}
-
-        expect(subject).to receive(:fetch_http_file).once.with(
-          /pm\.puppet\.com\/puppet-agent\/.*\/#{agentversion}\/repos/,
-          /puppet-agent-el-6*/,
-          /\/el$/
-        )
-        expect(host).to receive(:pe_puppet_agent_promoted_package_install).with(
-          anything,
-          /puppet-agent-el-6*/,
-          /.*\/el\/6\/#{collection}\/.*rpm/,
-          /puppet-agent-el-6/,
-          anything
-        )
-        subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
-      end
-
-      it 'sets correct file paths for agent version > 5.99' do
-        host['platform'] = platform
-        agentversion = '6.0.0'
-        collection = 'puppet6'
-        opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}"}
-
-        expect(subject).to receive(:fetch_http_file).once.with(
-          /pm\.puppet\.com\/puppet-agent\/.*\/#{agentversion}\/repos/,
-          /puppet-agent-el-6*/,
-          /\/el$/
-        )
-        expect(host).to receive(:pe_puppet_agent_promoted_package_install).with(
-          anything,
-          /puppet-agent-el-6*/,
-          /.*\/el\/6\/#{collection}\/.*rpm/,
-          /puppet-agent-el-6/,
-          anything
-        )
-        subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
-      end
-    end
-  end
-
   describe '#install_puppetserver_on' do
     let(:host) { make_host('master', platform: 'el-7-x86_64') }
 
     context 'with default arguments' do
       it "installs the latest puppetserver from the default 'puppet' release stream" do
-        expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host, 'puppet', include(release_yum_repo_url: "https://yum.puppet.com"))
+        expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host, 'puppet',
+                                                                             include(release_yum_repo_url: 'https://yum.puppet.com'))
         expect(subject).to receive(:install_package).with(host, 'puppetserver', nil)
         subject.install_puppetserver_on(host)
       end
@@ -1503,7 +1108,7 @@ describe ClassMixedWithDSLInstallUtils do
       version = '6.6.6'
 
       context 'on deb-based platform' do
-        let(:host) {make_host('master', platform: Beaker::Platform.new('ubuntu-16.04-amd64'))}
+        let(:host) { make_host('master', platform: Beaker::Platform.new('ubuntu-16.04-amd64')) }
         it 'munges the version on ubuntu 16.04' do
           expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host, 'puppet', anything)
           expect(subject).to receive(:install_package).with(host, 'puppetserver', "#{version}-1xenial")
@@ -1513,14 +1118,16 @@ describe ClassMixedWithDSLInstallUtils do
       end
 
       it 'installs puppetserver at the specific version from internal buildservers' do
-        expect(subject).to receive(:install_from_build_data_url).with('puppetserver', /^#{described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:dev_builds_url]}.*#{version}/, host)
+        expect(subject).to receive(:install_from_build_data_url).with('puppetserver',
+                                                                      /^#{described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:dev_builds_url]}.*#{version}/, host)
         allow(subject).to receive(:dev_builds_accessible_on?).with(host, anything).and_return true
         subject.install_puppetserver_on(host, version: version)
       end
 
       it 'installs puppetserver from the custom dev builds URL' do
         dev_builds_url = 'http://builds.corp.tld'
-        expect(subject).to receive(:install_from_build_data_url).with('puppetserver', /^#{dev_builds_url}.*#{version}/, host)
+        expect(subject).to receive(:install_from_build_data_url).with('puppetserver', /^#{dev_builds_url}.*#{version}/,
+                                                                      host)
         allow(subject).to receive(:dev_builds_accessible_on?).with(host, anything).and_return true
         subject.install_puppetserver_on(host, version: version, dev_builds_url: dev_builds_url)
       end
@@ -1554,9 +1161,10 @@ describe ClassMixedWithDSLInstallUtils do
     context 'with the nightlies option' do
       it 'installs puppetserver from the default puppet nightly repos' do
         expect(subject).to receive(:install_puppetlabs_release_repo_on)
-                               .with(host, 'puppet-nightly', include(
-                                     nightly_yum_repo_url: described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:nightly_yum_repo_url],
-                                     nightly_apt_repo_url: described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:nightly_apt_repo_url]))
+          .with(host, 'puppet-nightly', include(
+                                          nightly_yum_repo_url: described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:nightly_yum_repo_url],
+                                          nightly_apt_repo_url: described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:nightly_apt_repo_url],
+                                        ))
         subject.install_puppetserver_on(host, nightlies: true)
       end
 
@@ -1565,23 +1173,26 @@ describe ClassMixedWithDSLInstallUtils do
 
         it 'uses a custom general nightlies url' do
           expect(subject).to receive(:install_puppetlabs_release_repo_on)
-                                 .with(host, 'puppet-nightly', include(
-                                       nightly_yum_repo_url: custom_nightlies_url,
-                                       nightly_apt_repo_url: custom_nightlies_url))
+            .with(host, 'puppet-nightly', include(
+                                            nightly_yum_repo_url: custom_nightlies_url,
+                                            nightly_apt_repo_url: custom_nightlies_url,
+                                          ))
           subject.install_puppetserver_on(host, nightlies: true, nightly_builds_url: custom_nightlies_url)
         end
 
         it 'uses a custom yum repo url' do
           expect(subject).to receive(:install_puppetlabs_release_repo_on)
-                                 .with(host, 'puppet-nightly', include(
-                                       nightly_yum_repo_url: custom_nightlies_url))
+            .with(host, 'puppet-nightly', include(
+                                            nightly_yum_repo_url: custom_nightlies_url,
+                                          ))
           subject.install_puppetserver_on(host, nightlies: true, nightly_yum_repo_url: custom_nightlies_url)
         end
 
         it 'uses a custom apt repo url' do
           expect(subject).to receive(:install_puppetlabs_release_repo_on)
-                                 .with(host, 'puppet-nightly', include(
-                                       nightly_apt_repo_url: custom_nightlies_url))
+            .with(host, 'puppet-nightly', include(
+                                            nightly_apt_repo_url: custom_nightlies_url,
+                                          ))
           subject.install_puppetserver_on(host, nightlies: true, nightly_apt_repo_url: custom_nightlies_url)
         end
       end
@@ -1589,47 +1200,44 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   describe '#remove_puppet_on' do
-    supported_platforms   = [ 'aix-53-power',
-                              'aix-61-power',
-                              'aix-71-power',
-                              'solaris-10-x86_64',
-                              'solaris-10-x86_64',
-                              'solaris-11-x86_64',
-                              'cumulus-2.2-amd64',
-                              'el-6-x86_64',
-                              'redhat-7-x86_64',
-                              'centos-7-x86_64',
-                              'oracle-7-x86_64',
-                              'scientific-7-x86_64',
-                              'sles-10-x86_64',
-                              'sles-11-x86_64',
-                              'sles-12-s390x',
-                              'ubuntu-16.04-power8'
-                            ]
+    supported_platforms = ['aix-53-power',
+                           'aix-61-power',
+                           'aix-71-power',
+                           'solaris-10-x86_64',
+                           'solaris-10-x86_64',
+                           'solaris-11-x86_64',
+                           'el-6-x86_64',
+                           'redhat-7-x86_64',
+                           'centos-7-x86_64',
+                           'oracle-7-x86_64',
+                           'scientific-7-x86_64',
+                           'sles-10-x86_64',
+                           'sles-11-x86_64',
+                           'sles-12-s390x',
+                           'ubuntu-16.04-power8',]
 
     supported_platforms.each do |platform|
-      let(:host) { make_host(platform, :platform => platform) }
+      let(:host) { make_host(platform, platform: platform) }
 
       pkg_list = 'foo bar'
 
       it "uninstalls packages on #{platform}" do
-        result = Beaker::Result.new(host,'')
+        result = Beaker::Result.new(host, '')
         result.stdout = pkg_list
 
         expected_list = pkg_list
         cmd_args = ''
 
-        expect( subject ).to receive(:on).exactly(2).times.and_return(result, result)
-        expect( host ).to receive(:uninstall_package).with(expected_list, cmd_args)
+        expect(subject).to receive(:on).exactly(2).times.and_return(result, result)
+        expect(host).to receive(:uninstall_package).with(expected_list, cmd_args)
 
-        subject.remove_puppet_on( host )
+        subject.remove_puppet_on(host)
       end
     end
 
-    let(:debian6) { make_host('debian-6-amd64', :platform => 'debian-6-amd64') }
+    let(:debian6) { make_host('debian-6-amd64', platform: 'debian-6-amd64') }
     it 'raises error on unsupported platforms' do
-      expect { subject.remove_puppet_on( debian6 ) }.to raise_error(RuntimeError, /unsupported platform/)
+      expect { subject.remove_puppet_on(debian6) }.to raise_error(RuntimeError, /unsupported platform/)
     end
-
   end
 end