Ensured that arrays are not considered same as plain object on deep extending. Fixes...

[jquery.git] / test / unit / core.js

diff --git a/test/unit/core.js b/test/unit/core.js
index 3ba16a4..81bca10 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -183,7 +183,7 @@ test("browser", function() {
 }
 
 test("noConflict", function() {
-       expect(6);
+       expect(7);
 
        var $$ = jQuery;
 
@@ -196,6 +196,7 @@ test("noConflict", function() {
        equals( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" );
        equals( jQuery, originaljQuery, "Make sure jQuery was reverted." );
        equals( $, original$, "Make sure $ was reverted." );
+       ok( $$("#main").html("test"), "Make sure that jQuery still works." );
 
        jQuery = $$;
 });
@@ -431,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);
 
@@ -641,7 +661,7 @@ test("jQuery.merge()", function() {
 });
 
 test("jQuery.extend(Object, Object)", function() {
-       expect(27);
+       expect(26);
 
        var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
                options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -668,7 +688,6 @@ 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" );
 
        var empty = {};