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

diff --git a/3rdparty/modules/stdlib/spec/functions/capitalize_spec.rb b/3rdparty/modules/stdlib/spec/functions/capitalize_spec.rb
old mode 100755
new mode 100644
index 7ce2e1630..dd5fc354b
--- a/3rdparty/modules/stdlib/spec/functions/capitalize_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/capitalize_spec.rb
@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe 'capitalize' do
+describe 'capitalize', :if => Puppet::Util::Package.versioncmp(Puppet.version, '6.0.0') < 0 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.and_raise_error(Puppet::ParseError) }
   it { is_expected.to run.with_params(100).and_raise_error(Puppet::ParseError) }
-  it { is_expected.to run.with_params("one").and_return("One") }
-  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") }
+  it { is_expected.to run.with_params('one').and_return('One') }
+  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') }
 
-  it { is_expected.to run.with_params(AlsoString.new("one")).and_return("One") }
+  it { is_expected.to run.with_params(AlsoString.new('one')).and_return('One') }
   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, "two"]).and_return(["One", 1, "Two"]) }
+  it { is_expected.to run.with_params(['one', 'two']).and_return(['One', 'Two']) }
+  it { is_expected.to run.with_params(['one', 1, 'two']).and_return(['One', 1, 'Two']) }
 end