xxx
").appendTo(tmp)).add(jQuery("xxx
").appendTo(tmp)); + equals( x[0].id, "x1", "Check on-the-fly element1" ); + equals( x[1].id, "x2", "Check on-the-fly element2" ); + + var x = jQuery([]).add(jQuery("xxx
").appendTo(tmp)[0]).add(jQuery("xxx
").appendTo(tmp)[0]); + equals( x[0].id, "x1", "Check on-the-fly element1" ); + equals( x[1].id, "x2", "Check on-the-fly element2" ); + var x = jQuery([]).add(jQuery("xxx
")).add(jQuery("xxx
")); equals( x[0].id, "x1", "Check on-the-fly element1" ); equals( x[1].id, "x2", "Check on-the-fly element2" ); @@ -419,6 +529,18 @@ test("add(String|Element|Array|undefined)", function() { ok( jQuery([]).add( document.getElementById('form') ).length >= 13, "Add a form (adds the elements)" ); }); +test("add(String, Context)", function() { + expect(6); + + equals( jQuery(document).add("#form").length, 2, "Make sure that using regular context document still works." ); + equals( jQuery(document.body).add("#form").length, 2, "Using a body context." ); + equals( jQuery(document.body).add("#html").length, 1, "Using a body context." ); + + equals( jQuery(document).add("#form", document).length, 2, "Use a passed in document context." ); + equals( jQuery(document).add("#form", document.body).length, 2, "Use a passed in body context." ); + equals( jQuery(document).add("#html", document.body).length, 1, "Use a passed in body context." ); +}); + test("each(Function)", function() { expect(1); var div = jQuery("div"); @@ -430,45 +552,83 @@ test("each(Function)", function() { ok( pass, "Execute a function, Relative" ); }); -test("index()", function() { - expect(1); +test("slice()", function() { + expect(7); - equals( jQuery("#text2").index(), 2, "Returns the index of a child amongst its siblings" ) + var $links = jQuery("#ap a"); + + same( $links.slice(1,2).get(), q("groups"), "slice(1,2)" ); + same( $links.slice(1).get(), q("groups", "anchor1", "mark"), "slice(1)" ); + same( $links.slice(0,3).get(), q("google", "groups", "anchor1"), "slice(0,3)" ); + same( $links.slice(-1).get(), q("mark"), "slice(-1)" ); + + same( $links.eq(1).get(), q("groups"), "eq(1)" ); + same( $links.eq('2').get(), q("anchor1"), "eq('2')" ); + same( $links.eq(-1).get(), q("mark"), "eq(-1)" ); }); -test("index(Object|String|undefined)", function() { - expect(16); +test("first()/last()", function() { + expect(4); + + var $links = jQuery("#ap a"), $none = jQuery("asdf"); + + same( $links.first().get(), q("google"), "first()" ); + same( $links.last().get(), q("mark"), "last()" ); - var elements = jQuery([window, document]), - inputElements = jQuery('#radio1,#radio2,#check1,#check2'); - - // Passing a node - equals( elements.index(window), 0, "Check for index of elements" ); - equals( elements.index(document), 1, "Check for index of elements" ); - equals( inputElements.index(document.getElementById('radio1')), 0, "Check for index of elements" ); - equals( inputElements.index(document.getElementById('radio2')), 1, "Check for index of elements" ); - equals( inputElements.index(document.getElementById('check1')), 2, "Check for index of elements" ); - equals( inputElements.index(document.getElementById('check2')), 3, "Check for index of elements" ); - equals( inputElements.index(window), -1, "Check for not found index" ); - equals( inputElements.index(document), -1, "Check for not found index" ); - - // Passing a jQuery object - // enabled since [5500] - equals( elements.index( elements ), 0, "Pass in a jQuery object" ); - equals( elements.index( elements.eq(1) ), 1, "Pass in a jQuery object" ); - equals( jQuery("#form :radio").index( jQuery("#radio2") ), 1, "Pass in a jQuery object" ); - - // Passing a selector or nothing - // enabled since [6330] - equals( jQuery('#text2').index(), 2, "Check for index amongst siblings" ); - equals( jQuery('#form').children().eq(4).index(), 4, "Check for index amongst siblings" ); - equals( jQuery('#radio2').index('#form :radio') , 1, "Check for index within a selector" ); - equals( jQuery('#form :radio').index( jQuery('#radio2') ), 1, "Check for index within a selector" ); - equals( jQuery('#radio2').index('#form :text') , -1, "Check for index not found within a selector" ); + same( $none.first().get(), [], "first() none" ); + same( $none.last().get(), [], "last() none" ); +}); + +test("map()", function() { + expect(2);//expect(6); + + same( + jQuery("#ap").map(function(){ + return jQuery(this).find("a").get(); + }).get(), + q("google", "groups", "anchor1", "mark"), + "Array Map" + ); + + same( + jQuery("#ap > a").map(function(){ + return this.parentNode; + }).get(), + q("ap","ap","ap"), + "Single Map" + ); + + return;//these haven't been accepted yet + + //for #2616 + var keys = jQuery.map( {a:1,b:2}, function( v, k ){ + return k; + }, [ ] ); + + equals( keys.join(""), "ab", "Map the keys from a hash to an array" ); + + var values = jQuery.map( {a:1,b:2}, function( v, k ){ + return v; + }, [ ] ); + + equals( values.join(""), "12", "Map the values from a hash to an array" ); + + var scripts = document.getElementsByTagName("script"); + var mapped = jQuery.map( scripts, function( v, k ){ + return v; + }, {length:0} ); + + equals( mapped.length, scripts.length, "Map an array(-like) to a hash" ); + + var flat = jQuery.map( Array(4), function( v, k ){ + return k % 2 ? k : [k,k,k];//try mixing array and regular returns + }); + + equals( flat.join(""), "00012223", "try the new flatten technique(#2616)" ); }); test("jQuery.merge()", function() { - expect(6); + expect(8); var parse = jQuery.merge; @@ -482,10 +642,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(27); var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }, @@ -495,36 +659,51 @@ test("jQuery.extend(Object, Object)", function() { deep1copy = { foo: { bar: true } }, deep2 = { foo: { baz: true }, foo2: document }, deep2copy = { foo: { baz: true }, foo2: document }, - deepmerged = { foo: { bar: true, baz: true }, foo2: document }; + deepmerged = { foo: { bar: true, baz: true }, foo2: document }, + arr = [1, 2, 3], + nestedarray = { arr: arr }; jQuery.extend(settings, options); - isObj( settings, merged, "Check if extended: settings must be extended" ); - isObj( options, optionsCopy, "Check if not modified: options must not be modified" ); + same( settings, merged, "Check if extended: settings must be extended" ); + same( options, optionsCopy, "Check if not modified: options must not be modified" ); jQuery.extend(settings, null, options); - isObj( settings, merged, "Check if extended: settings must be extended" ); - isObj( options, optionsCopy, "Check if not modified: options must not be modified" ); + same( settings, merged, "Check if extended: settings must be extended" ); + same( options, optionsCopy, "Check if not modified: options must not be modified" ); jQuery.extend(true, deep1, deep2); - isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" ); - isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" ); + same( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" ); + 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 = {}; var optionsWithLength = { foo: { length: -1 } }; jQuery.extend(true, empty, optionsWithLength); - isObj( empty.foo, optionsWithLength.foo, "The length property must copy correctly" ); + same( empty.foo, optionsWithLength.foo, "The length property must copy correctly" ); empty = {}; var optionsWithDate = { foo: { date: new Date } }; jQuery.extend(true, empty, optionsWithDate); - isObj( empty.foo, optionsWithDate.foo, "Dates copy correctly" ); + 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); - isObj( 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 }); @@ -539,7 +718,7 @@ test("jQuery.extend(Object, Object)", function() { var target = {}; var recursive = { foo:target, bar:5 }; jQuery.extend(true, target, recursive); - isObj( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" ); + same( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" ); var ret = jQuery.extend(true, { foo: [] }, { foo: [0] } ); // 1907 equals( ret.foo.length, 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" ); @@ -567,10 +746,10 @@ test("jQuery.extend(Object, Object)", function() { merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" }; var settings = jQuery.extend({}, defaults, options1, options2); - isObj( settings, merged2, "Check if extended: settings must be extended" ); - isObj( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" ); - isObj( options1, options1Copy, "Check if not modified: options1 must not be modified" ); - isObj( options2, options2Copy, "Check if not modified: options2 must not be modified" ); + same( settings, merged2, "Check if extended: settings must be extended" ); + same( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" ); + same( options1, options1Copy, "Check if not modified: options1 must not be modified" ); + same( options2, options2Copy, "Check if not modified: options2 must not be modified" ); }); test("jQuery.each(Object,Function)", function() { @@ -609,7 +788,7 @@ test("jQuery.each(Object,Function)", function() { }); test("jQuery.makeArray", function(){ - expect(15); + expect(17); equals( jQuery.makeArray(jQuery('html>*'))[0].nodeName.toUpperCase(), "HEAD", "Pass makeArray a jQuery object" ); @@ -642,6 +821,10 @@ test("jQuery.makeArray", function(){ equals( jQuery.makeArray(/a/)[0].constructor, RegExp, "Pass makeArray a regex" ); ok( jQuery.makeArray(document.getElementById('form')).length >= 13, "Pass makeArray a form (treat as elements)" ); + + // For #5610 + same( jQuery.makeArray({'length': '0'}), [], "Make sure object is coerced properly."); + same( jQuery.makeArray({'length': '5'}), [], "Make sure object is coerced properly."); }); test("jQuery.isEmptyObject", function(){ @@ -653,3 +836,22 @@ test("jQuery.isEmptyObject", function(){ // What about this ? // equals(true, jQuery.isEmptyObject(null), "isEmptyObject on null" ); }); + +test("jQuery.proxy", function(){ + expect(4); + + var test = function(){ equals( this, thisObject, "Make sure that scope is set properly." ); }; + var thisObject = { foo: "bar", method: test }; + + // Make sure normal works + test.call( thisObject ); + + // Basic scoping + jQuery.proxy( test, thisObject )(); + + // Make sure it doesn't freak out + equals( jQuery.proxy( null, thisObject ), undefined, "Make sure no function was returned." ); + + // Use the string shortcut + jQuery.proxy( thisObject, "method" )(); +});