X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=679d50425e4506426b49018c2706e9700cb79459;hb=4b25b147ab60a026ba1841b313d713fe57530b04;hp=1ae2dfa5f93421c81da88e57d9ae3819cc15037c;hpb=6b090328643988869e2288a4874935680d8573ca;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 1ae2dfa..679d504 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1138,6 +1138,21 @@ test("is(String)", function() {
 	ok( jQuery('#en').is('[lang="de"] , [lang="en"]'), 'Comma-seperated; Check for lang attribute: Expect en or de' );
 });
 
+test("jQuery.merge()", function() {
+	var parse = jQuery.merge;
+	
+	same( parse([],[]), [], "Empty arrays" );
+	
+	same( parse([1],[2]), [1,2], "Basic" );
+	same( parse([1,2],[3,4]), [1,2,3,4], "Basic" );
+	
+	same( parse([1,2],[]), [1,2], "Second empty" );
+	same( parse([],[1,2]), [1,2], "First empty" );	
+	
+	// Fixed at [5998], #3641
+	same( parse([-2,-1], [0,1,2]), [-2,-1,0,1,2], "Second array including a zero (falsy)");
+});
+
 test("jQuery.extend(Object, Object)", function() {
 	expect(20);