X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Flstrip_spec.rb;h=1621c5733c31a323e84e765ce313cb1eb6f1c624;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=eba5d0d06924e3cba935730a000fa73c90d47c6c;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

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