watir-webdriver 0.5.7 → 0.5.8

data/lib/watir-webdriver/locators/element_locator.rb

@@ -35,7 +35,7 @@ module Watir
       # this actually only applies when finding by xpath - browser.text_field(:xpath, "//input[@type='radio']")
       # we don't need to validate the element if we built the xpath ourselves.
       validate_element(element) if element
-    rescue Selenium::WebDriver::Error::NoSuchElementError => wde
+    rescue Selenium::WebDriver::Error::NoSuchElementError
       nil
     end
 
@@ -175,7 +175,7 @@ module Watir
       when :href
         (href = element.attribute(:href)) && href.strip
       else
-        element.attribute(how)
+        element.attribute(how.to_s.gsub("_", "-").to_sym)
       end
     end
 
@@ -248,7 +248,7 @@ module Watir
       return if tag_name && !tag_name_matches?(element.tag_name.downcase, tag_name)
 
       element
-    rescue Selenium::WebDriver::Error::NoSuchElementError => wde
+    rescue Selenium::WebDriver::Error::NoSuchElementError
       nil
     end
 

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

data/spec/element_locator_spec.rb

@@ -217,6 +217,27 @@ describe Watir::ElementLocator do
         locate_one(selector).should == elements[1]
       end
 
+      it "handles data-* attributes with regexp" do
+        elements = [
+          element(:tag_name => "div", :attributes => { :'data-automation-id' => "foo" }),
+          element(:tag_name => "div", :attributes => { :'data-automation-id' => "bar" })
+        ]
+
+        if Watir.prefer_css?
+          expect_all(:css, 'div').and_return(elements)
+        else
+          expect_all(:xpath, ".//div").and_return(elements)
+        end
+
+
+        selector = {
+          :tag_name => "div",
+          :data_automation_id => /bar/
+        }
+
+        locate_one(selector).should == elements[1]
+      end
+
       it "handles :label => /regexp/ selector" do
         label_elements = [
           element(:tag_name => "label", :text => "foo", :attributes => { :for => "bar"}),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver