X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fstrip_spec.rb;h=67a939a853880c17c2ef438a45e55984fd4e1305;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=05cd39596de411c06ce843609134f87edba704c1;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/strip_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/strip_spec.rb
old mode 100755
new mode 100644
index 05cd39596..67a939a85
--- a/3rdparty/modules/stdlib/spec/acceptance/strip_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/strip_spec.rb
@@ -1,29 +1,27 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'strip function' do
+describe 'strip function', :if => Puppet::Util::Package.versioncmp(return_puppet_version, '6.0.0') < 0 do
   describe 'success' do
-    it 'strips arrays' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = ["  the   ","   public   ","   art","galleries   "]
       # Anagram: Large picture halls, I bet
       $o = strip($a)
       notice(inline_template('strip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/strip is \["the", "public", "art", "galleries"\]/)
+    DOC
+    it 'strips arrays' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{strip is \["the", "public", "art", "galleries"\]})
       end
     end
-    it 'strips strings' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = "   blowzy night-frumps vex'd jack q   "
       $o = strip($a)
       notice(inline_template('strip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/strip is "blowzy night-frumps vex'd jack q"/)
+    DOC
+    it 'strips strings' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{strip is "blowzy night-frumps vex'd jack q"})
       end
     end
   end