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

diff --git a/3rdparty/modules/stdlib/spec/functions/grep_spec.rb b/3rdparty/modules/stdlib/spec/functions/grep_spec.rb
old mode 100755
new mode 100644
index d2152b1aa..587e51b8d
--- a/3rdparty/modules/stdlib/spec/functions/grep_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/grep_spec.rb
@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe 'grep' 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('one').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('one').and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
   it {
-    pending("grep does not actually check this, and raises NoMethodError instead")
-    is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError, /first argument not an array/)
+    pending('grep does not actually check this, and raises NoMethodError instead')
+    is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError, %r{first argument not an array})
   }
   it {
-    pending("grep does not actually check this, and raises NoMethodError instead")
-    is_expected.to run.with_params(1, 'two').and_raise_error(Puppet::ParseError, /first argument not an array/)
+    pending('grep does not actually check this, and raises NoMethodError instead')
+    is_expected.to run.with_params(1, 'two').and_raise_error(Puppet::ParseError, %r{first argument not an array})
   }
-  it { is_expected.to run.with_params('one', 'two', 'three').and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
+  it { is_expected.to run.with_params('one', 'two', 'three').and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
   it { is_expected.to run.with_params([], 'two').and_return([]) }
   it { is_expected.to run.with_params(['one', 'two', 'three'], 'two').and_return(['two']) }
   it { is_expected.to run.with_params(['one', 'two', 'three'], 't(wo|hree)').and_return(['two', 'three']) }