watir-webdriver 0.9.1 → 0.9.2

data/lib/watir-webdriver/locators/text_field/selector_builder/xpath.rb

@@ -0,0 +1,19 @@
+module Watir
+  module Locators
+    class TextField
+      class SelectorBuilder
+        class XPath < Element::SelectorBuilder::XPath
+          def lhs_for(building, key)
+            if building == :input && key == :text
+              "@value"
+            elsif building == :textarea && key == :value
+              "text()"
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/watir-webdriver/locators/text_field/validator.rb

@@ -0,0 +1,20 @@
+module Watir
+  module Locators
+    class TextField
+      class Validator < Element::Validator
+        VALID_TEXT_FIELD_TAGS = %w[input textarea]
+
+        def validate(element, selector)
+          element_tag_name = element.tag_name.downcase
+
+          if element.tag_name.downcase == 'textarea'
+            warn "Locating textareas with '#text_field' is deprecated. Please, use '#textarea' method instead."
+          end
+          return unless VALID_TEXT_FIELD_TAGS.include?(element_tag_name)
+
+          element
+        end
+      end
+    end
+  end
+end

data/lib/watir-webdriver/row_container.rb

@@ -6,10 +6,7 @@ module Watir
     #
 
     def row(*args)
-      row = tr(*args)
-      row.locator_class = ChildRowLocator
-
-      row
+      Row.new(self, extract_selector(args).merge(tag_name: "tr"))
     end
 
     #
@@ -17,10 +14,7 @@ module Watir
     #
 
     def rows(*args)
-      rows = trs(*args)
-      rows.locator_class = ChildRowLocator
-
-      rows
+      RowCollection.new(self, extract_selector(args).merge(tag_name: "tr"))
     end
 
     #
@@ -33,7 +27,7 @@ module Watir
       assert_exists
 
       rows.inject [] do |res, row|
-        res << row.cells.map { |cell| cell.text }
+        res << row.cells.map(&:text)
       end
     end
     alias_method :to_a, :strings

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/lib/watir-webdriver/wait.rb

@@ -123,9 +123,12 @@ module Watir
   #
 
   class WhenPresentDecorator < BaseDecorator
-    extend Forwardable
-
-    def_delegator :@element, :present?
+    def present?
+      Watir::Wait.until(@timeout, @message) { wait_until }
+      true
+    rescue Watir::Wait::TimeoutError
+      false
+    end
 
     private
 

data/spec/always_locate_spec.rb

@@ -31,11 +31,12 @@ describe 'Watir' do
       expect(element.exists?).to be true
 
       browser.refresh
+      browser.div(id: "text").wait_until_present
 
       if Watir.always_locate?
         expect { element.text }.to_not raise_error
       else
-        expect { element.text }.to raise_error
+        expect { element.text }.to raise_error Watir::Exception::UnknownObjectException
       end
     end
   end

data/spec/element_locator_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path("spec_helper", File.dirname(__FILE__))
 
-describe Watir::ElementLocator do
+describe Watir::Locators::Element::Locator do
   include LocatorSpecHelper
 
   describe "finds a single element" do

data/spec/element_spec.rb

@@ -52,9 +52,11 @@ describe Watir::Element do
   describe "#reset!" do
     it "successfully relocates collection elements after a reset!" do
       browser.goto(WatirSpec.url_for("wait.html"))
-      element = browser.div(:id, 'foo')
+      element = browser.div(id: 'foo')
       expect(element).to exist
       browser.refresh
+      browser.div(id: 'foo').wait_until_present
+
       expect(element.exist?).to be false unless Watir.always_locate?
       element.send :reset!
       expect(element).to exist
@@ -66,46 +68,15 @@ describe Watir::Element do
       browser.goto WatirSpec.url_for('removed_element.html')
     end
 
-    it "does not propagate StaleElementReferenceErrors" do
-      button = browser.button(id: "remove-button")
-      element = browser.div(id: "text")
-
-      expect(element).to exist
-      button.click
-      expect(element).to_not exist
-    end
-
     it "returns false when an element from a collection becomes stale" do
-      button = browser.button(id: "remove-button")
-      text = browser.divs(id: "text").first
-
-      expect(text).to exist
-      button.click
-      expect(text).to_not exist
-    end
-
-    it "returns false when an element becomes stale" do
-      wd_element = browser.div(id: "text").wd
+      watir_element = browser.divs(id: "text").first
+      expect(watir_element).to exist
 
