X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=d83f667dc194a38591e44dc52e5e7f99fcdcdd7d;hb=dc4c9abc39ce7eda44ff8878d476db1e57b7bc46;hp=811d13fb4aa33a521faa51b73cda209d5a6d934d;hpb=bca576550249e9b79b1097669dff6d4ddd0d65cf;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 811d13f..d83f667 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -432,6 +432,25 @@ test("isXMLDoc - XML", function() {
 });
 }
 
+test("isWindow", function() {
+	expect( 12 );
+
+	ok( jQuery.isWindow(window), "window" );
+	ok( !jQuery.isWindow(), "empty" );
+	ok( !jQuery.isWindow(null), "null" );
+	ok( !jQuery.isWindow(undefined), "undefined" );
+	ok( !jQuery.isWindow(document), "document" );
+	ok( !jQuery.isWindow(document.documentElement), "documentElement" );
+	ok( !jQuery.isWindow(""), "string" );
+	ok( !jQuery.isWindow(1), "number" );
+	ok( !jQuery.isWindow(true), "boolean" );
+	ok( !jQuery.isWindow({}), "object" );
+	// HMMM
+	// ok( !jQuery.isWindow({ setInterval: function(){} }), "fake window" );
+	ok( !jQuery.isWindow(/window/), "regexp" );
+	ok( !jQuery.isWindow(function(){}), "function" );
+});
+
 test("jQuery('html')", function() {
 	expect(15);
 
@@ -642,7 +661,7 @@ test("jQuery.merge()", function() {
 });
 
 test("jQuery.extend(Object, Object)", function() {
-	expect(27);
+	expect(28);
 
 	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -669,8 +688,11 @@ test("jQuery.extend(Object, Object)", function() {
 	same( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
 	equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
 
-	ok( jQuery.extend(true, [], arr) !== arr, "Deep extend of array must clone array" );
 	ok( jQuery.extend(true, {}, nestedarray).arr !== arr, "Deep extend of object must clone child array" );
+	
+	// #5991
+	ok( jQuery.isArray( jQuery.extend(true, { arr: {} }, nestedarray).arr ), "Cloned array heve to be an Array" );
+	ok( jQuery.isPlainObject( jQuery.extend(true, { arr: arr }, { arr: {} }).arr ), "Cloned object heve to be an plain object" );
 
 	var empty = {};
 	var optionsWithLength = { foo: { length: -1 } };