X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fsuffix_spec.rb;h=802d598f200cdd7a225bf8b9afc252a3cb838acd;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=e0eafb1cca0dfcadd582f50f7e4ebb8e2a411f48;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/suffix_spec.rb b/3rdparty/modules/stdlib/spec/functions/suffix_spec.rb
old mode 100755
new mode 100644
index e0eafb1cc..802d598f2
--- a/3rdparty/modules/stdlib/spec/functions/suffix_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/suffix_spec.rb
@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe 'suffix' 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 second.")
-    is_expected.to run.with_params([], 'a', '').and_raise_error(Puppet::ParseError, /wrong number of arguments/i)
+    pending('Current implementation ignores parameters after the second.')
+    is_expected.to run.with_params([], 'a', '').and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i)
   }
-  it { is_expected.to run.with_params('', '').and_raise_error(Puppet::ParseError, /expected first argument to be an Array/) }
-  it { is_expected.to run.with_params([], 2).and_raise_error(Puppet::ParseError, /expected second argument to be a String/) }
+  it { is_expected.to run.with_params('', '').and_raise_error(Puppet::ParseError, %r{expected first argument to be an Array}) }
+  it { is_expected.to run.with_params([], 2).and_raise_error(Puppet::ParseError, %r{expected second argument to be a String}) }
   it { is_expected.to run.with_params([]).and_return([]) }
   it { is_expected.to run.with_params(['one', 2]).and_return(['one', '2']) }
   it { is_expected.to run.with_params([], '').and_return([]) }
@@ -17,24 +17,14 @@ describe 'suffix' do
   it { is_expected.to run.with_params(['one', 'two', 'three'], 'post').and_return(['onepost', 'twopost', 'threepost']) }
   it { is_expected.to run.with_params(['ỗńέ', 'ťשׂǿ', 'ŧҺř℮ə'], 'рổŝţ').and_return(['ỗńέрổŝţ', 'ťשׂǿрổŝţ', 'ŧҺř℮əрổŝţ']) }
 
-  it {
-    is_expected.to run.with_params({}).and_return({})
-  }
-  it {
-    is_expected.to run.with_params({ 'key1' => 'value1', 2 => 3}).and_return({ 'key1' => 'value1', '2' => 3 })
-  }
-  it {
-    is_expected.to run.with_params({}, '').and_return({})
-  }
-  it {
-    is_expected.to run.with_params({ 'key' => 'value' }, '').and_return({ 'key' => 'value' })
-  }
-  it {
-    is_expected.to run.with_params({ 'key' => 'value' }, 'post').and_return({ 'keypost' => 'value' })
-  }
+  it { is_expected.to run.with_params({}).and_return({}) }
+  it { is_expected.to run.with_params('key1' => 'value1', 2 => 3).and_return('key1' => 'value1', '2' => 3) }
+  it { is_expected.to run.with_params({}, '').and_return({}) }
+  it { is_expected.to run.with_params({ 'key' => 'value' }, '').and_return('key' => 'value') }
+  it { is_expected.to run.with_params({ 'key' => 'value' }, 'post').and_return('keypost' => 'value') }
   it {
     is_expected.to run \
       .with_params({ 'key1' => 'value1', 'key2' => 'value2', 'key3' => 'value3' }, 'post') \
-      .and_return({ 'key1post' => 'value1', 'key2post' => 'value2', 'key3post' => 'value3' })
+      .and_return('key1post' => 'value1', 'key2post' => 'value2', 'key3post' => 'value3')
   }
 end