-      # simulate element going stale during lookup
-      allow(browser.driver).to receive(:find_element).with(:id, 'text') { wd_element }
       browser.refresh
 
-      expect(browser.div(:id, 'text')).to_not exist
+      expect(watir_element).to_not exist
     end
 
-    it "returns appropriate value when an ancestor element becomes stale" do
-      stale_element = browser.div(id: 'top').div(id: 'middle').div(id: 'bottom')
-      expect(stale_element.present?).to be true # look up and store @element for each element in hierarchy
-
-      grandparent = stale_element.instance_variable_get('@parent').instance_variable_get('@parent').instance_variable_get('@element')
-
-      # simulate element going stale during lookup
-      allow(grandparent).to receive('enabled?') { raise Selenium::WebDriver::Error::ObsoleteElementError }
-
-      browser.refresh
-      expect(stale_element.present?).to be Watir.always_locate?
-    end
   end
 
   describe "#element_call" do
@@ -125,17 +96,14 @@ describe Watir::Element do
       if Watir.always_locate?
         expect { watir_element.text }.to_not raise_error
       else
-        expect { watir_element.text }.to raise_error Selenium::WebDriver::Error::StaleElementReferenceError
+        expect { watir_element.text }.to raise_error Watir::Exception::UnknownObjectException
       end
     end
 
   end
 
   describe "#hover" do
-    not_compliant_on %i(webdriver firefox synthesized_events),
-                     %i(webdriver internet_explorer),
-                     %i(webdriver iphone),
-                     %i(webdriver safari) do
+    not_compliant_on :internet_explorer, :iphone, :safari do
       it "should hover over the element" do
         browser.goto WatirSpec.url_for('hover.html')
         link = browser.a

data/spec/implementation.rb

@@ -7,6 +7,7 @@ class ImplementationConfig
 
   def configure
     set_webdriver
+    start_remote_server if remote? && !ENV["REMOTE_SERVER_URL"]
     set_browser_args
     set_guard_proc
     add_html_routes
@@ -16,6 +17,32 @@ class ImplementationConfig
 
   private
 
+  def start_remote_server
+    require 'selenium/server'
+
+    @server ||= Selenium::Server.new(remote_server_jar,
+                                     :port       => Selenium::WebDriver::PortProber.above(4444),
+                                     :log        => !!$DEBUG,
+                                     :background => true,
+                                     :timeout    => 60)
+
+    @server.start
+    at_exit { @server.stop }
+  end
+
+  def remote_server_jar
+    if File.exist?(ENV['REMOTE_SERVER_BINARY'] || '')
+      ENV['REMOTE_SERVER_BINARY']
+    elsif !Dir.glob('selenium-server-standalone*.jar').empty?
+      Dir.glob('selenium-server-standalone*.jar').first
+    else
+      Selenium::Server.download :latest
+    end
+  rescue SocketError
+    # not connected to internet
+    raise Watir::Exception::Error, "unable to find or download selenium-server-standalone jar"
+  end
+
   def set_webdriver
     @imp.name          = :webdriver
     @imp.browser_class = Watir::Browser
@@ -63,29 +90,27 @@ class ImplementationConfig
   end
 
   def set_guard_proc
-    matching_browser = remote? ? remote_browser : browser
-    browser_instance = WatirSpec.new_browser
-    browser_version = browser_instance.driver.capabilities.version
-    matching_browser_with_version = "#{matching_browser}#{browser_version}".to_sym
-    matching_guards = [
-      :webdriver,                     # guard only applies to webdriver
-      matching_browser,               # guard only applies to this browser
-      matching_browser_with_version,  # guard only applies to this browser with specific version
-      [:webdriver, matching_browser], # guard only applies to this browser on webdriver
-      [:webdriver, matching_browser_with_version],  # guard only applies to this browser with specific version on webdriver
-      [matching_browser, Selenium::WebDriver::Platform.os] # guard only applies to this browser with this OS
-    ]
-
-    if native_events?
-      # guard only applies to this browser on webdriver with native events enabled
-      matching_guards << [:webdriver, matching_browser, :native_events]
-      matching_guards << [:webdriver, matching_browser_with_version, :native_events]
+    matching_guards = [:webdriver]
+
+    if remote?
+      matching_browser = remote_browser
+      matching_guards << :remote
+      matching_guards << [:remote, matching_browser]
     else
