X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=4044bd85683dca98d9cfddc005bdf505a94750b3;hb=ac00fe5bbb2a95fdb747f76fd9dd7c58ba6a531c;hp=7a2c4d6fc118d24ad2713587532a51f4bbcbc56e;hpb=b30af34f28074b491929445f5aad3d62c63e772f;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 7a2c4d6..4044bd8 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -500,7 +500,7 @@ test("index(Object|String|undefined)", function() {
 });
 
 test("jQuery.merge()", function() {
-	expect(6);
+	expect(8);
 
 	var parse = jQuery.merge;
 
@@ -514,6 +514,10 @@ test("jQuery.merge()", function() {
 
 	// Fixed at [5998], #3641
 	same( parse([-2,-1], [0,1,2]), [-2,-1,0,1,2], "Second array including a zero (falsy)");
+	
+	// After fixing #5527
+	same( parse([], [null, undefined]), [null, undefined], "Second array including null and undefined values");
+	same( parse({length:0}, [1,2]), {length:2, 0:1, 1:2}, "First array like");
 });
 
 test("jQuery.extend(Object, Object)", function() {
@@ -554,7 +558,7 @@ test("jQuery.extend(Object, Object)", function() {
 
 	var myKlass = function() {};
 	var customObject = new myKlass();
-	var optionsWithCustomObject = { foo: { date: new customObject } };
+	var optionsWithCustomObject = { foo: { date: customObject } };
 	empty = {};
 	jQuery.extend(true, empty, optionsWithCustomObject);
 	ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly (no methods)" );