watir-webdriver 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e372a1f6959d978774865329265a8384bcb5392f
-  data.tar.gz: 62aa15e1de0949782b07234848810e9f1ada78d2
+  metadata.gz: 3c27ed00d9c0f60b3ba74da91a1a0543975f6e40
+  data.tar.gz: 9613de99f0a45fdbf00bb61edbfd64ba494b8ef1
 SHA512:
-  metadata.gz: cf81b7db2c3f76b325aea31d4b200928ed210033c2017c0a777a8df8f5903841b35fb278ea1b0214bf955a1c1a8f28c25245d0801158388605f51c4577443e25
-  data.tar.gz: 90b8cba253f40574f08781ad83ca52220c3091c412d9dac432216377be2f74725c837b1092780259c40ba3a8d62a9de817bcf25fd01e3cdfc66c217a18310d4a
+  metadata.gz: 5cb22dd0fe4715b647e43c91d637ea32fcb35747bcca0e0187995eca1ab9fa6ce1ddf3c355c8ce0dbac264f0530bd7ab5f423e8b8bfda6c74102d53170d00430
+  data.tar.gz: 4b0d5ea3f95dc25cb36eec24fc1ee5db4787250aae66eecd65e41ce18644aeef62ac8dcab32eb13a7d6612a0763ff3cf68e19b648ce2cd1ef2072303fe12695e

data/CHANGES.md