-      # guard only applies to this browser on webdriver with native events disabled
-      matching_guards << [:webdriver, matching_browser, :synthesized_events]
-      matching_guards << [:webdriver, matching_browser_with_version, :synthesized_events]
+      matching_browser = browser
     end
 
+    browser_instance = WatirSpec.new_browser
+    browser_version = browser_instance.driver.capabilities.version
+
+    matching_browser_with_version = "#{browser}#{browser_version}".to_sym
+    matching_guards << matching_browser_with_version if browser_version
+    matching_guards << [:webdriver, matching_browser_with_version]
+
+    matching_guards << matching_browser
+    matching_guards << [:webdriver, matching_browser]
+    matching_guards << [matching_browser, Selenium::WebDriver::Platform.os]
+
     if !Selenium::WebDriver::Platform.linux? || ENV['DESKTOP_SESSION']
       # some specs (i.e. Window#maximize) needs a window manager on linux
       matching_guards << [:webdriver, matching_browser, :window_manager]
@@ -100,16 +125,12 @@ class ImplementationConfig
   end
 
   def firefox_args
-    profile = Selenium::WebDriver::Firefox::Profile.new
-    profile.native_events = native_events?
-
-    [:firefox, {profile: profile}]
+    [:firefox, {}]
   end
 
   def chrome_args
     opts = {
-      args: ["--disable-translate"],
-      native_events: native_events?
+      args: ["--disable-translate"]
     }
 
     if url = ENV['WATIR_WEBDRIVER_CHROME_SERVER']
@@ -132,7 +153,10 @@ class ImplementationConfig
   end
 
   def remote_args
-    [:remote, {url: ENV["WATIR_WEBDRIVER_REMOTE_URL"] || "http://127.0.0.1:8080"}]
+    url = ENV["REMOTE_SERVER_URL"] || "http://127.0.0.1:#{@server.port}/wd/hub"
+    remote_browser_name = ENV['REMOTE_BROWSER'].to_sym
+    caps =  Selenium::WebDriver::Remote::Capabilities.send(remote_browser_name)
+    [:remote, {url: url, desired_capabilities: caps}]
   end
 
   def add_html_routes
@@ -147,24 +171,7 @@ class ImplementationConfig
   end
 
   def remote_browser
-    remote_browser = WatirSpec.new_browser
-    remote_browser.browser.name
-  ensure
-    remote_browser.close
-  end
-
-  def native_events?
-    if ENV['NATIVE_EVENTS'] == "true"
-      true
-    elsif ENV['NATIVE_EVENTS'] == "false" && !ie?
-      false
-    else
-      native_events_by_default?
-    end
-  end
-
-  def native_events_by_default?
-    Selenium::WebDriver::Platform.windows? && [:firefox, :internet_explorer].include?(browser)
+    @remote_browser ||= (ENV['REMOTE_BROWSER'] || :firefox).to_sym
   end
 
   class SelectorListener < Selenium::WebDriver::Support::AbstractEventListener

data/spec/locator_spec_helper.rb

@@ -1,13 +1,19 @@
 require 'active_support/ordered_hash'
 
 module LocatorSpecHelper
+  def browser
+    @browser ||= double(Watir::Browser, wd: driver)
+  end
+
   def driver
     @driver ||= double(Selenium::WebDriver::Driver)
   end
 
   def locator(selector, attrs)
     attrs ||= Watir::HTMLElement.attributes
-    Watir::ElementLocator.new(driver, selector, attrs)
+    element_validator = Watir::Locators::Element::Validator.new
+    selector_builder = Watir::Locators::Element::SelectorBuilder.new(driver, selector, attrs)
+    Watir::Locators::Element::Locator.new(browser, selector, selector_builder, element_validator)
   end
 
   def expect_one(*args)
@@ -31,7 +37,7 @@ module LocatorSpecHelper
     el = double(Watir::Element, opts)
 
     attrs.each do |key, value|
-      el.stub(:attribute).with(key).and_return(value)
+      allow(el).to receive(:attribute).with(key).and_return(value)
     end if attrs
 
     el

data/support/travis.sh

@@ -1,4 +1,4 @@
-#/bin/sh
+#!/bin/bash
 
 set -e
 set -x
@@ -6,19 +6,30 @@ set -x
 sh -e /etc/init.d/xvfb start
 git submodule update --init
 
