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" ); - - var x = jQuery([]).add("xxx
").add("xxx
"); - equals( x[0].id, "x1", "Check on-the-fly element1" ); - equals( x[1].id, "x2", "Check on-the-fly element2" ); - - var notDefined; - equals( jQuery([]).add(notDefined).length, 0, "Check that undefined adds nothing" ); - - // Added after #2811 - equals( jQuery([]).add([window,document,document.body,document]).length, 3, "Pass an array" ); - equals( jQuery(document).add(document).length, 1, "Check duplicated elements" ); - equals( jQuery(window).add(window).length, 1, "Check duplicated elements using the window" ); - 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"); @@ -625,7 +605,7 @@ test("jQuery.merge()", function() { }); test("jQuery.extend(Object, Object)", function() { - expect(25); + expect(27); var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }, @@ -635,7 +615,9 @@ 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); same( settings, merged, "Check if extended: settings must be extended" ); @@ -650,6 +632,9 @@ 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 = {}; var optionsWithLength = { foo: { length: -1 } }; jQuery.extend(true, empty, optionsWithLength); @@ -807,3 +792,49 @@ 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" )(); +}); + +test("jQuery.parseJSON", function(){ + expect(8); + + equals( jQuery.parseJSON(), null, "Nothing in, null out." ); + equals( jQuery.parseJSON( null ), null, "Nothing in, null out." ); + equals( jQuery.parseJSON( "" ), null, "Nothing in, null out." ); + + same( jQuery.parseJSON("{}"), {}, "Plain object parsing." ); + same( jQuery.parseJSON('{"test":1}'), {"test":1}, "Plain object parsing." ); + + same( jQuery.parseJSON('\n{"test":1}'), {"test":1}, "Make sure leading whitespaces are handled." ); + + try { + jQuery.parseJSON("{a:1}"); + ok( false, "Test malformed JSON string." ); + } catch( e ) { + ok( true, "Test malformed JSON string." ); + } + + try { + jQuery.parseJSON("{'a':1}"); + ok( false, "Test malformed JSON string." ); + } catch( e ) { + ok( true, "Test malformed JSON string." ); + } +});