@@ -1,3 +1,12 @@
+### 0.6.8 (2014-02-20)
+
+* `:css` selector can now be used with `:index` (fixes #241)
+* `:css` selector can now be used on all container methods (fixes #124)
+
+### 0.6.7 (2014-02-04)
+
+* Revert wait/timeout bug introduced in 0.6.5 to fix #228.
+
 ### 0.6.6 (2014-01-29)
 
 * Fix regression where locating `<button>foo</button>` using (value: /foo/) would fail.

data/README.md

@@ -5,7 +5,7 @@ Watir implementation built on WebDriver's Ruby bindings.
 See http://rubyforge.org/pipermail/wtr-development/2009-October/001313.html.
 
 [![Gem Version](https://badge.fury.io/rb/watir-webdriver.png)](http://badge.fury.io/rb/watir-webdriver)
-[![Build Status](https://secure.travis-ci.org/watir/watir-webdriver.png)](http://travis-ci.org/watir/watir-webdriver)
+[![Build Status](https://travis-ci.org/watir/watir-webdriver.png?branch=master)](https://travis-ci.org/watir/watir-webdriver)
 [![Code Climate](https://codeclimate.com/github/watir/watir-webdriver.png)](https://codeclimate.com/github/watir/watir-webdriver)
 [![Dependency Status](https://gemnasium.com/watir/watir-webdriver.png)](https://gemnasium.com/watir/watir-webdriver)
 [![Coverage Status](https://coveralls.io/repos/watir/watir-webdriver/badge.png?branch=master)](https://coveralls.io/r/watir/watir-webdriver)

data/lib/watir-webdriver/cookies.rb

@@ -45,7 +45,7 @@ module Watir
         :secure  => opts[:secure],
         :path    => opts[:path],
         :expires => opts[:expires],
-        :domain  => opts[:domain],
+        :domain  => opts[:domain]
       }
 
       @control.add_cookie cookie

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

@@ -3,7 +3,7 @@ module Watir
   class ElementLocator
     include Watir::Exception
 
-    WD_FINDERS =  [
+    WD_FINDERS = [
       :class,
       :class_name,
       :css,
@@ -34,7 +34,7 @@ module Watir
         element = find_first_by_multiple
       end
 
-      # This actually only applies when finding by xpath - browser.text_field(:xpath, "//input[@type='radio']")
+      # This actually only applies when finding by xpath/css - browser.text_field(:xpath, "//input[@type='radio']")
       # We don't need to validate the element if we built the xpath ourselves.
       # It is also used to alter behavior of methods locating more than one type of element
       # (e.g. text_field locates both input and textarea)
@@ -78,11 +78,11 @@ module Watir
     def find_first_by_multiple
       selector = normalized_selector
 
-      idx   = selector.delete(:index)
-      how, what = given_xpath(selector) || build_wd_selector(selector)
+      idx = selector.delete(:index)
+      how, what = given_xpath_or_css(selector) || build_wd_selector(selector)
 
       if how
-        # could build xpath for selector
+        # could build xpath/css for selector
         if idx
           @wd.find_elements(how, what)[idx]
         else
@@ -105,7 +105,7 @@ module Watir
         raise ArgumentError, "can't locate all elements by :index"
       end
 
-      how, what = given_xpath(selector) || build_wd_selector(selector)
+      how, what = given_xpath_or_css(selector) || build_wd_selector(selector)
       if how
         @wd.find_elements(how, what)
       else
@@ -208,7 +208,7 @@ module Watir
 
     def normalize_selector(how, what)
       case how
-      when :tag_name, :text, :xpath, :index, :class, :label
+      when :tag_name, :text, :xpath, :index, :class, :label, :css
         # include :class since the valid attribute is 'class_name'
         # include :for since the valid attribute is 'html_for'
         [how, what]
@@ -293,10 +293,6 @@ module Watir
         xpath << "[" << attribute_expression(selectors) << "]"
       end
 
-      if idx
-        xpath << "[#{idx + 1}]"
-      end
-
       p :xpath => xpath, :selectors => selectors if $DEBUG
 
       [:xpath, xpath]
@@ -404,18 +400,29 @@ module Watir
       element
     end
 
-    def given_xpath(selector)
-      return unless xpath = selector.delete(:xpath)
+    def given_xpath_or_css(selector)
+      xpath = selector.delete(:xpath)
+      css   = selector.delete(:css)
+      return unless xpath || css
 
-      unless selector.empty? || can_be_combined_with_xpath?(selector)
-        raise ArgumentError, ":xpath cannot be combined with other selectors (#{selector.inspect})"
+      if xpath && css
+        raise ArgumentError, ":xpath and :css cannot be combined (#{selector.inspect})"
       end
 
-      [:xpath, xpath]
+      how, what = if xpath
+                    [:xpath, xpath]
+                  elsif css
+                    [:css, css]
+                  end
+
+      if selector.any? && !can_be_combined_with_xpath_or_css?(selector)
+        raise ArgumentError, "#{how} cannot be combined with other selectors (#{selector.inspect})"
+      end
+
+      [how, what]
     end
 
-    def can_be_combined_with_xpath?(selector)
-      # ouch - is this worth it?
+    def can_be_combined_with_xpath_or_css?(selector)
       keys = selector.keys
       return true if keys == [:tag_name]
 

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

data/spec/element_locator_spec.rb

@@ -219,6 +219,38 @@ describe Watir::ElementLocator do
         expect(locate_one(selector)).to eq elements[1]
       end
 
+      it "handles :xpath and :index selectors" do
+        elements = [
+          element(:tag_name => "div", :attributes => { :class => "foo" }),
+          element(:tag_name => "div", :attributes => { :class => "foo" })
+        ]
+
+        expect_all(:xpath, './/div[@class="foo"]').and_return(elements)
+
+        selector = {
+          :xpath => './/div[@class="foo"]',
+          :index => 1
+        }
+
+        expect(locate_one(selector)).to eq elements[1]
+      end
+
+      it "handles :css and :index selectors" do
+        elements = [
+          element(:tag_name => "div", :attributes => { :class => "foo" }),
+          element(:tag_name => "div", :attributes => { :class => "foo" })
+        ]
+
+        expect_all(:css, 'div[class="foo"]').and_return(elements)
+
+        selector = {
+          :css   => 'div[class="foo"]',
+          :index => 1
+        }
+
+        expect(locate_one(selector)).to eq elements[1]
+      end
+
       it "handles mix of string and regexp attributes" do
         elements = [
           element(:tag_name => "div", :attributes => { :dir => "foo", :title => "bar" }),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver