beaker-puppet 1.29.0 → 3.0.0

data/setup/git/060_InstallModules.rb

@@ -5,22 +5,23 @@ require 'pathname'
 class PuppetModules
   attr_reader :modules
 
-  def initialize(modules=[])
+  def initialize(modules = [])
     @modules = modules
   end
 
   def list
     return [] unless modules
+
     modules.collect do |uri|
       git_url, git_ref = uri.split '#'
       folder = Pathname.new(git_url).basename('.git')
       name = folder.to_s.split('-', 2)[1] || folder.to_s
       {
-        :name     => name,
-        :url      => git_url,
-        :folder   => folder.to_s,
-        :ref      => git_ref,
-        :protocol => git_url.split(':')[0].intern,
+        name: name,
+        url: git_url,
+        folder: folder.to_s,
+        ref: git_ref,
+        protocol: git_url.split(':')[0].intern,
       }
     end
   end
@@ -31,7 +32,7 @@ def install_git_module(mod, hosts)
   # temporary directory to this location.  This will preserve the global
   # state of the system while allowing individual test cases to quickly run
   # with a module "installed" in the module path.
-  moddir = "/opt/puppet-git-repos"
+  moddir = '/opt/puppet-git-repos'
   target = "#{moddir}/#{mod[:name]}"
 
   step "Clone #{mod[:url]} if needed"
@@ -40,19 +41,18 @@ def install_git_module(mod, hosts)
   step "Update #{mod[:name]} and check out revision #{mod[:ref]}"
 
   commands = ["cd #{target}",
-              "remote rm origin",
+              'remote rm origin',
               "remote add origin #{mod[:url]}",
-              "fetch origin",
+              'fetch origin',
               "checkout -f #{mod[:ref]}",
               "reset --hard refs/remotes/origin/#{mod[:ref]}",
-              "clean -fdx",
-  ]
+              'clean -fdx',]
 
-  on hosts, commands.join(" && git ")
+  on hosts, commands.join(' && git ')
 end
 
 def install_scp_module(mod, hosts)
-  moddir = "/opt/puppet-git-repos"
+  moddir = '/opt/puppet-git-repos'
   target = "#{moddir}/#{mod[:name]}"
 
   step "Purge #{target} if needed"
@@ -68,7 +68,7 @@ skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
 
 modules = PuppetModules.new(options[:modules]).list
 
-step "Masters: Install Puppet Modules"
+step 'Masters: Install Puppet Modules'
 masters = hosts.select { |host| host['roles'].include? 'master' }
 
 modules.each do |mod|

data/setup/git/070_InstallCACerts.rb

@@ -1,95 +1,95 @@
-test_name "Install CA Certs"
-confine :to, :platform => 'windows'
+test_name 'Install CA Certs'
+confine :to, platform: 'windows'
 
-GEOTRUST_GLOBAL_CA = <<-EOM
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
------END CERTIFICATE-----
+GEOTRUST_GLOBAL_CA = <<~EOM
+  -----BEGIN CERTIFICATE-----
+  MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+  MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+  YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+  EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+  R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+  9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+  fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+  iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+  1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+  bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+  MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+  ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+  uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+  Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+  tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+  PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+  hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+  5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+  -----END CERTIFICATE-----
 EOM
 
-USERTRUST_NETWORK_CA = <<-EOM
------BEGIN CERTIFICATE-----
-MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
-lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
-SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
-A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
-MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
-d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
-cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
-0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
-M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
-MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
-oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
-DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
-oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
-dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
-bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
-BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
-//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
-CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
-CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
-3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
-KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
------END CERTIFICATE-----
+USERTRUST_NETWORK_CA = <<~EOM
+  -----BEGIN CERTIFICATE-----
+  MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
+  lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+  Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+  dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
+  SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
+  A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
+  MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
+  d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
+  cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
+  0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
+  M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
+  MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
+  oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
+  DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
+  oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+  VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
+  dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
+  bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
+  BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+  //bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
+  CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
+  CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
+  3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
+  KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
+  -----END CERTIFICATE-----
 EOM
 
