diff options
| author | Dave Methvin <dave.methvin@gmail.com> | 2011-04-11 11:25:27 -0400 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2011-04-11 11:25:27 -0400 |
| commit | 1cca0817a0dfaa2726c5c5eb2bdd84a9eb6edf92 (patch) | |
| tree | be4a69141bee69cd012eaae3a6a4452fbceff415 | |
| parent | 530c915553dd21f7f933d6d1ca8102ae714f5aa2 (diff) | |
| parent | 6591f6dd9d1c86144903f60e5d19e624c5bf6751 (diff) | |
| download | jquery-1cca0817a0dfaa2726c5c5eb2bdd84a9eb6edf92.tar.gz jquery-1cca0817a0dfaa2726c5c5eb2bdd84a9eb6edf92.zip | |
Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger
| -rw-r--r-- | test/unit/traversing.js | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/test/unit/traversing.js b/test/unit/traversing.js index 6228a0b98..f622082e7 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')" ); |