Skip to content

Commit 8aeddc8

Browse files
author
Ashley Penney
committed
Merge pull request puppetlabs#125 from mhaskel/spec_updates
Update spec_helper for consistency.
2 parents 90f88ec + 7f54eb1 commit 8aeddc8

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

spec/spec_helper_acceptance.rb

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
require 'beaker-rspec/helpers/serverspec'
33

44
unless ENV['RS_PROVISION'] == 'no'
5-
if hosts.first.is_pe?
6-
install_pe
7-
else
8-
install_puppet
9-
end
5+
# This will install the latest available package on el and deb based
6+
# systems fail on windows and osx, and install via gem on other *nixes
7+
foss_opts = { :default_action => 'gem_install' }
8+
9+
if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
10+
1011
hosts.each do |host|
1112
if host['platform'] =~ /debian/
1213
on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'

0 commit comments

Comments
 (0)