-EQUIFAX_CA = <<-EOM
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
-UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
-dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
-MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
-dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
-BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
-cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
-AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
-MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
-aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
-ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
-IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
-MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
-A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
-7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
-1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
------END CERTIFICATE-----
+EQUIFAX_CA = <<~EOM
+  -----BEGIN CERTIFICATE-----
+  MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+  UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+  dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+  MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+  dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+  AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+  BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+  cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+  AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+  MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+  aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+  ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+  IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+  MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+  A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+  7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+  1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+  -----END CERTIFICATE-----
 EOM
 
 hosts.each do |host|
   next if host['use_existing_container']
 
-  step "Installing Geotrust CA cert"
-  create_remote_file(host, "geotrustglobal.pem", GEOTRUST_GLOBAL_CA)
-  on host, "chmod 644 geotrustglobal.pem"
-  on host, "cmd /c certutil -v -addstore Root `cygpath -w geotrustglobal.pem`"
+  step 'Installing Geotrust CA cert'
+  create_remote_file(host, 'geotrustglobal.pem', GEOTRUST_GLOBAL_CA)
+  on host, 'chmod 644 geotrustglobal.pem'
+  on host, 'cmd /c certutil -v -addstore Root `cygpath -w geotrustglobal.pem`'
 
-  step "Installing Usertrust Network CA cert"
-  create_remote_file(host, "usertrust-network.pem", USERTRUST_NETWORK_CA)
-  on host, "chmod 644 usertrust-network.pem"
-  on host, "cmd /c certutil -v -addstore Root `cygpath -w usertrust-network.pem`"
+  step 'Installing Usertrust Network CA cert'
+  create_remote_file(host, 'usertrust-network.pem', USERTRUST_NETWORK_CA)
+  on host, 'chmod 644 usertrust-network.pem'
+  on host, 'cmd /c certutil -v -addstore Root `cygpath -w usertrust-network.pem`'
 
-  step "Installing Equifax CA cert"
-  create_remote_file(host, "equifax.pem", EQUIFAX_CA)
-  on host, "chmod 644 equifax.pem"
-  on host, "cmd /c certutil -v -addstore Root `cygpath -w equifax.pem`"
+  step 'Installing Equifax CA cert'
+  create_remote_file(host, 'equifax.pem', EQUIFAX_CA)
+  on host, 'chmod 644 equifax.pem'
+  on host, 'cmd /c certutil -v -addstore Root `cygpath -w equifax.pem`'
 end

data/spec/beaker-puppet/helpers/facter_helpers_spec.rb

@@ -12,32 +12,31 @@ class ClassMixedWithDSLHelpers
   def logger
     RSpec::Mocks::Double.new('logger').as_null_object
   end
-
 end
 
 describe ClassMixedWithDSLHelpers do
-  let( :command ){ 'ls' }
-  let( :host )   { double.as_null_object }
-  let( :result ) { Beaker::Result.new( host, command ) }
+  let(:command) { 'ls' }
+  let(:host)   { double.as_null_object }
+  let(:result) { Beaker::Result.new(host, command) }
 
-  let( :master ) { make_host( 'master',   :roles => %w( master agent default)    ) }
-  let( :agent )  { make_host( 'agent',    :roles => %w( agent )           ) }
-  let( :custom ) { make_host( 'custom',   :roles => %w( custom agent )    ) }
-  let( :dash )   { make_host( 'console',  :roles => %w( dashboard agent ) ) }
-  let( :db )     { make_host( 'db',       :roles => %w( database agent )  ) }
-  let( :hosts )  { [ master, agent, dash, db, custom ] }
+  let(:master) { make_host('master',   roles: %w[master agent default]) }
+  let(:agent)  { make_host('agent',    roles: %w[agent]) }
+  let(:custom) { make_host('custom',   roles: %w[custom agent]) }
+  let(:dash)   { make_host('console',  roles: %w[dashboard agent]) }
+  let(:db)     { make_host('db',       roles: %w[database agent]) }
+  let(:hosts)  { [master, agent, dash, db, custom] }
 
   before :each do
-    allow( subject ).to receive( :hosts ).and_return( hosts )
+    allow(subject).to receive(:hosts).and_return(hosts)
   end
 
   describe '#fact_on' do
     it 'retrieves a fact on a single host' do
       result.stdout = "{\"osfamily\": \"family\"}\n"
