X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=a1ebb1ba428d111a38e93a5e7576c98f7d4c00ea;hb=8b74ba07aabc11c1e987e3c7dfe8314c23bb5452;hp=f03930413d42d2426d53634bb55b10537f41e198;hpb=95c0265486fc551a08ec20d6060a3a382aa8a76b;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index f039304..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(15);
+	expect(17);
 
 	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options =     { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -874,7 +874,15 @@ test("$.extend(Object, Object)", function() {
 	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 } );
-	equals( ret.foo, null, "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
+	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" },