Merge pull request #306 from hunner/fix_concat

(MODULES-1195) Rebase of redhat-openstack#202
strider · Jul 31, 2014 · e310b1f · e310b1f
2 parents c5f6c26 + a6ad0af
commit e310b1f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/puppet/parser/functions/concat.rb b/lib/puppet/parser/functions/concat.rb
@@ -28,11 +28,7 @@ module Puppet::Parser::Functions
       raise(Puppet::ParseError, 'concat(): Requires array to work with')
     end
 
-    if b.is_a?(Array)
-      result = a.concat(b)
-    else
-      result = a << b
-    end
+    result = a + Array(b)
 
     return result
   end

diff --git a/spec/functions/concat_spec.rb b/spec/functions/concat_spec.rb
@@ -27,4 +27,9 @@
     expect(result).to(eq(['1','2','3',['4','5'],'6']))
   end
 
+  it "should leave the original array intact" do
+    array_original = ['1','2','3']
+    result = scope.function_concat([array_original,['4','5','6']])
+    array_original.should(eq(['1','2','3']))
+  end
 end