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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/union_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/union_spec.rb
old mode 100755
new mode 100644
index 6db8d0cf9..e1b3d9aeb
--- a/3rdparty/modules/stdlib/spec/acceptance/union_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/union_spec.rb
@@ -1,19 +1,18 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'union function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'union function' do
   describe 'success' do
-    it 'unions arrays' do
-      pp = <<-EOS
+    pp = <<-DOC
       $a = ["the","public"]
-      $b = ["art","galleries"]
+      $b = ["art"]
+      $c = ["galleries"]
       # Anagram: Large picture halls, I bet
-      $o = union($a,$b)
+      $o = union($a,$b,$c)
       notice(inline_template('union is <%= @o.inspect %>'))
-      EOS
-
+    DOC
+    it 'unions arrays' do
       apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/union is \["the", "public", "art", "galleries"\]/)
+        expect(r.stdout).to match(%r{union is \["the", "public", "art", "galleries"\]})
       end
     end
   end