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

diff --git a/3rdparty/modules/stdlib/spec/functions/basename_spec.rb b/3rdparty/modules/stdlib/spec/functions/basename_spec.rb
old mode 100755
new mode 100644
index 3e02b01ba..a2a12a1f8
--- a/3rdparty/modules/stdlib/spec/functions/basename_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/basename_spec.rb
@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe 'basename' do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError) }
-  it { is_expected.to run.with_params('one', 'two', 'three').and_raise_error(Puppet::ParseError) }
-  it { is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError) }
-  it { is_expected.to run.with_params('/path/to/a/file.ext', []).and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{No arguments given}) }
+  it { is_expected.to run.with_params('one', 'two', 'three').and_raise_error(Puppet::ParseError, %r{Too many arguments given}) }
+  it { is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError, %r{Requires string as first argument}) }
+  it { is_expected.to run.with_params('/path/to/a/file.ext', []).and_raise_error(Puppet::ParseError, %r{Requires string as second argument}) }
   it { is_expected.to run.with_params('/path/to/a/file.ext').and_return('file.ext') }
   it { is_expected.to run.with_params('relative_path/to/a/file.ext').and_return('file.ext') }
   it { is_expected.to run.with_params('/path/to/a/file.ext', '.ext').and_return('file') }
   it { is_expected.to run.with_params('relative_path/to/a/file.ext', '.ext').and_return('file') }
   it { is_expected.to run.with_params('scheme:///path/to/a/file.ext').and_return('file.ext') }
 
-  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('scheme:///√ạĺűē/竹.ext').and_return('竹.ext') }
     it { is_expected.to run.with_params('ҝẽγ:/√ạĺűē/竹.ㄘ', '.ㄘ').and_return('竹') }
   end