X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fvalues_spec.rb;h=850d3147273ab18e5b81011fedeeecc15dacbdce;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=26c6dfb3ebb4b23424089688795b8e0b80eb87a6;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/values_spec.rb b/3rdparty/modules/stdlib/spec/functions/values_spec.rb
old mode 100755
new mode 100644
index 26c6dfb3e..850d31472
--- a/3rdparty/modules/stdlib/spec/functions/values_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/values_spec.rb
@@ -1,23 +1,23 @@
 require 'spec_helper'
 
-describe 'values' do
+describe 'values', :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, /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('').and_raise_error(Puppet::ParseError, /Requires hash to work with/) }
-  it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, /Requires hash to work with/) }
-  it { is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError, /Requires hash to work with/) }
+  it { is_expected.to run.with_params('').and_raise_error(Puppet::ParseError, %r{Requires hash to work with}) }
+  it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{Requires hash to work with}) }
+  it { is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError, %r{Requires hash to work with}) }
   it { is_expected.to run.with_params({}).and_return([]) }
-  it { is_expected.to run.with_params({ 'key' => 'value' }).and_return(['value']) }
-  it 'should return the array of values' do
+  it { is_expected.to run.with_params('key' => 'value').and_return(['value']) }
+  it 'returns the array of values' do
     result = subject.call([{ 'key1' => 'value1', 'key2' => 'value2', 'duplicate_value_key' => 'value2' }])
     expect(result).to match_array(['value1', 'value2', 'value2'])
   end
 
-  it 'should run with UTF8 and double byte characters' do
+  it 'runs with UTF8 and double byte characters' do
     result = subject.call([{ 'かぎ' => '使用', 'ҝĕұ' => '√ẩŀứệ', 'ҝĕұďŭрļǐçằťè' => '√ẩŀứệ' }])
     expect(result).to match_array(['使用', '√ẩŀứệ', '√ẩŀứệ'])
   end