beaker-pe 1.41.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12b75b05d53ce6381a5810cf567cc7973939dffb
-  data.tar.gz: 675f6cda669d071688634aadbd821843da944300
+  metadata.gz: d6cefe943d333e23d9b80b41af6e5dd9409b3c40
+  data.tar.gz: bbfc783c5cd03ad65c962c8ba9998dd6e2d292f2
 SHA512:
-  metadata.gz: 96a79cf29765bcd56b98fa83c2335cec9234c9f42b904fced03b86a479ff7e9d78d97f9e0db10e83644b5fa85ca78ab38834f58a4669fac763bf05a74336780f
-  data.tar.gz: f447d2fcf412bbf4cf9e24e363d2f3b5efe41a2df6cf0741eafc00f55715186afebc71f82be695d4ed742ab565c5d1f955a42e928ebada78ba4b9de18469507e
+  metadata.gz: 15d2c0aad4d1194c4f25fb919ea13885e977d7035c8815d769a963f57e1d79d211a00aabd859550f2c97b88c4c96be7f7f7e958a07a9b4fb2b4b6f32918dd7cd
+  data.tar.gz: 42ad9a0c9282484165fdce6c37798a2ac0ee2193db3c1aa1cf55ee57929583edc649773c6d4356cacfccdd77988ae988d19580957f3ea03450d6248926e73cf0

data/Gemfile

@@ -12,10 +12,9 @@ def location_for(place, fake_version = nil)
   end
 end
 
-# We don't put beaker in as a test dependency because we
-# don't want to create a transitive dependency
 group :acceptance_testing do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.0')
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
+  gem "beaker-vmpooler", *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || '~> 1.3')
 end
 
 if ENV['GEM_SOURCE'] =~ /artifactory\.delivery\.puppetlabs\.net/

data/acceptance/pre_suite/install.rb

@@ -1 +1,3 @@
+require 'test_helpers.rb'
+
 install_pe

data/acceptance/tests/first.rb

@@ -1,3 +1,4 @@
+require 'test_helpers.rb'
 
 # Acceptance level testing goes into files in the tests directory like this one,
 # Each file corresponding to a new test made up of individual testing steps

data/acceptance/tests/install_smoke_test.rb

@@ -1,3 +1,5 @@
+require 'test_helpers.rb'
+
 test_name "puppet install smoketest"
 
 step 'puppet install smoketest: verify \'facter --help\' can be successfully called on all hosts'

data/beaker-pe.gemspec

@@ -31,6 +31,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'thin'
 
   # Run time dependencies
+  s.add_runtime_dependency 'beaker', '~>4.0'
+  s.add_runtime_dependency 'beaker-puppet', '~>1.0'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
   s.add_runtime_dependency 'beaker-answers', '~> 0.0'
   s.add_runtime_dependency 'beaker-abs'

data/lib/beaker-pe.rb

@@ -1,3 +1,6 @@
+require 'beaker'
+require 'beaker-puppet'
+
 require 'stringify-hash'
 require 'beaker-pe/version'
 require 'beaker-pe/install/pe_defaults'
@@ -23,13 +26,3 @@ end
 # Boilerplate DSL inclusion mechanism:
 # First we register our module with the Beaker DSL
 Beaker::DSL.register( Beaker::DSL::PE )
-
-# Second,We need to reload the DSL, but before we had reloaded
-# it in the global namespace, which result in errors colliding
-# with other gems rightfully not expecting beaker's dsl to
-# be available at the global level.
-module Beaker
-  class TestCase
-    include Beaker::DSL
-  end
-end

data/lib/beaker-pe/install/pe_utils.rb

@@ -1,5 +1,5 @@
-[ 'aio_defaults', 'pe_defaults', 'puppet_utils', 'windows_utils' ].each do |lib|
-    require "beaker/dsl/install_utils/#{lib}"
+[ 'aio_defaults', 'puppet_utils', 'windows_utils' ].each do |lib|
+    require "beaker-puppet/install_utils/#{lib}"
 end
 require 'beaker-pe/install/feature_flags'
 require "beaker-answers"

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.41.1'
+        STRING = '2.0.0'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.41.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -142,6 +142,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: beaker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: beaker-puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: stringify-hash
   requirement: !ruby/object:Gem::Requirement