Merge pull request #211 from puppetlabs/implement-beaker-module_install_helper

[MODULES-4224] Implement beaker-module_install_helper

Gemfile

@@ -59,6 +59,7 @@ group :system_tests do
   gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')     if ! supports_windows
   gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1')     if supports_windows
   gem 'beaker-puppet_install_helper',                                            :require => false
+  gem 'beaker-module_install_helper',                                            :require => false
   gem 'master_manipulator',                                                      :require => false
   gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
   gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        

spec/spec_helper_acceptance.rb

@@ -1,43 +1,20 @@
 require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
+require 'beaker/module_install_helper'
 
 run_puppet_install_helper
+install_module_on(hosts)
+install_module_dependencies_on(hosts)
 
 UNSUPPORTED_PLATFORMS = [ "Darwin", "windows" ]
 
 unless ENV["RS_PROVISION"] == "no" or ENV["BEAKER_provision"] == "no"
   hosts.each do |host|
-    if host['platform'] =~ /sles-1/i ||  host['platform'] =~ /solaris-1/i
-      get_stdlib = <<-stdlib
-      package{'wget':}
-      exec{'download':
-        command => "wget -P /root/ https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.3.2.tar.gz --no-check-certificate",
-        path => ['/opt/csw/bin/','/usr/bin/']
-      }
-      stdlib
-      apply_manifest_on(host, get_stdlib)
-      # have to use force otherwise it checks ssl cert even though it is a local file
-      on host, puppet('module install /root/puppetlabs-stdlib-4.3.2.tar.gz --force')
-    else
-      on host, puppet("module install puppetlabs-stdlib")
-      # For test support
-      on host, puppet("module install puppetlabs-apt")
-    end
+    install_puppet_module_via_pmt_on(host, {module_name: 'puppetlabs-apt'})
   end
 end
 
 RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-
   # Readable test descriptions
   c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module
-    hosts.each do |host|
-      copy_module_to(host, :source => proj_root, :module_name => "java")
-    end
-  end
 end