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

diff --git a/3rdparty/modules/stdlib/spec/functions/upcase_spec.rb b/3rdparty/modules/stdlib/spec/functions/upcase_spec.rb
old mode 100755
new mode 100644
index 3b7b02d47..5b5e42617
--- a/3rdparty/modules/stdlib/spec/functions/upcase_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/upcase_spec.rb
@@ -1,26 +1,26 @@
 require 'spec_helper'
 
-describe 'upcase' do
+describe 'upcase', :if => Puppet::Util::Package.versioncmp(Puppet.version, '6.0.0') < 0 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, /wrong number of arguments/i) }
-    it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, /Requires an array, hash or object that responds to upcase/) }
-    it { is_expected.to run.with_params([1]).and_raise_error(Puppet::ParseError, /Requires an array, hash or object that responds to upcase/) }
+    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('', '').and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
+    it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{Requires an array, hash or object that responds to upcase}) }
+    it { is_expected.to run.with_params([1]).and_raise_error(Puppet::ParseError, %r{Requires an array, hash or object that responds to upcase}) }
   end
 
   describe 'normal string handling' do
-    it { is_expected.to run.with_params("abc").and_return("ABC") }
-    it { is_expected.to run.with_params("Abc").and_return("ABC") }
-    it { is_expected.to run.with_params("ABC").and_return("ABC") }
+    it { is_expected.to run.with_params('abc').and_return('ABC') }
+    it { is_expected.to run.with_params('Abc').and_return('ABC') }
+    it { is_expected.to run.with_params('ABC').and_return('ABC') }
   end
 
   describe 'handling classes derived from String' do
-    it { is_expected.to run.with_params(AlsoString.new("ABC")).and_return("ABC") }
+    it { is_expected.to run.with_params(AlsoString.new('ABC')).and_return('ABC') }
   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', 'twO']).and_return(['ONE', 'TWO']) }
   end
 end