dom/element: fix #at_css and #at_xpath

opal/browser/dom/element.rb

@@ -131,9 +131,15 @@ def at(path_or_selector)
   #
   # @return [Node?]
   def at_css(*rules)
-    rules.find_value {|rule|
-      css(rule).first
+    result = nil
+
+    rules.each {|rule|
+      if result = css(rule).first
+        break
+      end
     }
+
+    result
   end
 
   # Get the first node matching the given XPath.
@@ -142,9 +148,15 @@ def at_css(*rules)
   #
   # @return [Node?]
   def at_xpath(*paths)
-    paths.find_value {|path|
-      xpath(path).first
+    result = nil
+
+    paths.each {|path|
+      if result = xpath(path).first
+        break
+      end
     }
+
+    result
   end
 
   alias attr []

spec/dom/element_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Browser::DOM::Element do
+  DOM = Browser::DOM
+
   describe '#id' do
     html <<-HTML
       <div id="lol"><div class="wut"></div></div>
@@ -156,4 +158,24 @@
       expect($document[:lol][:for]).to eq(:baz)
     end
   end
+
+  describe '#at_css' do
+    html <<-HTML
+      <label id="lol" class="name" for="hue"></label>
+    HTML
+
+    it 'checks for all the selectors' do
+      expect($document.at_css('div', 'span', '#lol')).to be_a(DOM::Element)
+    end
+  end
+
+  describe '#at_xpath' do
+    html <<-HTML
+      <label id="lol" class="name" for="hue"></label>
+    HTML
+
+    it 'checks for all the paths' do
+      expect($document.at_xpath('//div', '//span', '//[@id="lol"]')).to be_a(DOM::Element)
+    end
+  end
 end