X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Frstrip_spec.rb;h=b7aebda4845d9d87f70a1cfa5d6f0fabaa66c81d;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=b57a8b045813e739ef91e38e59abc5ea9683daea;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

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