Update stdlib and concat to 6.1.0 both

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / spec / functions / empty_spec.rb

diff --git a/3rdparty/modules/stdlib/spec/functions/empty_spec.rb b/3rdparty/modules/stdlib/spec/functions/empty_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index a3a25d6..695c8a5
--- a/3rdparty/modules/stdlib/spec/functions/empty_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/empty_spec.rb
@@ -1,12 +1,13 @@
 require 'spec_helper'
 
-describe 'empty' do
+describe 'empty', :if => Puppet::Util::Package.versioncmp(Puppet.version, '5.5.0') < 0 do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{Wrong number of arguments}) }
   it {
-    pending("Current implementation ignores parameters after the first.")
+    pending('Current implementation ignores parameters after the first.')
     is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError)
   }
+  it { is_expected.to run.with_params(false).and_raise_error(Puppet::ParseError, %r{Requires either array, hash, string or integer}) }
   it { is_expected.to run.with_params(0).and_return(false) }
   it { is_expected.to run.with_params('').and_return(true) }
   it { is_expected.to run.with_params('one').and_return(false) }
@@ -18,5 +19,5 @@ describe 'empty' do
   it { is_expected.to run.with_params(['one']).and_return(false) }
 
   it { is_expected.to run.with_params({}).and_return(true) }
-  it { is_expected.to run.with_params({'key' => 'value'}).and_return(false) }
+  it { is_expected.to run.with_params('key' => 'value').and_return(false) }
 end