X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fselector.js;h=9a65d9824cfa5c4f28f3e1dabd5c254472913d1f;hb=a42f7a2590ea21dbe8eb1e11f927a952bdd30c1e;hp=856257f38b8c67316d36582d8c776de16918f925;hpb=6bc30425f6d3c9c1eaddacc5d08bb29a4a0636ca;p=jquery.git

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 856257f..9a65d98 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -1,7 +1,7 @@
 module("selector");
 
 test("element", function() {
-	expect(18);
+	expect(21);
 	QUnit.reset();
 
 	ok( jQuery("*").size() >= 30, "Select all" );
@@ -32,6 +32,11 @@ test("element", function() {
 	t( "Checking sort order", "h2, h1", ["qunit-header", "qunit-banner", "qunit-userAgent"] );
 	t( "Checking sort order", "h2:first, h1:first", ["qunit-header", "qunit-banner"] );
 	t( "Checking sort order", "p, p a", ["firstp", "simon1", "ap", "google", "groups", "anchor1", "mark", "sndp", "en", "yahoo", "sap", "anchor2", "simon", "first"] );
+
+	// Test Conflict ID
+	same( jQuery("#lengthtest").find("#idTest").get(), q("idTest"), "Finding element with id of ID." );
+	same( jQuery("#lengthtest").find("[name='id']").get(), q("idTest"), "Finding element with id of ID." );
+	same( jQuery("#lengthtest").find("input[id='idTest']").get(), q("idTest"), "Finding elements with a context." );
 });
 
 if ( location.protocol != "file:" ) {
@@ -205,15 +210,15 @@ test("child and adjacent", function() {
 	t( "Child w/ Class", "p > a.blog", ["mark","simon"] );
 	t( "All Children", "code > *", ["anchor1","anchor2"] );
 	t( "All Grandchildren", "p > * > *", ["anchor1","anchor2"] );
-	t( "Adjacent", "a + a", ["groups"] );
-	t( "Adjacent", "a +a", ["groups"] );
-	t( "Adjacent", "a+ a", ["groups"] );
-	t( "Adjacent", "a+a", ["groups"] );
+	t( "Adjacent", "#main a + a", ["groups"] );
+	t( "Adjacent", "#main a +a", ["groups"] );
+	t( "Adjacent", "#main a+ a", ["groups"] );
+	t( "Adjacent", "#main a+a", ["groups"] );
 	t( "Adjacent", "p + p", ["ap","en","sap"] );
 	t( "Adjacent", "p#firstp + p", ["ap"] );
 	t( "Adjacent", "p[lang=en] + p", ["sap"] );
 	t( "Adjacent", "a.GROUPS + code + a", ["mark"] );
-	t( "Comma, Child, and Adjacent", "a + a, code > a", ["groups","anchor1","anchor2"] );
+	t( "Comma, Child, and Adjacent", "#main a + a, code > a", ["groups","anchor1","anchor2"] );
 	t( "Element Preceded By", "p ~ div", ["foo", "moretests","tabindex-tests", "liveHandlerOrder", "siblingTest"] );
 	t( "Element Preceded By", "#first ~ div", ["moretests","tabindex-tests", "liveHandlerOrder", "siblingTest"] );
 	t( "Element Preceded By", "#groups ~ a", ["mark"] );