Update stdlib and concat to 6.1.0 both

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

diff --git a/3rdparty/modules/stdlib/spec/functions/min_spec.rb b/3rdparty/modules/stdlib/spec/functions/min_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index c840a72..34efb67
--- a/3rdparty/modules/stdlib/spec/functions/min_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/min_spec.rb
@@ -1,16 +1,18 @@
 require 'spec_helper'
 
-describe 'min' do
+describe 'min', :if => Puppet::Util::Package.versioncmp(Puppet.version, '6.0.0') < 0 do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
   it { is_expected.to run.with_params(1).and_return(1) }
   it { is_expected.to run.with_params(1, 2).and_return(1) }
   it { is_expected.to run.with_params(1, 2, 3).and_return(1) }
   it { is_expected.to run.with_params(3, 2, 1).and_return(1) }
+  it { is_expected.to run.with_params(12, 8).and_return(8) }
   it { is_expected.to run.with_params('one').and_return('one') }
   it { is_expected.to run.with_params('one', 'two').and_return('one') }
   it { is_expected.to run.with_params('one', 'two', 'three').and_return('one') }
   it { is_expected.to run.with_params('three', 'two', 'one').and_return('one') }
+  it { is_expected.to run.with_params('the', 'public', 'art', 'galleries').and_return('art') }
 
   describe 'implementation artifacts' do
     it { is_expected.to run.with_params(1, 'one').and_return(1) }