Update puppetlabs/stdlib module

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

diff --git a/3rdparty/modules/stdlib/spec/functions/strip_spec.rb b/3rdparty/modules/stdlib/spec/functions/strip_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index 18e943d..28f8d86
--- a/3rdparty/modules/stdlib/spec/functions/strip_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/strip_spec.rb
@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe 'strip' do
+describe 'strip', :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, /wrong number of arguments/i) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
   it {
-    pending("Current implementation ignores parameters after the first.")
-    is_expected.to run.with_params('', '').and_raise_error(Puppet::ParseError, /wrong number of arguments/i)
+    pending('Current implementation ignores parameters after the first.')
+    is_expected.to run.with_params('', '').and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i)
   }
-  it { is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError, /Requires either array or string to work with/) }
-  it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, /Requires either array or string to work with/) }
+  it { is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError, %r{Requires either array or string to work with}) }
+  it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{Requires either array or string to work with}) }
   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('') }