X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fselector.js;h=2539e4d3b87522b02c9506489e9fcd0503bd1357;hb=f9a7cfacf7d609620fd5ce8a939268e93ef423a1;hp=924f41d0e5186b8bd84bfd6f7ec65aa980a39f5f;hpb=b16da9d762c5fc87c5a9afacd517af0036972a47;p=jquery.git

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 924f41d..2539e4d 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -1,7 +1,7 @@
 module("selector");
 
 test("element", function() {
-	expect(9);
+	expect(18);
 	reset();
 
 	ok( jQuery("*").size() >= 30, "Select all" );
@@ -15,9 +15,22 @@ test("element", function() {
 	t( "Element Selector", "html", ["html"] );
 	t( "Parent Element", "div p", ["firstp","ap","sndp","en","sap","first"] );
 	equals( jQuery("param", "#object1").length, 2, "Object/param as context" );
+
+	isSet( jQuery("p", document.getElementsByTagName("div")), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." );
+	isSet( jQuery("p", "div"), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." );
+	isSet( jQuery("p", jQuery("div")), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." );
+	isSet( jQuery("div").find("p"), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." );
 	
 	ok( jQuery("#length").length, '<input name="length"> cannot be found under IE, see #945' );
 	ok( jQuery("#lengthtest input").length, '<input name="length"> cannot be found under IE, see #945' );
+
+	// Check for unique-ness and sort order
+	isSet( jQuery("*"), jQuery("*, *"), "Check for duplicates: *, *" );
+	isSet( jQuery("p"), jQuery("p, div p"), "Check for duplicates: p, div p" );
+
+	t( "Checking sort order", "h2, h1", ["header", "banner", "userAgent"] );
+	t( "Checking sort order", "h2:first, h1:first", ["header", "banner"] );
+	t( "Checking sort order", "p, p a", ["firstp", "simon1", "ap", "google", "groups", "anchor1", "mark", "sndp", "en", "yahoo", "sap", "anchor2", "simon", "first"] );
 });
 
 if ( location.protocol != "file:" ) {
@@ -95,12 +108,17 @@ test("id", function() {
 });
 
 test("class", function() {
-	expect(18);
+	expect(22);
 	t( "Class Selector", ".blog", ["mark","simon"] );
 	t( "Class Selector", ".GROUPS", ["groups"] );
 	t( "Class Selector", ".blog.link", ["simon"] );
 	t( "Class Selector w/ Element", "a.blog", ["mark","simon"] );
 	t( "Parent Class Selector", "p .blog", ["mark","simon"] );
+
+	isSet( jQuery(".blog", document.getElementsByTagName("p")), q("mark", "simon"), "Finding elements with a context." );
+	isSet( jQuery(".blog", "p"), q("mark", "simon"), "Finding elements with a context." );
+	isSet( jQuery(".blog", jQuery("p")), q("mark", "simon"), "Finding elements with a context." );
+	isSet( jQuery("p").find(".blog"), q("mark", "simon"), "Finding elements with a context." );
 	
 	t( "Class selector using UTF8", ".台北Táiběi", ["utf8class1"] );
 	//t( "Class selector using UTF8", ".台北", ["utf8class1","utf8class2"] );
@@ -126,12 +144,14 @@ test("class", function() {
 });
 
 test("name", function() {
-	expect(7);
+	expect(9);
 
 	t( "Name selector", "input[name=action]", ["text1"] );
 	t( "Name selector with single quotes", "input[name='action']", ["text1"] );
 	t( "Name selector with double quotes", 'input[name="action"]', ["text1"] );
 
+	t( "Name selector non-input", "[name=test]", ["length", "fx-queue"] );
+	t( "Name selector non-input", "[name=div]", ["fadein"] );
 	t( "Name selector non-input", "*[name=iframe]", ["iframe"] );
 
 	t( "Name selector for grouped input", "input[name='types[]']", ["types_all", "types_anime", "types_movie"] )
@@ -189,7 +209,7 @@ test("child and adjacent", function() {
 	reset();
 	
 	t( "Last Child", "p:last-child", ["sap"] );
-	t( "Last Child", "a:last-child", ["simon1","anchor1","mark","yahoo","anchor2","simon"] );
+	t( "Last Child", "a:last-child", ["simon1","anchor1","mark","yahoo","anchor2","simon","liveLink1","liveLink2"] );
 	
 	t( "Nth-child", "#main form#form > *:nth-child(2)", ["text1"] );
 	t( "Nth-child", "#main form#form > :nth-child(2)", ["text1"] );
@@ -215,7 +235,7 @@ test("child and adjacent", function() {
 });
 
 test("attributes", function() {
-	expect(40);
+	expect(37);
 	t( "Attribute Exists", "a[title]", ["google"] );
 	t( "Attribute Exists", "*[title]", ["google"] );
 	t( "Attribute Exists", "[title]", ["google"] );
@@ -237,9 +257,10 @@ test("attributes", function() {
 	jQuery("form input")[0].test = 0;
 	jQuery("form input")[1].test = 1;
 
-	t( "Expando attribute", "form input[test]", ["text1", "text2"] );
-	t( "Expando attribute value", "form input[test=0]", ["text1"] );
-	t( "Expando attribute value", "form input[test=1]", ["text2"] );
+  // Disabled tests - expandos don't work in all browsers
+	//t( "Expando attribute", "form input[test]", ["text1", "text2"] );
+	//t( "Expando attribute value", "form input[test=0]", ["text1"] );
+	//t( "Expando attribute value", "form input[test=1]", ["text2"] );
 	
 	t( "Attribute containing []", "input[name^='foo[']", ["hidden2"] );
 	t( "Attribute containing []", "input[name^='foo[bar]']", ["hidden2"] );
@@ -278,7 +299,7 @@ test("pseudo (:) selectors", function() {
 	expect(53);
 	t( "First Child", "p:first-child", ["firstp","sndp"] );
 	t( "Last Child", "p:last-child", ["sap"] );
-	t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] );
+	t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2","liveLink1","liveLink2"] );
 	t( "Empty", "ul:empty", ["firstUL"] );
 	t( "Enabled UI Element", "#form input:not([type=hidden]):enabled", ["text1","radio1","radio2","check1","check2","hidden2","name"] );
 	t( "Disabled UI Element", "#form input:disabled", ["text2"] );
@@ -290,7 +311,7 @@ test("pseudo (:) selectors", function() {
 	t( "Text Contains", "a:contains('Google Groups (Link)')", ["groups"] );
 	t( "Text Contains", "a:contains('(Link)')", ["groups"] );
 
-	t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests", "moretests","tabindex-tests"] );
+	t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests", "moretests","tabindex-tests", "liveHandlerOrder"] );
 	t( "Not", "a.blog:not(.link)", ["mark"] );
 	t( "Not - multiple", "#form option:not(:contains('Nothing'),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d", "option3e"] );
 	//t( "Not - complex", "#form option:not([id^='opt']:nth-child(-n+3))", [ "option1a", "option1d", "option2d", "option3d", "option3e"] );
@@ -333,7 +354,7 @@ test("pseudo (:) selectors", function() {
 	t( "Form element :text", "#form :text", ["text1", "text2", "hidden2", "name"] );
 	t( "Form element :radio:checked", "#form :radio:checked", ["radio2"] );
 	t( "Form element :checkbox:checked", "#form :checkbox:checked", ["check1"] );
-	t( "Form element :checkbox:checked, :radio:checked", "#form :checkbox:checked, #form :radio:checked", ["check1", "radio2"] );
+	t( "Form element :radio:checked, :checkbox:checked", "#form :radio:checked, #form :checkbox:checked", ["radio2", "check1"] );
 
 	t( "Headers", ":header", ["header", "banner", "userAgent"] );
 	t( "Has Children - :has()", "p:has(a)", ["firstp","ap","en","sap"] );