X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fconcat_spec.rb;h=391b84898a3db829cf5b4d5b26c30d8782fde4cc;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=06b649f19f6fb8c5027f3c6cdf7df92480281fe6;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/concat_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/concat_spec.rb
old mode 100755
new mode 100644
index 06b649f19..391b84898
--- a/3rdparty/modules/stdlib/spec/acceptance/concat_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/concat_spec.rb
@@ -1,40 +1,52 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'concat function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'concat function' do
   describe 'success' do
-    it 'should concat one array to another' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $output = concat(['1','2','3'],['4','5','6'])
       validate_array($output)
       if size($output) != 6 {
         fail("${output} should have 6 elements.")
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+    DOC
+    it 'concats one array to another' do
+      apply_manifest(pp1, :catch_failures => true)
     end
-    it 'should concat arrays and primitives to array' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $output = concat(['1','2','3'],'4','5','6',['7','8','9'])
       validate_array($output)
       if size($output) != 9 {
         fail("${output} should have 9 elements.")
       }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
+    DOC
+    it 'concats arrays and primitives to array' do
+      apply_manifest(pp2, :catch_failures => true)
     end
-    it 'should concat multiple arrays to one' do
-      pp = <<-EOS
+
+    pp3 = <<-DOC
       $output = concat(['1','2','3'],['4','5','6'],['7','8','9'])
       validate_array($output)
       if size($output) != 9 {
         fail("${output} should have 9 elements.")
       }
-      EOS
+    DOC
+    it 'concats multiple arrays to one' do
+      apply_manifest(pp3, :catch_failures => true)
+    end
 
-      apply_manifest(pp, :catch_failures => true)
+    pp4 = <<-DOC
+      $output = concat([{"a" => "b"}], {"c" => "d", "e" => "f"})
+      validate_array($output)
+      if size($output) != 2 {
+        fail("${output} should have 2 elements.")
+      }
+      if $output[1] != {"c" => "d", "e" => "f"} {
+        fail("${output} does not have the expected hash for the second element.")
+      }
+    DOC
+    it 'concats hash arguments' do
+      apply_manifest(pp4, :catch_failures => true)
     end
   end
 end