X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Fcore.js;h=d83f667dc194a38591e44dc52e5e7f99fcdcdd7d;hb=da5706c974f8ef720b3194179366e1096c19269e;hp=81bca1072d8b64258bdfe26c82211848c79b32b2;hpb=694b625c92c764621532dba20cbf943302b52d5a;p=jquery.git diff --git a/test/unit/core.js b/test/unit/core.js index 81bca10..d83f667 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -661,7 +661,7 @@ test("jQuery.merge()", function() { }); test("jQuery.extend(Object, Object)", function() { - expect(26); + expect(28); var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }, @@ -689,6 +689,10 @@ test("jQuery.extend(Object, Object)", function() { equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" ); 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 } };