X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Fspec_helper_acceptance.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Fspec_helper_acceptance.rb;h=d6587031a376715f83d715b81c6df31272b612d1;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=4d85e7dc8b163de98c89b6a6a8f0afd7787362ef;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/spec_helper_acceptance.rb b/3rdparty/modules/stdlib/spec/spec_helper_acceptance.rb
old mode 100755
new mode 100644
index 4d85e7dc8..d6587031a
--- a/3rdparty/modules/stdlib/spec/spec_helper_acceptance.rb
+++ b/3rdparty/modules/stdlib/spec/spec_helper_acceptance.rb
@@ -1,11 +1,13 @@
-#! /usr/bin/env ruby -S rspec
+require 'beaker-pe'
+require 'beaker-puppet'
 require 'puppet'
 require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'
 
 run_puppet_install_helper
-install_ca_certs unless ENV['PUPPET_INSTALL_TYPE'] =~ /pe/i
+configure_type_defaults_on(hosts)
+install_ca_certs unless ENV['PUPPET_INSTALL_TYPE'] =~ %r{pe}i
 install_module_on(hosts)
 install_module_dependencies_on(hosts)
 
@@ -18,20 +20,20 @@ RSpec.configure do |c|
   end
 end
 
-def get_puppet_version
+def return_puppet_version
   (on default, puppet('--version')).output.chomp
 end
 
-RSpec.shared_context "with faked facts" do
+RSpec.shared_context 'with faked facts' do
   let(:facts_d) do
-    puppet_version = get_puppet_version
-    if fact('osfamily') =~ /windows/i
+    puppet_version = return_puppet_version
+    if fact('osfamily') =~ %r{windows}i
       if fact('kernelmajversion').to_f < 6.0
         'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d'
       else
         'C:/ProgramData/PuppetLabs/facter/facts.d'
       end
-    elsif Puppet::Util::Package.versioncmp(puppet_version, '4.0.0') < 0 and fact('is_pe', '--puppet') == "true"
+    elsif Puppet::Util::Package.versioncmp(puppet_version, '4.0.0') < 0 && fact('is_pe', '--puppet') == 'true'
       '/etc/puppetlabs/facter/facts.d'
     else
       '/etc/facter/facts.d'
@@ -39,14 +41,14 @@ RSpec.shared_context "with faked facts" do
   end
 
   before :each do
-    #No need to create on windows, PE creates by default
-    if fact('osfamily') !~ /windows/i
+    # No need to create on windows, PE creates by default
+    if fact('osfamily') !~ %r{windows}i
       shell("mkdir -p '#{facts_d}'")
     end
   end
 
   after :each do
-    shell("rm -f '#{facts_d}/fqdn.txt'", :acceptable_exit_codes => [0,1])
+    shell("rm -f '#{facts_d}/fqdn.txt'", :acceptable_exit_codes => [0, 1])
   end
 
   def fake_fact(name, value)