From c27d5ca6f5b69818c48fdc9b0f988790653fb1a5 Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Tue, 28 Dec 2010 21:07:04 -0500 Subject: By default, use document root rather than current selection's context when add()ing elements. Fixes #7853. --- test/unit/traversing.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/unit/traversing.js b/test/unit/traversing.js index 0d079f19a..b1fd8a9bf 100644 --- a/test/unit/traversing.js +++ b/test/unit/traversing.js @@ -440,12 +440,13 @@ test("add(String|Element|Array|undefined)", function() { 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." ); + + equals( jQuery("#firstp").add("#ap").length, 2, "Add selector to selector" ); + equals( jQuery(document.getElementById("firstp")).add("#ap").length, 2, "Add gEBId to selector" ); + equals( jQuery(document.getElementById("firstp")).add(document.getElementById("ap")).length, 2, "Add gEBId to gEBId" ); + + var ctx = document.getElementById("firstp"); + equals( jQuery("#firstp").add("#ap", ctx).length, 1, "Add selector to selector with context" ); + equals( jQuery(document.getElementById("firstp")).add("#ap", ctx).length, 1, "Add gEBId to selector with context" ); + equals( jQuery(document.getElementById("firstp")).add(document.getElementById("ap"), ctx).length, 2, "Add gEBId to gEBId with context" ); }); -- cgit v1.2.3 From 948c0dfffcf077ed71e4712b38a33d06ea63264c Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Wed, 19 Jan 2011 21:02:46 -0500 Subject: Rework unit tests to check actual result elements. --- test/unit/traversing.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/unit/traversing.js b/test/unit/traversing.js index b1fd8a9bf..e4b3e9537 100644 --- a/test/unit/traversing.js +++ b/test/unit/traversing.js @@ -441,12 +441,12 @@ test("add(String|Element|Array|undefined)", function() { test("add(String, Context)", function() { expect(6); - equals( jQuery("#firstp").add("#ap").length, 2, "Add selector to selector" ); - equals( jQuery(document.getElementById("firstp")).add("#ap").length, 2, "Add gEBId to selector" ); - equals( jQuery(document.getElementById("firstp")).add(document.getElementById("ap")).length, 2, "Add gEBId to gEBId" ); + deepEqual( jQuery( "#firstp" ).add( "#ap" ).get(), q( "firstp", "ap" ), "Add selector to selector " ); + deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap" ).get(), q( "firstp", "ap" ), "Add gEBId to selector" ); + deepEqual( jQuery( document.getElementById("firstp") ).add( document.getElementById("ap") ).get(), q( "firstp", "ap" ), "Add gEBId to gEBId" ); var ctx = document.getElementById("firstp"); - equals( jQuery("#firstp").add("#ap", ctx).length, 1, "Add selector to selector with context" ); - equals( jQuery(document.getElementById("firstp")).add("#ap", ctx).length, 1, "Add gEBId to selector with context" ); - equals( jQuery(document.getElementById("firstp")).add(document.getElementById("ap"), ctx).length, 2, "Add gEBId to gEBId with context" ); + deepEqual( jQuery( "#firstp" ).add( "#ap", ctx ).get(), q( "firstp" ), "Add selector to selector " ); + deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap", ctx ).get(), q( "firstp" ), "Add gEBId to selector, not in context" ); + deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap", document.getElementsByTagName("body")[0] ).get(), q( "firstp", "ap" ), "Add gEBId to selector, in context" ); }); -- cgit v1.2.3