X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=a1ebb1ba428d111a38e93a5e7576c98f7d4c00ea;hb=aee221d33c2db2c76639dabeca2b1e3d022e348e;hp=f77d1f8970106160bf1f0153ef59ddf59f578626;hpb=ed7608d8eedc0cd9082b5246581c0fc4ccb392db;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index f77d1f8..a1ebb1b 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -837,7 +837,7 @@ test("is(String)", function() {
 });
 
 test("$.extend(Object, Object)", function() {
-	expect(14);
+	expect(17);
 
 	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options =     { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -873,6 +873,17 @@ test("$.extend(Object, Object)", function() {
 	var ret = jQuery.extend(true, { foo: "1,2,3" }, { foo: [1, 2, 3] } );
 	ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
 
+	var ret = jQuery.extend(true, { foo:"bar" }, { foo:null } );
+	ok( typeof ret.foo !== 'undefined', "Make sure a null value doesn't crash with deep extend, for #1908" );
+
+	var obj = { foo:null };
+	jQuery.extend(true, obj, { foo:"notnull" } );
+	equals( obj.foo, "notnull", "Make sure a null value can be overwritten" );
+
+	function func() {}
+	jQuery.extend(func, { key: "value" } );
+	equals( func.key, "value", "Verify a function can be extended" );
+
 	var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options1 =     { xnumber2: 1, xstring2: "x" },