fixed bug in Mojo::DOM::CSS where selected results would also include…

… the current root element
mojolicious · Nov 24, 2014 · ab59ccd · ab59ccd
1 parent 1ec8587
commit ab59ccd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Changes b/Changes
@@ -1,6 +1,8 @@
 
 5.65  2014-11-24
   - Improved installable scripts to use #!perl. (jberger)
+  - Fixed bug in Mojo::DOM::CSS where selected results would also include the
+    current root element.
 
 5.64  2014-11-22
   - Fixed bug in Mojolicious::Commands where the global Getopt::Long

diff --git a/lib/Mojo/DOM/CSS.pm b/lib/Mojo/DOM/CSS.pm
@@ -235,7 +235,7 @@ sub _select {
     # Tag
     if ($type eq 'tag') {
       unshift @queue, @$current[4 .. $#$current];
-      next unless _match($pattern, $current, $tree);
+      next if $current eq $tree || !_match($pattern, $current, $tree);
       $one ? return $current : push @results, $current;
     }
 

diff --git a/t/mojo/dom.t b/t/mojo/dom.t
@@ -461,6 +461,10 @@ $dom->replace('A<div>B<p>C<b>D<i><u>E</u></i>F</b>G</p><div>H</div></div>I');
 is $dom->find(':not(div):not(i):not(u)')->map('strip')->first->root,
   'A<div>BCD<i><u>E</u></i>FG<div>H</div></div>I', 'right result';
 is $dom->at('i')->to_string, '<i><u>E</u></i>', 'right result';
+$dom = Mojo::DOM->new('<div><div>A</div><div>B</div>C</div>');
+is $dom->at('div')->at('div')->text, 'A', 'right text';
+$dom->at('div')->find('div')->map('strip');
+is "$dom", '<div>ABC</div>', 'right result';
 
 # Replace element content
 $dom = Mojo::DOM->new->parse('<div>foo<p>lalala</p>bar</div>');