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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/is_array_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/is_array_spec.rb
old mode 100755
new mode 100644
index 9c6bad735..408ff1ece
--- a/3rdparty/modules/stdlib/spec/acceptance/is_array_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/is_array_spec.rb
@@ -1,62 +1,60 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'is_array function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'is_array function' do
   describe 'success' do
-    it 'is_arrays arrays' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = ['aaa','bbb','ccc']
       $b = true
       $o = is_array($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'is_arrays arrays' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
-    it 'is_arrays empty arrays' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = []
       $b = true
       $o = is_array($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'is_arrays empty arrays' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
-    it 'is_arrays strings' do
-      pp = <<-EOS
+
+    pp3 = <<-DOC
       $a = "aoeu"
       $b = false
       $o = is_array($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'is_arrays strings' do
+      apply_manifest(pp3, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
-    it 'is_arrays hashes' do
-      pp = <<-EOS
+
+    pp4 = <<-DOC
       $a = {'aaa'=>'bbb'}
       $b = false
       $o = is_array($a)
       if $o == $b {
         notify { 'output correct': }
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
+    DOC
+    it 'is_arrays hashes' do
+      apply_manifest(pp4, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{Notice: output correct})
       end
     end
   end