Update stdlib and concat to 6.1.0 both

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / spec / functions / chop_spec.rb

diff --git a/3rdparty/modules/stdlib/spec/functions/chop_spec.rb b/3rdparty/modules/stdlib/spec/functions/chop_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index b70fc37..be90981
--- a/3rdparty/modules/stdlib/spec/functions/chop_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/chop_spec.rb
@@ -1,24 +1,26 @@
 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(1).and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{Wrong number of arguments}) }
+  it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{Requires either an 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("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
+  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