diff options
| author | louisremi <louisremi@louisremi-laptop.(none)> | 2011-04-12 11:18:44 +0200 |
|---|---|---|
| committer | louisremi <louisremi@louisremi-laptop.(none)> | 2011-04-12 11:18:44 +0200 |
| commit | 8547b34f9265ed2d2b5380b1db5dfcaf97d96d5a (patch) | |
| tree | c07eb0032b58c1e5d65329e11194705466f09348 /test | |
| parent | f42010b6574af9e57b3782eced61a7d955bf06d6 (diff) | |
| download | jquery-8547b34f9265ed2d2b5380b1db5dfcaf97d96d5a.tar.gz jquery-8547b34f9265ed2d2b5380b1db5dfcaf97d96d5a.zip | |
resolve conflict
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/traversing.js | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/test/unit/traversing.js b/test/unit/traversing.js index efa39a2c5..1248e5dd8 100644 --- a/test/unit/traversing.js +++ b/test/unit/traversing.js @@ -223,10 +223,6 @@ test("closest(Array)", function() { same( jQuery("body").closest(["span","html"]), [{selector:"html", elem:document.documentElement, level:2}], "closest([body, html])" ); }); -<<<<<<< HEAD -test("not(Selector|undefined)", function() { - expect(11); -======= test("closest(jQuery)", function() { expect(8); var $child = jQuery("#nothiddendivchild"), @@ -243,9 +239,8 @@ test("closest(jQuery)", function() { ok( $child.closest( $body.add($parent) ).is("#nothiddendiv"), "Closest ancestor retrieved." ); }); -test("not(Selector)", function() { - expect(7); ->>>>>>> 1a167767305202797cf4c839eb64bd7adfb00182 +test("not(Selector|undefined)", function() { + expect(11); equals( jQuery("#main > p#ap > a").not("#google").length, 2, "not('selector')" ); same( jQuery("p").not(".result").get(), q("firstp", "ap", "sndp", "en", "sap", "first"), "not('.class')" ); same( jQuery("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" ); @@ -254,7 +249,7 @@ test("not(Selector)", function() { same( jQuery("#ap *").not("code").get(), q("google", "groups", "anchor1", "mark"), "not('tag selector')" ); same( jQuery("#ap *").not("code, #mark").get(), q("google", "groups", "anchor1"), "not('tag, ID selector')" ); same( jQuery("#ap *").not("#mark, code").get(), q("google", "groups", "anchor1"), "not('ID, tag selector')"); - + var all = jQuery("p").get(); same( jQuery("p").not(null).get(), all, "not(null) should have no effect"); same( jQuery("p").not(undefined).get(), all, "not(undefined) should have no effect"); |