-      expect( subject ).to receive(:facter).with('"osfamily"',{json: nil}).once
-      expect( subject ).to receive(:on).and_return(result)
+      expect(subject).to receive(:facter).with('"osfamily"', { json: nil }).once
+      expect(subject).to receive(:on).and_return(result)
 
-      expect( subject.fact_on('host','osfamily') ).to be === JSON.parse(result.stdout)['osfamily']
+      expect(subject.fact_on('host', 'osfamily')).to be === JSON.parse(result.stdout)['osfamily']
     end
 
     it 'converts each element to a structured fact when it receives an array of results from #on' do
@@ -45,23 +44,23 @@ describe ClassMixedWithDSLHelpers do
       times = hosts.length
       results_array = [result] * times
       parsed_array = [JSON.parse(result.stdout)['os']] * times
-      allow( subject ).to receive( :on ).and_return( results_array )
+      allow(subject).to receive(:on).and_return(results_array)
 
-      expect( subject.fact_on(hosts,'os') ).to be === parsed_array
+      expect(subject.fact_on(hosts, 'os')).to be === parsed_array
     end
 
     it 'returns a single result for single host' do
       result.stdout = "{\"osfamily\": \"family\"}\n"
       parsed_result = JSON.parse(result.stdout)['osfamily']
-      allow( subject ).to receive( :on ).and_return( result )
+      allow(subject).to receive(:on).and_return(result)
 
-      expect( subject.fact_on('host','osfamily') ).to be === parsed_result
+      expect(subject.fact_on('host', 'osfamily')).to be === parsed_result
     end
 
     it 'preserves data types' do
-      result.stdout = "{\"identity\": { \"uid\": 0, \"user\": \"root\", \"privileged\": true }}"
-      allow( subject ).to receive( :on ).and_return( result )
-      structured_fact = subject.fact_on('host','identity')
+      result.stdout = '{"identity": { "uid": 0, "user": "root", "privileged": true }}'
+      allow(subject).to receive(:on).and_return(result)
+      structured_fact = subject.fact_on('host', 'identity')
 
       expect(structured_fact['uid'].class).to be Fixnum
       expect(structured_fact['user'].class).to be String
@@ -76,11 +75,10 @@ describe ClassMixedWithDSLHelpers do
 
   describe '#fact' do
     it 'delegates to #fact_on with the default host' do
-      expect( subject ).to receive(:fact_on).with(anything,"osfamily",{}).once
-      expect( subject ).to receive(:default)
+      expect(subject).to receive(:fact_on).with(anything, 'osfamily', {}).once
+      expect(subject).to receive(:default)
 
       subject.fact('osfamily')
     end
   end
-
 end

data/spec/beaker-puppet/helpers/host_helpers_spec.rb

@@ -8,9 +8,11 @@ describe ClassMixedWithDSLHelpers do
   let(:privatebindir) { 'C:\\Program Files\\Puppet Labs\\Puppet\\bin' }
 
   context 'when platform is windows and non cygwin' do
-    let(:winhost) { make_host('winhost_non_cygwin', { :platform => 'windows',
-                                                      :privatebindir => privatebindir,
-                                                      :is_cygwin => 'false' }) }
+    let(:winhost) do
+      make_host('winhost_non_cygwin', { platform: 'windows',
+                                        privatebindir: privatebindir,
+                                        is_cygwin: 'false', })
+    end
 
     it 'run the correct ruby_command' do
       expect(subject.ruby_command(winhost)).to eq("cmd /V /C \"set PATH=#{privatebindir};!PATH! && ruby\"")
@@ -18,9 +20,11 @@ describe ClassMixedWithDSLHelpers do
   end
 
   context 'when platform is windows and cygwin' do
-    let(:winhost) { make_host('winhost', { :platform => Beaker::Platform.new('windows-2016-a64'),
-                                           :privatebindir => privatebindir,
-                                           :is_cygwin => true }) }
+    let(:winhost) do
+      make_host('winhost', { platform: Beaker::Platform.new('windows-2016-a64'),
+                             privatebindir: privatebindir,
+                             is_cygwin: true, })
+    end
 
     it 'run the correct ruby_command' do
       expect(subject.ruby_command(winhost)).to eq("env PATH=\"#{privatebindir}:${PATH}\" ruby")