From 349b90ca0e9604b9774ca056372c940f66c32098 Mon Sep 17 00:00:00 2001
From: Jordi Prats <jordi.prats@gmail.com>
Date: Thu, 27 Sep 2018 11:23:14 +0200
Subject: [PATCH] fix acceptance

---
 Gemfile                        |  9 ++++-----
 spec/spec_helper_acceptance.rb | 31 ++++---------------------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/Gemfile b/Gemfile
index be325d9..93c71a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,11 +7,10 @@ gem 'puppet-lint', '>= 0.3.2'
 gem 'facter', '>= 1.7.0'
 
 group :system_tests do
-  gem 'beaker',              :require => false
-  gem 'beaker-rspec',        :require => false
-  gem 'beaker_spec_helper',  :require => false
-  gem 'beaker-puppet_install_helper', :require => false
-  gem 'serverspec',          :require => false
+  gem 'beaker', '~>3.13',     :require => false
+  gem 'beaker-rspec', '> 5',  :require => false
+  gem 'beaker_spec_helper',   :require => false
+  gem 'serverspec',           :require => false
   gem 'rspec', '< 3.2',      :require => false if RUBY_VERSION =~ /^1\.8/
   gem 'rspec-puppet',        :require => false
   gem 'metadata-json-lint',  :require => false
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 6c18965..dd05d93 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,32 +1,10 @@
 require 'beaker-rspec'
-require 'beaker_spec_helper'
 
-include BeakerSpecHelper
-
-hosts.each do |host|
-
-  if host['platform'] =~ /^ubuntu-(15.04|15.10)-/
-    on host, "wget -O /tmp/puppet.deb http://apt.puppetlabs.com/puppetlabs-release-pc1-trusty.deb"
-    on host, "dpkg -i --force-all /tmp/puppet.deb"
-    on host, "apt-get update"
-    host.install_package('puppet-agent')
-  else
-    install_puppet_agent_on host, {}
-  end
-
-  # Install git so that we can install modules from github
-  if host['platform'] =~ /^el-5-/
-    # git is only available on EPEL for el-5
-    install_package host, 'epel-release'
-  end
-  install_package host, 'git'
-
-  on host, "puppet cert generate $(facter fqdn)"
-end
+install_puppet_agent_on hosts, {}
 
 RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  module_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  module_name = module_root.split('-').last
 
   # Readable test descriptions
   c.formatter = :documentation
@@ -34,9 +12,8 @@
   # Configure all nodes in nodeset
   c.before :suite do
     # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'bash')
+    puppet_module_install(:source => module_root, :module_name => module_name)
     hosts.each do |host|
-      # dependencies
       on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module', 'install', 'puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module', 'install', 'eyp-eyplib'), { :acceptable_exit_codes => [0,1] }