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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/upcase_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/upcase_spec.rb
old mode 100755
new mode 100644
index 178230927..fda444b9d
--- a/3rdparty/modules/stdlib/spec/acceptance/upcase_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/upcase_spec.rb
@@ -1,28 +1,26 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'upcase function' do
+describe 'upcase function', :if => Puppet::Util::Package.versioncmp(return_puppet_version, '6.0.0') < 0 do
   describe 'success' do
-    it 'upcases arrays' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = ["wallless", "laparohysterosalpingooophorectomy", "brrr", "goddessship"]
       $o = upcase($a)
       notice(inline_template('upcase is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/upcase is \["WALLLESS", "LAPAROHYSTEROSALPINGOOOPHORECTOMY", "BRRR", "GODDESSSHIP"\]/)
+    DOC
+    it 'upcases arrays' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{upcase is \["WALLLESS", "LAPAROHYSTEROSALPINGOOOPHORECTOMY", "BRRR", "GODDESSSHIP"\]})
       end
     end
-    it 'upcases strings' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = "wallless laparohysterosalpingooophorectomy brrr goddessship"
       $o = upcase($a)
       notice(inline_template('upcase is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/upcase is "WALLLESS LAPAROHYSTEROSALPINGOOOPHORECTOMY BRRR GODDESSSHIP"/)
+    DOC
+    it 'upcases strings' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{upcase is "WALLLESS LAPAROHYSTEROSALPINGOOOPHORECTOMY BRRR GODDESSSHIP"})
       end
     end
   end