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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/validate_array_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/validate_array_spec.rb
old mode 100755
new mode 100644
index a76321dc9..87016c229
--- a/3rdparty/modules/stdlib/spec/acceptance/validate_array_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/validate_array_spec.rb
@@ -1,33 +1,31 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
 describe 'validate_array function' do
   describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $one = ['a', 'b']
       validate_array($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+    DOC
+    it 'validates a single argument' do
+      apply_manifest(pp1, :catch_failures => true)
     end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $one = ['a', 'b']
       $two = [['c'], 'd']
       validate_array($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+    DOC
+    it 'validates an multiple arguments' do
+      apply_manifest(pp2, :catch_failures => true)
     end
     [
       %{validate_array({'a' => 'hash' })},
       %{validate_array('string')},
       %{validate_array(false)},
-      %{validate_array(undef)}
+      %{validate_array(undef)},
     ].each do |pp|
       it "rejects #{pp.inspect}" do
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/is not an Array\.  It looks to be a/)
+        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(%r{is not an Array\.  It looks to be a})
       end
     end
   end