X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=f5f38532d8c1c56c26e30dfe526052b298abbbf1;hb=b8d0c0711f8a9ecd455d4c3cf13394e55c4bf151;hp=6bac6309c671cb5afe989daa614bc2913f645156;hpb=c4c820efff4fa7bcce0d5bf0a448625278ea6379;p=jquery.git diff --git a/test/unit/core.js b/test/unit/core.js index 6bac630..f5f3853 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -189,6 +189,62 @@ test("noConflict", function() { jQuery = $$; }); +test("trim", function() { + expect(4); + + var nbsp = String.fromCharCode(160); + + equals( jQuery.trim("hello "), "hello", "trailing space" ); + equals( jQuery.trim(" hello"), "hello", "leading space" ); + equals( jQuery.trim(" hello "), "hello", "space on both sides" ); + equals( jQuery.trim(" " + nbsp + "hello " + nbsp + " "), "hello", " " ); +}); + +test("isObjectLiteral", function() { + expect(7); + + stop(); + + // The use case that we want to match + ok(jQuery.isObjectLiteral({}), "{}"); + + // Instantiated objects shouldn't be matched + ok(!jQuery.isObjectLiteral(new Date), "new Date"); + + var fn = function(){}; + + // Functions shouldn't be matched + ok(!jQuery.isObjectLiteral(fn), "fn"); + + // Again, instantiated objects shouldn't be matched + ok(!jQuery.isObjectLiteral(new fn), "new fn (no methods)"); + + // Makes the function a little more realistic + // (and harder to detect, incidentally) + fn.prototype = {someMethod: function(){}}; + + // Again, instantiated objects shouldn't be matched + ok(!jQuery.isObjectLiteral(new fn), "new fn"); + + // DOM Element + ok(!jQuery.isObjectLiteral(document.createElement("div")), "DOM Element"); + + var iframe = document.createElement("iframe"); + document.body.appendChild(iframe); + + window.iframeDone = function(otherObject){ + // Objects from other windows should be matched + ok(jQuery.isObjectLiteral(new otherObject), "new otherObject"); + document.body.removeChild( iframe ); + start(); + }; + + var doc = iframe.contentDocument || iframe.contentWindow.document; + doc.open(); + doc.write(""); + doc.close(); +}); + test("isFunction", function() { expect(19); @@ -500,7 +556,7 @@ test("index(Object|String|undefined)", function() { }); test("jQuery.merge()", function() { - expect(6); + expect(8); var parse = jQuery.merge; @@ -514,10 +570,14 @@ test("jQuery.merge()", function() { // Fixed at [5998], #3641 same( parse([-2,-1], [0,1,2]), [-2,-1,0,1,2], "Second array including a zero (falsy)"); + + // After fixing #5527 + same( parse([], [null, undefined]), [null, undefined], "Second array including null and undefined values"); + same( parse({length:0}, [1,2]), {length:2, 0:1, 1:2}, "First array like"); }); test("jQuery.extend(Object, Object)", function() { - expect(23); + expect(25); var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }, @@ -553,12 +613,20 @@ test("jQuery.extend(Object, Object)", function() { same( empty.foo, optionsWithDate.foo, "Dates copy correctly" ); var myKlass = function() {}; + var customObject = new myKlass(); + var optionsWithCustomObject = { foo: { date: customObject } }; + empty = {}; + jQuery.extend(true, empty, optionsWithCustomObject); + ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly (no methods)" ); + // Makes the class a little more realistic myKlass.prototype = { someMethod: function(){} }; empty = {}; - var optionsWithCustomObject = { foo: { date: new myKlass } }; jQuery.extend(true, empty, optionsWithCustomObject); - same( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly" ); + ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly" ); + + var ret = jQuery.extend(true, { foo: 4 }, { foo: new Number(5) } ); + ok( ret.foo == 5, "Wrapped numbers copy correctly" ); var nullUndef; nullUndef = jQuery.extend({}, options, { xnumber2: null });