beaker-puppet 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e6258d1a2954f625e243faf4b65e701f9e5ce8f
-  data.tar.gz: 7b83c1e3cfc42f1f9abfb5e41230a864af122de2
+  metadata.gz: 91f9dff9d57b28cd3bd634842fdb9cadb179139c
+  data.tar.gz: 94a363edc67c9d806dcd97f99d331bb3ad7a21d8
 SHA512:
-  metadata.gz: 364b170924ca1389fab01f65d880f1eb15d684b88c25df4ee552664a9a20304e3924e5da893ac3d35c2ae6bc97f20c037abd24c5ef51a1d08c75892694d65101
-  data.tar.gz: 3e3710f648b369fe9d6e2c830822c47944d857790b64d019d880ab3fb6c647e8f5ac16b06727477f76c0d5ff7e96af522ee3a9f83a342d3ab5fab926b0204348
+  metadata.gz: ea5fa35c971236f41bdc364f2d6c9f1d73f8009fda38a30da915ff5d36d4033e77f716dbd5ac3b31b59d155bbf0eaa29dbb88984fcdd51b75dfd3b2b443f28f0
+  data.tar.gz: 9b6ddd716275eb8ce105ebc3b36c035e2d835c24ab8a342db70a8740b532fa3e5286e86b631c2cd7cdf92d2f3b003168910c509ab23902fe4f29a247ad69e529

data/beaker-puppet.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'thin'
 
   # Run time dependencies
+  s.add_runtime_dependency 'beaker', '~> 4.1'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
   s.add_runtime_dependency 'in-parallel', '~> 0.1'
   s.add_runtime_dependency 'oga'

data/lib/beaker-puppet/helpers/facter_helpers.rb

@@ -37,13 +37,14 @@ module Beaker
         # @return String The value of the fact 'name' on the provided host
         # @raise  [FailTest] Raises an exception if call to facter fails
         def fact_on(host, name, opts = {})
+          raise(ArgumentError, "fact_on's `name` option must be a String. You provided a #{name.class}: '#{name}'") unless name.is_a?(String)
           if opts.kind_of?(Hash)
             opts.merge!({json: nil})
           else
             opts << ' --json'
           end
 
-          result = on host, facter(name, opts)
+          result = on host, facter("\"#{name}\"", opts)
           if result.kind_of?(Array)
             result.map { |res| JSON.parse(res.stdout)[name] }
           else

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

data/spec/beaker-puppet/helpers/facter_helpers_spec.rb

@@ -34,7 +34,7 @@ describe ClassMixedWithDSLHelpers do
   describe '#fact_on' do
     it 'retrieves a fact on a single host' do
       result.stdout = "{\"osfamily\": \"family\"}\n"
-      expect( subject ).to receive(:facter).with('osfamily',{json: nil}).once
+      expect( subject ).to receive(:facter).with('"osfamily"',{json: nil}).once
       expect( subject ).to receive(:on).and_return(result)
 
       expect( subject.fact_on('host','osfamily') ).to be === JSON.parse(result.stdout)['osfamily']
@@ -67,6 +67,11 @@ describe ClassMixedWithDSLHelpers do
       expect(structured_fact['user'].class).to be String
       expect(structured_fact['privileged'].class).to be (TrueClass or FalseClass)
     end
+
+    it 'raises an error when it receives a symbol for a fact' do
+      expect { subject.fact_on('host', :osfamily) }
+        .to raise_error(ArgumentError, /fact_on's `name` option must be a String. You provided a Symbol: 'osfamily'/)
+    end
   end
 
   describe '#fact' do

data/tasks/ci.rake

@@ -234,8 +234,8 @@ end
 def beaker_suite(type)
   beaker(:init, '--hosts', ENV['HOSTS'], '--options-file', "config/#{String(type)}/options.rb")
   beaker(:provision)
-  beaker(:exec, 'pre-suite', '--pre-suite', pre_suites(type))
-  beaker(:exec, 'pre-suite')
+  beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(type))
+  beaker(:exec, 'pre-suite', '--preserve-state')
   beaker(:exec, ENV['TESTS'])
   beaker(:exec, 'post-suite')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -156,6 +156,20 @@ 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.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: stringify-hash
   requirement: !ruby/object:Gem::Requirement