Suggest different variables to use if we want to tunnel both v4 and v6

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / spec / acceptance / capitalize_spec.rb

diff --git a/3rdparty/modules/stdlib/spec/acceptance/capitalize_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/capitalize_spec.rb
old mode 100755 (executable)
new mode 100644 (file)
index e5e7b7b..e3081e3
--- 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