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

diff --git a/3rdparty/modules/stdlib/spec/functions/camelcase_spec.rb b/3rdparty/modules/stdlib/spec/functions/camelcase_spec.rb
old mode 100755
new mode 100644
index c78aa62ff..e0e4003b7
--- a/3rdparty/modules/stdlib/spec/functions/camelcase_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/camelcase_spec.rb
@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-describe 'camelcase' do
+describe 'camelcase', :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("abc").and_return("Abc") }
-  it { is_expected.to run.with_params("aa_bb_cc").and_return("AaBbCc") }
-  it { is_expected.to run.with_params("_aa__bb__cc_").and_return("AaBbCc") }
-  it { is_expected.to run.with_params("100").and_return("100") }
-  it { is_expected.to run.with_params("1_00").and_return("100") }
-  it { is_expected.to run.with_params("_").and_return("") }
-  it { is_expected.to run.with_params("").and_return("") }
+  it { is_expected.to run.with_params('abc').and_return('Abc') }
+  it { is_expected.to run.with_params('aa_bb_cc').and_return('AaBbCc') }
+  it { is_expected.to run.with_params('_aa__bb__cc_').and_return('AaBbCc') }
+  it { is_expected.to run.with_params('100').and_return('100') }
+  it { is_expected.to run.with_params('1_00').and_return('100') }
+  it { is_expected.to run.with_params('_').and_return('') }
+  it { is_expected.to run.with_params('').and_return('') }
   it { is_expected.to run.with_params([]).and_return([]) }
-  it { is_expected.to run.with_params(["abc", "aa_bb_cc"]).and_return(["Abc", "AaBbCc"]) }
-  it { is_expected.to run.with_params(["abc", 1, "aa_bb_cc"]).and_return(["Abc", 1, "AaBbCc"]) }
+  it { is_expected.to run.with_params(['abc', 'aa_bb_cc']).and_return(['Abc', 'AaBbCc']) }
+  it { is_expected.to run.with_params(['abc', 1, 'aa_bb_cc']).and_return(['Abc', 1, 'AaBbCc']) }
 end