Merge branch 'fixAdjacentTests' of https://github.com/jitter/jquery into jitter-fixAd...
authorJohn Resig <jeresig@gmail.com>
Tue, 9 Nov 2010 20:49:07 +0000 (15:49 -0500)
committerJohn Resig <jeresig@gmail.com>
Tue, 9 Nov 2010 20:49:07 +0000 (15:49 -0500)
1  2 
test/unit/selector.js

diff --combined test/unit/selector.js
@@@ -210,15 -210,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"] );
  });
  
  test("attributes", function() {
 -      expect(35);
 +      expect(39);
        t( "Attribute Exists", "a[title]", ["google"] );
        t( "Attribute Exists", "*[title]", ["google"] );
        t( "Attribute Exists", "[title]", ["google"] );
        t( "Attribute Contains", "a[href *= 'google']", ["google","groups"] );
        t( "Attribute Is Not Equal", "#ap a[hreflang!='en']", ["google","groups","anchor1"] );
  
 -      var opt = document.getElementById("option1a");
 -      ok( (window.Sizzle || window.jQuery.find).matchesSelector( opt, "[id*=option1][type!=checkbox]" ), "Attribute Is Not Equal Matches" );
 +      var opt = document.getElementById("option1a"),
 +              match = (window.Sizzle || window.jQuery.find).matchesSelector;
 +
 +      opt.setAttribute("test", "");
 +
 +      ok( match( opt, "[id*=option1][type!=checkbox]" ), "Attribute Is Not Equal Matches" );
 +      ok( match( opt, "[id*=option1]" ), "Attribute With No Quotes Contains Matches" );
 +      ok( match( opt, "[test=]" ), "Attribute With No Quotes No Content Matches" );
 +      ok( match( opt, "[id=option1a]" ), "Attribute With No Quotes Equals Matches" );
 +      ok( match( document.getElementById("simon1"), "a[href*=#]" ), "Attribute With No Quotes Href Contains Matches" );
  
        t("Empty values", "#select1 option[value='']", ["option1a"]);
        t("Empty values", "#select1 option[value!='']", ["option1b","option1c","option1d"]);