X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fregexpescape_spec.rb;h=b60cb992b0a6c239f692f0d6f6e8242beeddcaff;hb=7c041353f4da829d409830eba2e95946952e817f;hp=36dbe70e64c2bd83e08d170c97226d8b2e85e34f;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/regexpescape_spec.rb b/3rdparty/modules/stdlib/spec/functions/regexpescape_spec.rb
index 36dbe70e6..b60cb992b 100644
--- a/3rdparty/modules/stdlib/spec/functions/regexpescape_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/regexpescape_spec.rb
@@ -3,37 +3,37 @@ require 'spec_helper'
 describe 'regexpescape' do
   describe 'signature validation' 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('', '').and_raise_error(Puppet::ParseError, /wrong number of arguments/i)
+      pending('Current implementation ignores parameters after the first.')
+      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_raise_error(Puppet::ParseError, /Requires either array or string to work/) }
-    it { is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError, /Requires either array or string to work/) }
-    it { is_expected.to run.with_params(true).and_raise_error(Puppet::ParseError, /Requires either array or string to work/) }
+    it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{Requires either array or string to work}) }
+    it { is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError, %r{Requires either array or string to work}) }
+    it { is_expected.to run.with_params(true).and_raise_error(Puppet::ParseError, %r{Requires either array or string to work}) }
   end
 
   describe 'handling normal strings' do
-    it 'should call ruby\'s Regexp.escape function' do
-      Regexp.expects(:escape).with('regexp_string').returns('escaped_regexp_string').once
+    it 'calls ruby\'s Regexp.escape function' do
+      expect(Regexp).to receive(:escape).with('regexp_string').and_return('escaped_regexp_string').once
       is_expected.to run.with_params('regexp_string').and_return('escaped_regexp_string')
     end
   end
 
   describe 'handling classes derived from String' do
-    it 'should call ruby\'s Regexp.escape function' do
+    it 'calls ruby\'s Regexp.escape function' do
       regexp_string = AlsoString.new('regexp_string')
-      Regexp.expects(:escape).with(regexp_string).returns('escaped_regexp_string').once
-      is_expected.to run.with_params(regexp_string).and_return("escaped_regexp_string")
+      expect(Regexp).to receive(:escape).with(regexp_string).and_return('escaped_regexp_string').once
+      is_expected.to run.with_params(regexp_string).and_return('escaped_regexp_string')
     end
   end
 
   describe 'strings in arrays handling' do
     it { is_expected.to run.with_params([]).and_return([]) }
-    it { is_expected.to run.with_params(['one*', "two"]).and_return(['one\*', "two"]) }
-    it { is_expected.to run.with_params(['one*', 1, true, {}, "two"]).and_return(['one\*', 1, true, {}, "two"]) }
+    it { is_expected.to run.with_params(['one*', 'two']).and_return(['one\*', 'two']) }
+    it { is_expected.to run.with_params(['one*', 1, true, {}, 'two']).and_return(['one\*', 1, true, {}, 'two']) }
 
-    context 'should run with UTF8 and double byte characters' do
+    context 'with UTF8 and double byte characters' do
       it { is_expected.to run.with_params(['ŏʼnε*']).and_return(['ŏʼnε\*']) }
       it { is_expected.to run.with_params(['インターネット*']).and_return(['インターネット\*']) }
     end