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

diff --git a/3rdparty/modules/stdlib/spec/functions/uriescape_spec.rb b/3rdparty/modules/stdlib/spec/functions/uriescape_spec.rb
old mode 100755
new mode 100644
index f05ec088c..fdc3e20b2
--- a/3rdparty/modules/stdlib/spec/functions/uriescape_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/uriescape_spec.rb
@@ -3,34 +3,34 @@ require 'spec_helper'
 describe 'uriescape' 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 URI.escape function' do
-      URI.expects(:escape).with('uri_string').returns('escaped_uri_string').once
-      is_expected.to run.with_params('uri_string').and_return('escaped_uri_string') 
+    it 'calls ruby\'s URI.escape function' do
+      expect(URI).to receive(:escape).with('uri_string').and_return('escaped_uri_string').once
+      is_expected.to run.with_params('uri_string').and_return('escaped_uri_string')
     end
   end
 
   describe 'handling classes derived from String' do
-    it 'should call ruby\'s URI.escape function' do
+    it 'calls ruby\'s URI.escape function' do
       uri_string = AlsoString.new('uri_string')
-      URI.expects(:escape).with(uri_string).returns('escaped_uri_string').once
-      is_expected.to run.with_params(uri_string).and_return("escaped_uri_string") 
+      expect(URI).to receive(:escape).with(uri_string).and_return('escaped_uri_string').once
+      is_expected.to run.with_params(uri_string).and_return('escaped_uri_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%7D", "two"]) }
-    it { is_expected.to run.with_params(["one}", 1, true, {}, "two"]).and_return(["one%7D", 1, true, {}, "two"]) }
+    it { is_expected.to run.with_params(['one}', 'two']).and_return(['one%7D', 'two']) }
+    it { is_expected.to run.with_params(['one}', 1, true, {}, 'two']).and_return(['one%7D', 1, true, {}, 'two']) }
   end
 end