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

diff --git a/3rdparty/modules/stdlib/spec/functions/chomp_spec.rb b/3rdparty/modules/stdlib/spec/functions/chomp_spec.rb
old mode 100755
new mode 100644
index 56bd9b1e1..2137c6166
--- a/3rdparty/modules/stdlib/spec/functions/chomp_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/chomp_spec.rb
@@ -1,24 +1,26 @@
 require 'spec_helper'
 
-describe 'chomp' do
+describe 'chomp', :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(1).and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{Wrong number of arguments given}) }
+  it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{Requires either array or string}) }
   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("one") }
-  it { is_expected.to run.with_params("one\n").and_return("one") }
+  it { is_expected.to run.with_params('one').and_return('one') }
+  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", "two", "three"]) }
+  it { is_expected.to run.with_params(["one\n", 'two', "three\n"]).and_return(['one', 'two', 'three']) }
 
-  it { is_expected.to run.with_params(AlsoString.new("one")).and_return("one") }
-  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('one') }
+  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", "two", "three"]) }
+  it { is_expected.to run.with_params([AlsoString.new("one\n"), AlsoString.new('two'), "three\n"]).and_return(['one', 'two', 'three']) }
 
-  context 'should run with UTF8 and double byte characters' do
+  it { is_expected.to run.with_params([1, 2, 3]).and_return([1, 2, 3]) }
+
+  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