-mkdir ~/.yard
-bundle exec yard config -a autoload_plugins yard-doctest
+if [[ "$RAKE_TASK" = "yard:doctest" ]]; then
+  mkdir ~/.yard
+  bundle exec yard config -a autoload_plugins yard-doctest
+fi
 
 if [[ "$RAKE_TASK" = "spec:chrome" ]]; then
-  export CHROME_REVISION=`curl -s http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/LAST_CHANGE`
-  export CHROMEDRIVER_VERSION=`curl -s http://chromedriver.storage.googleapis.com/LATEST_RELEASE`
-
+  # https://omahaproxy.appspot.com
+  # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/
+  CHROME_REVISION=386257
   curl -L -O "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/${CHROME_REVISION}/chrome-linux.zip"
   unzip chrome-linux.zip
 
+  CHROMEDRIVER_VERSION=$(curl -s http://chromedriver.storage.googleapis.com/LATEST_RELEASE)
   curl -L -O "http://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip"
   unzip chromedriver_linux64.zip
 
   mv chromedriver chrome-linux/chromedriver
   chmod +x chrome-linux/chromedriver
 fi
+
+if [[ "$RAKE_TASK" = "spec:phantomjs" ]]; then
+  curl -L -O "https://bintray.com/artifact/download/tfortner/phantomjs-clone/p/phantomjs"
+  chmod +x phantomjs
+
+  mv phantomjs travis-phantomjs/phantomjs
+  phantomjs --version
+fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -214,6 +214,7 @@ files:
 - lib/watir-webdriver/element_collection.rb
 - lib/watir-webdriver/elements/area.rb
 - lib/watir-webdriver/elements/button.rb
+- lib/watir-webdriver/elements/cell.rb
 - lib/watir-webdriver/elements/checkbox.rb
 - lib/watir-webdriver/elements/dlist.rb
 - lib/watir-webdriver/elements/element.rb
@@ -228,6 +229,7 @@ files:
 - lib/watir-webdriver/elements/link.rb
 - lib/watir-webdriver/elements/option.rb
 - lib/watir-webdriver/elements/radio.rb
+- lib/watir-webdriver/elements/row.rb
 - lib/watir-webdriver/elements/select.rb
 - lib/watir-webdriver/elements/svg_elements.rb
 - lib/watir-webdriver/elements/table.rb
@@ -256,12 +258,26 @@ files:
 - lib/watir-webdriver/generator/svg/spec_extractor.rb
 - lib/watir-webdriver/generator/svg/visitor.rb
 - lib/watir-webdriver/has_window.rb
-- lib/watir-webdriver/locators/button_locator.rb
-- lib/watir-webdriver/locators/child_cell_locator.rb
-- lib/watir-webdriver/locators/child_row_locator.rb
-- lib/watir-webdriver/locators/element_locator.rb
-- lib/watir-webdriver/locators/text_area_locator.rb
-- lib/watir-webdriver/locators/text_field_locator.rb
+- lib/watir-webdriver/locators.rb
+- lib/watir-webdriver/locators/button/locator.rb
+- lib/watir-webdriver/locators/button/selector_builder.rb
+- lib/watir-webdriver/locators/button/selector_builder/xpath.rb
+- lib/watir-webdriver/locators/button/validator.rb
+- lib/watir-webdriver/locators/cell/locator.rb
+- lib/watir-webdriver/locators/cell/selector_builder.rb
+- lib/watir-webdriver/locators/element/locator.rb
+- lib/watir-webdriver/locators/element/selector_builder.rb
+- lib/watir-webdriver/locators/element/selector_builder/css.rb
+- lib/watir-webdriver/locators/element/selector_builder/xpath.rb
+- lib/watir-webdriver/locators/element/validator.rb
+- lib/watir-webdriver/locators/row/locator.rb
+- lib/watir-webdriver/locators/row/selector_builder.rb
+- lib/watir-webdriver/locators/text_area/locator.rb
+- lib/watir-webdriver/locators/text_area/selector_builder.rb
+- lib/watir-webdriver/locators/text_field/locator.rb
+- lib/watir-webdriver/locators/text_field/selector_builder.rb
+- lib/watir-webdriver/locators/text_field/selector_builder/xpath.rb
+- lib/watir-webdriver/locators/text_field/validator.rb
 - lib/watir-webdriver/row_container.rb
 - lib/watir-webdriver/screenshot.rb
 - lib/watir-webdriver/user_editable.rb
@@ -305,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: watir-webdriver
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Watir on WebDriver
@@ -321,4 +337,3 @@ test_files:
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
-has_rdoc: