Updated the copy of jQuery and added some more context tests.

[jquery.git] / test / unit / selector.js

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 2ab7e6a..2539e4d 100644 (file)
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -1,7 +1,7 @@
 module("selector");
 
 test("element", function() {
-       expect(13);
+       expect(18);
        reset();
 
        ok( jQuery("*").size() >= 30, "Select all" );
@@ -15,6 +15,11 @@ 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' );
@@ -24,6 +29,7 @@ test("element", function() {
        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"] );
 });
 
@@ -102,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"] );
@@ -133,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"] )