X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fselector.js;h=98fa3ca88a1b78834d1d54c74a6dea17dc6574f6;hb=0865b073f81513056f46296cd2a236ab2ca35703;hp=07c4434d093717c6abc1f1373bd86b5eaab9b69d;hpb=ba48be3ada51aee683ce5992c5f00a8458f385f8;p=jquery.git

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 07c4434..98fa3ca 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -2,8 +2,8 @@ module("selector");
 
 test("element", function() {
 	expect(9);
-	ok( $("*").size() >= 30, "Select all" );
-	var all = $("*"), good = true;
+	ok( jQuery("*").size() >= 30, "Select all" );
+	var all = jQuery("*"), good = true;
 	for ( var i = 0; i < all.length; i++ )
 		if ( all[i].nodeType == 8 )
 			good = false;
@@ -12,18 +12,18 @@ test("element", function() {
 	t( "Element Selector", "body", ["body"] );
 	t( "Element Selector", "html", ["html"] );
 	t( "Parent Element", "div p", ["firstp","ap","sndp","en","sap","first"] );
-	equals( $("param", "#object1").length, 2, "Object/param as context" );
+	equals( jQuery("param", "#object1").length, 2, "Object/param as context" );
 	
-	ok( $("#length").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
-	ok( $("#lengthtest input").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
+	ok( jQuery("#length").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
+	ok( jQuery("#lengthtest input").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
 });
 
 if ( location.protocol != "file:" ) {
 	test("Element Selector with underscore", function() {
 		expect(1);
 		stop();
-		$.get("data/with_fries.xml", function(xml) {
-			equals( $("foo_bar", xml).length, 1, "Element Selector with underscore" );
+		jQuery.get("data/with_fries.xml", function(xml) {
+			equals( jQuery("foo_bar", xml).length, 1, "Element Selector with underscore" );
 			start();
 		});
 	});
@@ -64,16 +64,16 @@ test("id", function() {
 	t( "ID Selector, not a child ID", "#form > #option1a", [] );
 	
 	t( "All Children of ID", "#foo > *", ["sndp", "en", "sap"] );
-	t( "All Children of ID with no children", "#firstUL/*", [] );
+	t( "All Children of ID with no children", "#firstUL > *", [] );
 	
-	$('<a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</div>').appendTo('#main');
-	equals( $("#tName1")[0].id, 'tName1', "ID selector with same value for a name attribute" );
-	equals( $("#tName2").length, 0, "ID selector non-existing but name attribute on an A tag" );
+	jQuery('<a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</div>').appendTo('#main');
+	equals( jQuery("#tName1")[0].id, 'tName1', "ID selector with same value for a name attribute" );
+	equals( jQuery("#tName2").length, 0, "ID selector non-existing but name attribute on an A tag" );
 	t( "ID Selector on Form with an input that has a name of 'id'", "#lengthtest", ["lengthtest"] );
 	
 	t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986
 
-	isSet( $("body").find("div#form"), [], "ID selector within the context of another element" );
+	isSet( jQuery("body").find("div#form"), [], "ID selector within the context of another element" );
 });
 
 test("class", function() {
@@ -195,8 +195,8 @@ test("pseudo (:) selectors", function() {
 	t( "Text Contains", "a:contains('Google Groups')", ["groups"] );
 	t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests", "moretests"] );
 	t( "Not", "a.blog:not(.link)", ["mark"] );
-	t( "Not - multiple", "#form option:not(:contains('Nothing'),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d"] );
-	t( "Not - complex", "#form option:not([id^='opt']:gt(0):nth-child(-n+3))", [ "option1a", "option1d", "option2d", "option3d"] );
+	t( "Not - multiple", "#form option:not(:contains('Nothing'),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d", "option3e"] );
+	t( "Not - complex", "#form option:not([id^='opt']:gt(0):nth-child(-n+3))", [ "option1a", "option1d", "option2d", "option3d", "option3e"] );
 	t( "Not - recursive", "#form option:not(:not(:selected))[id^='option3']", [ "option3b", "option3c"] );
 	
 	t( "nth Element", "p:nth(1)", ["ap"] );