From 7c570f75a5b88b1eb057bce3f7c4cad9cac83496 Mon Sep 17 00:00:00 2001
From: Peter Souter <p.souter@kainos.com>
Date: Thu, 4 Dec 2014 14:15:03 +0000
Subject: (MODULES-444) Acceptance test for primitives

`concat` should be able to concat arrays and primitives
---
 spec/acceptance/concat_spec.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'spec/acceptance/concat_spec.rb')

diff --git a/spec/acceptance/concat_spec.rb b/spec/acceptance/concat_spec.rb
index 7bda365..0d5e831 100755
--- a/spec/acceptance/concat_spec.rb
+++ b/spec/acceptance/concat_spec.rb
@@ -12,6 +12,17 @@ describe 'concat function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('oper
       }
       EOS
 
+      apply_manifest(pp, :catch_failures => true)
+    end
+    it 'should concat arrays and primitives to array' do
+      pp = <<-EOS
+      $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)
     end
   end
-- 
cgit v1.2.3


From 5e49c504580bf06353c841c51f1319a5bda893a8 Mon Sep 17 00:00:00 2001
From: Peter Souter <p.souter@kainos.com>
Date: Thu, 4 Dec 2014 14:15:33 +0000
Subject: (MODULES-444) Acceptance for multiple arrays

Acceptance test to take multiple arrays for concatenation
---
 spec/acceptance/concat_spec.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'spec/acceptance/concat_spec.rb')

diff --git a/spec/acceptance/concat_spec.rb b/spec/acceptance/concat_spec.rb
index 0d5e831..caf2f7d 100755
--- a/spec/acceptance/concat_spec.rb
+++ b/spec/acceptance/concat_spec.rb
@@ -23,6 +23,17 @@ describe 'concat function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('oper
       }
       EOS
 
+      apply_manifest(pp, :catch_failures => true)
+    end
+    it 'should concat multiple arrays to one' do
+      pp = <<-EOS
+      $output = concat(['1','2','3'],['4','5','6'],['7','8','9'])
+      validate_array($output)
+      if size($output) != 6 {
+        fail("${output} should have 9 elements.")
+      }
+      EOS
+
       apply_manifest(pp, :catch_failures => true)
     end
   end
-- 
cgit v1.2.3


From 31a6d894107f8f2ef4e0aec081f505d153e6297c Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 18 Dec 2014 16:20:02 -0800
Subject: Fix bad check in test

---
 spec/acceptance/concat_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/acceptance/concat_spec.rb')

diff --git a/spec/acceptance/concat_spec.rb b/spec/acceptance/concat_spec.rb
index caf2f7d..06b649f 100755
--- a/spec/acceptance/concat_spec.rb
+++ b/spec/acceptance/concat_spec.rb
@@ -29,7 +29,7 @@ describe 'concat function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('oper
       pp = <<-EOS
       $output = concat(['1','2','3'],['4','5','6'],['7','8','9'])
       validate_array($output)
-      if size($output) != 6 {
+      if size($output) != 9 {
         fail("${output} should have 9 elements.")
       }
       EOS
-- 
cgit v1.2.3