X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fvalidate_re_spec.rb;h=2d2291ca6fc0d916ff0196f56ffea592dd5c72b4;hb=59812388abf4638d6065ffda934d1866af902302;hp=22f6d47d1d1e35e53550a636a38107e0609b85da;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/validate_re_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/validate_re_spec.rb
old mode 100755
new mode 100644
index 22f6d47d1..2d2291ca6
--- a/3rdparty/modules/stdlib/spec/acceptance/validate_re_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/validate_re_spec.rb
@@ -1,45 +1,44 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'validate_re function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'validate_re function' do
   describe 'success' do
-    it 'validates a string' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $one = 'one'
       $two = '^one$'
       validate_re($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+    DOC
+    it 'validates a string' do
+      apply_manifest(pp1, :catch_failures => true)
     end
-    it 'validates an array' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $one = 'one'
       $two = ['^one$', '^two']
       validate_re($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+    DOC
+    it 'validates an array' do
+      apply_manifest(pp2, :catch_failures => true)
     end
-    it 'validates a failed array' do
-      pp = <<-EOS
+
+    pp3 = <<-DOC
       $one = 'one'
       $two = ['^two$', '^three']
       validate_re($one,$two)
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
+    DOC
+    it 'validates a failed array' do
+      apply_manifest(pp3, :expect_failures => true)
     end
-    it 'validates a failed array with a custom error message' do
-      pp = <<-EOS
+
+    pp4 = <<-DOC
       $one = '3.4.3'
       $two = '^2.7'
       validate_re($one,$two,"The $puppetversion fact does not match 2.7")
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/does not match/)
+    DOC
+    it 'validates a failed array with a custom error message' do
+      expect(apply_manifest(pp4, :expect_failures => true).stderr).to match(%r{does not match})
     end
   end
+
   describe 'failure' do
     it 'handles improper number of arguments'
     it 'handles improper argument types'