summaryrefslogtreecommitdiff
path: root/spec/spec_helper_acceptance.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/spec_helper_acceptance.rb')
-rw-r--r--spec/spec_helper_acceptance.rb22
1 files changed, 2 insertions, 20 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 9ef826a..97c43e8 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,25 +1,7 @@
require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
- # This will install the latest available package on el and deb based
- # systems fail on windows and osx, and install via gem on other *nixes
- foss_opts = { :default_action => 'gem_install' }
-
- if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
-
- hosts.each do |host|
- unless host.is_pe?
- on hosts, "mkdir -p #{hosts.first['distmoduledir']}"
- end
-
- # We ask the host to interpolate it's distmoduledir because we don't
- # actually know it on Windows until we've let it redirect us (depending
- # on whether we're running as a 32/64 bit process on 32/64 bit Windows
- moduledir = on(host, "echo #{host['distmoduledir']}").stdout.chomp
- on host, "mkdir -p #{moduledir}"
- end
-end
-
+run_puppet_install_helper
RSpec.configure do |c|
# Project root