From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 28 Aug 2014 15:29:20 +0000 (-0400)
Subject: Update the spec_helper for consistency.
X-Git-Tag: 1.3.0~1^2~16^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ebcd1092c54c15eb34ece704e39fad172dc88496;p=puppet-modules%2Fpuppetlabs-firewall.git

Update the spec_helper for consistency.
---

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 4f0fc94..ca29ce1 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -13,11 +13,12 @@ def ip6tables_flush_all_tables
 end
 
 unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-  else
-    install_puppet
-  end
+  # 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|
     on host, "mkdir -p #{host['distmoduledir']}"
   end