watir-webdriver 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9407ab3824340922a6ed7724f6f86dde94837cfa
-  data.tar.gz: ac0da8d422e29382fa8349a0942b345925d279d0
+  metadata.gz: 4db8bb80c796c2acc7a8e949ae60333ebd5048f6
+  data.tar.gz: 75fae8d53c1f376e2d4791d8d611c45362a88da1
 SHA512:
-  metadata.gz: 691b6c764ab1d227294fd4fcd3d6eb00afbf1d1c878b1cc444359fb27169646a846998c2964716b1e5d6ed047f43a5e6dbab224746a1a410723ff4e1196c080c
-  data.tar.gz: 27656d8ffe2229a8a92735406772909b2d7b24ea18df726c0bf0bc5449d1d246bb3aa782fbd6b2b3350b6d9b22a6ff0680c6b023bc8d58ad25b5835eff175814
+  metadata.gz: e7e6f4875c630da9586dde5d5e96e4263734ec289e5139112e8f959b4a1a0b09efaf2d785088448e2f9557a416cd72fdb348a6dd7decde716b7775fa781581fd
+  data.tar.gz: 62877fce513d157a993b0b542a6e9c90a45cfac0edffca843c04090aa8dd83f1cfd1b47ecc53c99da8e50a8062c67bd540df692b897761dd984ce32d42556630

data/CHANGES.md

@@ -1,3 +1,8 @@
+0.6.4
+=====
+
+* Add ability to find element by parent <label>
+
 0.6.3
 =====
 

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

@@ -126,10 +126,16 @@ module Watir
     end
 
     def wd_find_by_regexp_selector(selector, method = :find)
+      parent = @wd
       rx_selector = delete_regexps_from(selector)
 
       if rx_selector.has_key?(:label) && should_use_label_element?
-        selector[:id] = id_from_label(rx_selector.delete(:label)) || return
+        label = label_from_text(rx_selector.delete(:label)) || return
+        if (id = label.attribute(:for))
+          selector[:id] = id
+        else
+          parent = label
+        end
       end
 
       how, what = build_wd_selector(selector)
@@ -138,7 +144,7 @@ module Watir
         raise Error, "internal error: unable to build WebDriver selector from #{selector.inspect}"
       end
 
-      elements = @wd.find_elements(how, what)
+      elements = parent.find_elements(how, what)
       elements.__send__(method) { |el| matches_selector?(el, rx_selector) }
     end
 
@@ -157,13 +163,11 @@ module Watir
       end
     end
 
-    def id_from_label(label_exp)
+    def label_from_text(label_exp)
       # TODO: this won't work correctly if @wd is a sub-element
-      label = @wd.find_elements(:tag_name, 'label').find do |el|
+      @wd.find_elements(:tag_name, 'label').find do |el|
         matches_selector?(el, :text => label_exp)
       end
-
-      label.attribute(:for) if label
     end
 
     def fetch_value(element, how)
@@ -360,7 +364,8 @@ module Watir
         "contains(concat(' ', @class, ' '), #{klass})"
       elsif key == :label && should_use_label_element?
         # we assume :label means a corresponding label element, not the attribute
-        "@id=//label[normalize-space()=#{XpathSupport.escape value}]/@for"
+        text = "normalize-space()=#{XpathSupport.escape value}"
+        "(@id=//label[#{text}]/@for or parent::label[#{text}])"
       else
         "#{lhs_for(key)}=#{XpathSupport.escape value}"
       end

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/spec/element_locator_spec.rb

@@ -133,9 +133,9 @@ describe Watir::ElementLocator do
         locate_one selector, Watir::Input.attributes
       end
 
-      it "uses the corresponding <label>'s @for attribute when locating by label" do
+      it "uses the corresponding <label>'s @for attribute or parent::label when locating by label" do
         translated_type = "translate(@type,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"
-        expect_one :xpath, ".//input[#{translated_type}='text' and @id=//label[normalize-space()='foo']/@for]"
+        expect_one :xpath, ".//input[#{translated_type}='text' and (@id=//label[normalize-space()='foo']/@for or parent::label[normalize-space()='foo'])]"
 
         selector = [
           :tag_name, "input",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver