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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/capitalize_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/capitalize_spec.rb
old mode 100755
new mode 100644
index e5e7b7bf8..e3081e34c
--- a/3rdparty/modules/stdlib/spec/acceptance/capitalize_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/capitalize_spec.rb
@@ -1,32 +1,29 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'capitalize function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'capitalize function', :if => Puppet::Util::Package.versioncmp(return_puppet_version, '6.0.0') < 0 do
   describe 'success' do
-    it 'should capitalize the first letter of a string' do
-      pp = <<-EOS
-      $input = 'this is a string'
-      $output = capitalize($input)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: This is a string/)
+    pp1 = <<-DOC
+        $input = 'this is a string'
+        $output = capitalize($input)
+        notify { $output: }
+    DOC
+    it 'capitalizes the first letter of a string' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: This is a string})
       end
     end
 
-    it 'should capitalize the first letter of an array of strings' do
-      pp = <<-EOS
+    pp2 = <<-DOC
       $input = ['this', 'is', 'a', 'string']
       $output = capitalize($input)
       notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: This/)
-        expect(r.stdout).to match(/Notice: Is/)
-        expect(r.stdout).to match(/Notice: A/)
-        expect(r.stdout).to match(/Notice: String/)
+    DOC
+    regex_array = [%r{Notice: This}, %r{Notice: Is}, %r{Notice: A}, %r{Notice: String}]
+    it 'capitalizes the first letter of an array of strings' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        regex_array.each do |i|
+          expect(r.stdout).to match(i)
+        end
       end
     end
   end