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

diff --git a/3rdparty/modules/stdlib/spec/functions/chop_spec.rb b/3rdparty/modules/stdlib/spec/functions/chop_spec.rb
old mode 100755
new mode 100644
index b70fc37eb..b33edb5e8
--- a/3rdparty/modules/stdlib/spec/functions/chop_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/chop_spec.rb
@@ -1,24 +1,24 @@
 require 'spec_helper'
 
-describe 'chop' do
+describe 'chop', :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(1).and_raise_error(Puppet::ParseError) }
   it {
-    pending("Current implementation ignores parameters after the first.")
-    is_expected.to run.with_params("a", "b").and_raise_error(Puppet::ParseError)
+    pending('Current implementation ignores parameters after the first.')
+    is_expected.to run.with_params('a', 'b').and_raise_error(Puppet::ParseError)
   }
-  it { is_expected.to run.with_params("one").and_return("on") }
-  it { is_expected.to run.with_params("one\n").and_return("one") }
+  it { is_expected.to run.with_params('one').and_return('on') }
+  it { is_expected.to run.with_params("one\n").and_return('one') }
   it { is_expected.to run.with_params("one\n\n").and_return("one\n") }
-  it { is_expected.to run.with_params(["one\n", "two", "three\n"]).and_return(["one", "tw", "three"]) }
+  it { is_expected.to run.with_params(["one\n", 'two', "three\n"]).and_return(['one', 'tw', 'three']) }
 
-  it { is_expected.to run.with_params(AlsoString.new("one")).and_return("on") }
-  it { is_expected.to run.with_params(AlsoString.new("one\n")).and_return("one") }
+  it { is_expected.to run.with_params(AlsoString.new('one')).and_return('on') }
+  it { is_expected.to run.with_params(AlsoString.new("one\n")).and_return('one') }
   it { is_expected.to run.with_params(AlsoString.new("one\n\n")).and_return("one\n") }
-  it { is_expected.to run.with_params([AlsoString.new("one\n"), AlsoString.new("two"), "three\n"]).and_return(["one", "tw", "three"]) }
+  it { is_expected.to run.with_params([AlsoString.new("one\n"), AlsoString.new('two'), "three\n"]).and_return(['one', 'tw', 'three']) }
 
-  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("ůťƒ8\n\n").and_return("ůťƒ8\n") }
     it { is_expected.to run.with_params("ネット\n\n").and_return("ネット\n") }
   end