X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fsize_spec.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fsize_spec.rb;h=69fdff2f8d6a54e9770e65726fbb853a3e0d1d3b;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=2047423a9c79c76818821ece7470660bacdf0227;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/size_spec.rb b/3rdparty/modules/stdlib/spec/functions/size_spec.rb
old mode 100755
new mode 100644
index 2047423a9..69fdff2f8
--- a/3rdparty/modules/stdlib/spec/functions/size_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/size_spec.rb
@@ -1,25 +1,25 @@
 require 'spec_helper'
 
-describe 'size' do
+describe 'size', :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 {
-    pending("Current implementation ignores parameters after the first.")
-    is_expected.to run.with_params([], 'extra').and_raise_error(Puppet::ParseError, /wrong number of arguments/i)
+    pending('Current implementation ignores parameters after the first.')
+    is_expected.to run.with_params([], 'extra').and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i)
   }
-  it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, /Unknown type given/) }
-  it { is_expected.to run.with_params(true).and_raise_error(Puppet::ParseError, /Unknown type given/) }
-  it { is_expected.to run.with_params('1').and_raise_error(Puppet::ParseError, /Requires either string, array or hash to work/) }
-  it { is_expected.to run.with_params('1.0').and_raise_error(Puppet::ParseError, /Requires either string, array or hash to work/) }
+  it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{Unknown type given}) }
+  it { is_expected.to run.with_params(true).and_raise_error(Puppet::ParseError, %r{Unknown type given}) }
+  it { is_expected.to run.with_params('1').and_raise_error(Puppet::ParseError, %r{Requires either string, array or hash to work}) }
+  it { is_expected.to run.with_params('1.0').and_raise_error(Puppet::ParseError, %r{Requires either string, array or hash to work}) }
   it { is_expected.to run.with_params([]).and_return(0) }
   it { is_expected.to run.with_params(['a']).and_return(1) }
   it { is_expected.to run.with_params(['one', 'two', 'three']).and_return(3) }
   it { is_expected.to run.with_params(['one', 'two', 'three', 'four']).and_return(4) }
 
   it { is_expected.to run.with_params({}).and_return(0) }
-  it { is_expected.to run.with_params({'1' => '2'}).and_return(1) }
-  it { is_expected.to run.with_params({'1' => '2', '4' => '4'}).and_return(2) }
-  it { is_expected.to run.with_params({'€' => '@', '竹' => 'ǿňè'}).and_return(2) }
+  it { is_expected.to run.with_params('1' => '2').and_return(1) }
+  it { is_expected.to run.with_params('1' => '2', '4' => '4').and_return(2) }
+  it { is_expected.to run.with_params('€' => '@', '竹' => 'ǿňè').and_return(2) }
 
   it { is_expected.to run.with_params('').and_return(0) }
   it { is_expected.to run.with_params('a').and_return(1) }
@@ -28,10 +28,10 @@ describe 'size' do
   it { is_expected.to run.with_params('万').and_return(1) }
   it { is_expected.to run.with_params('āβćđ').and_return(4) }
 
-  context 'when using a class extending String' do
-    it 'should call its size method' do
+  context 'when using a class extending String', :unless => Puppet::Util::Package.versioncmp(Puppet.version, '5.5.7') == 0 do
+    it 'calls its size method' do
       value = AlsoString.new('asdfghjkl')
-      value.expects(:size).returns('foo')
+      expect(value).to receive(:size).and_return('foo')
       expect(subject).to run.with_params(value).and_return('foo')
     end
   end