Merge pull request #846 from bastelfreak/testfoo

update gem dependencies

Gemfile

@@ -49,13 +49,13 @@ group :system_tests do
   if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
-    gem 'beaker-rspec',  :require => false
+    gem 'beaker-rspec', '>= 6.0', :require => false
   end
   gem 'serverspec',                         :require => false
   gem 'beaker-hostgenerator', '>= 1.1.10',  :require => false
   gem 'beaker-puppet_install_helper',       :require => false
   gem 'beaker-module_install_helper',       :require => false
-  gem 'rbnacl', '~> 4',                     :require => false if RUBY_VERSION >= '2.2.6'
+  gem 'rbnacl', '>= 4',                     :require => false if RUBY_VERSION >= '2.2.6'
   gem 'rbnacl-libsodium',                   :require => false if RUBY_VERSION >= '2.2.6'
   gem 'bcrypt_pbkdf',                       :require => false
 end

spec/spec_helper_acceptance.rb

@@ -1,12 +1,17 @@
-require 'beaker-rspec'
+require 'beaker-rspec/spec_helper'
+require 'beaker-rspec/helpers/serverspec'
 require 'beaker/puppet_install_helper'
+require 'beaker/module_install_helper'
 
 run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
 
 RSpec.configure do |c|
   # Project root
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
+  install_module_on(hosts)
+  install_module_dependencies_on(hosts)
+
   # Readable test descriptions
   c.formatter = :documentation
 
@@ -17,10 +22,6 @@
     hosts.each do |host|
       # python is pre-requisite to the python_path fact.
       on host, puppet('resource', 'package', 'python', 'ensure=installed')
-      on host, puppet('module', 'install', 'puppetlabs-apt'), acceptable_exit_codes: [0]
-      on host, puppet('module', 'install', 'puppetlabs-stdlib'), acceptable_exit_codes: [0]
-      on host, puppet('module', 'install', 'puppetlabs-concat'), acceptable_exit_codes: [0]
-      on host, puppet('module', 'install', 'stahnma-epel'), acceptable_exit_codes: [0]
     end
   end
 end