beaker 2.10.0 → 2.11.0

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -376,6 +376,7 @@ describe Beaker do
 
       hosts.each do |host|
         windows_pkgs.each do |pkg|
+          allow( host ).to receive( :is_cygwin? ).and_return( true )
           expect( host ).to receive( :check_for_package ).with( pkg ).once.and_return( false )
           expect( host ).to receive( :install_package ).with( pkg ).once
         end
@@ -542,7 +543,8 @@ describe Beaker do
     def set_env_helper(platform_name, host_specific_commands_array)
       host = make_host('name', {
           :platform     => platform_name,
-          :ssh_env_file => 'ssh_env_file'
+          :ssh_env_file => 'ssh_env_file',
+          :is_cygwin   => true,
       } )
       opts = {
           :env1_key => :env1_value,

data/spec/beaker/host_spec.rb

@@ -330,6 +330,7 @@ module Beaker
 
       it "does the right thing on a bash host, identified as is_cygwin=true" do
         @options = {:is_cygwin => true}
+        @platform = 'windows'
         result = double
         allow( result ).to receive( :exit_code ).and_return( 0 )
         allow( host ).to receive( :exec ).and_return( result )
@@ -341,6 +342,7 @@ module Beaker
 
       it "does the right thing on a bash host, identified as is_cygwin=nil" do
         @options = {:is_cygwin => nil}
+        @platform = 'windows'
         result = double
         allow( result ).to receive( :exit_code ).and_return( 0 )
         allow( host ).to receive( :exec ).and_return( result )
@@ -352,6 +354,7 @@ module Beaker
 
       it "does the right thing on a non-bash host, identified as is_cygwin=false (powershell)" do
         @options = {:is_cygwin => false}
+        @platform = 'windows'
         result = double
         allow( result ).to receive( :exit_code ).and_return( 0 )
         allow( host ).to receive( :exec ).and_return( result )
@@ -609,12 +612,15 @@ module Beaker
         end
 
         it 'can be called on an unsupported host type without an error being thrown' do
-          @platform = 'mac-osx-foo-tigerlion'
+          @options = { :is_cygwin => false }
+          @platform = 'windows-stuff-stuff'
           expect{ host.build_deprecated_keys() }.not_to raise_error
+          expect( host.build_deprecated_keys().empty? ).to be_truthy
         end
 
         it 'returns an empty array for unsupported host types' do
-          @platform = 'mac-osx-foo-tigerlion'
+          @options = { :is_cygwin => false }
+          @platform = 'windows-stuff-stuff'
           expect( host.build_deprecated_keys().empty? ).to be_truthy
         end
 

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -151,6 +151,7 @@ EOF
       it "can copy to Administrator on windows" do
         host = @hosts[0]
         host[:platform] = 'windows'
+        expect( host ).to receive( :is_cygwin? ).and_return(true)
 
         expect( Command ).to receive( :new ).with("cp -r .ssh /cygdrive/c/Users/Administrator/.").once
         expect( Command ).to receive( :new ).with("chown -R Administrator /cygdrive/c/Users/Administrator/.ssh").once

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -424,6 +424,7 @@ files:
 - lib/beaker/host/freebsd/exec.rb
 - lib/beaker/host/mac.rb
 - lib/beaker/host/mac/group.rb
+- lib/beaker/host/mac/pkg.rb
 - lib/beaker/host/mac/user.rb
 - lib/beaker/host/pswindows.rb
 - lib/beaker/host/pswindows/exec.rb