watir-webdriver 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9370b06f40fbc6975aeea6dea8986520f4bf5ecd
-  data.tar.gz: f4cb6ecae2be21dfb1c30170e8b1aaf4aac78127
+  metadata.gz: 97a842500bc21408f519b175ca58df6c8533491a
+  data.tar.gz: 65dd8b201a511705730c8e21c6e691e615b984c6
 SHA512:
-  metadata.gz: 398ffa48eb35503b7b92b771bf6f2a9ab6a8afc5dbfcf9033e7daaa1fcb7c69c8dcd6b4a9df55a5c3d73fb20f7a2cd7b23106e26eb4b0ac2bed8f4f34155a5c9
-  data.tar.gz: 4966d71ac3d300392e7f8525a3f25aa81a712e7aada635632b2531cd5e57cfb52b0900f96ef0f2a141935095a251713727453301b06708474368778d3923ce89
+  metadata.gz: 06f2ac29fc1ba7ade5cc45b5291757fe1d6c4f907a205ddb9aaf21a78208dc603afcb3aea128ff83ac4e677378cef87f8135724559b59f9c6a699b85c8f8ff27
+  data.tar.gz: 01b2df0459f6fba07f5e4739e1bbd5ae3b7654c0eaf4d316725f1aa0a91c1e0e38508393d901f91f070c1994879b4cb58e555dbad9448907af08bd92fc997fdf

data/.travis.yml

@@ -1,13 +1,21 @@
+sudo: false
 rvm:
   - 2.0
   - 2.1
+  - 2.2
+addons:
+  apt:
+    packages:
+      - unzip
+      - libxss1
+cache: bundler
 notifications:
   recipients:
     - p0deje@gmail.com
     - jarmo.p@gmail.com
+    - titusfortner@gmail.com
   irc: "irc.freenode.net#watir"
-before_script:
-  - support/travis.sh
+before_script: support/travis.sh
 script: bundle exec rake $RAKE_TASK
 env:
   - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=firefox
@@ -16,12 +24,7 @@ env:
   - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=chrome
   - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=chrome ALWAYS_LOCATE=false
   - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=chrome PREFER_CSS=1 SELECTOR_STATS=1
-  # - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs
-  # - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs ALWAYS_LOCATE=false
-  # - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs PREFER_CSS=1 SELECTOR_STATS=1
+  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs
+  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs ALWAYS_LOCATE=false
+  - RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs PREFER_CSS=1 SELECTOR_STATS=1
   - RAKE_TASK=yard:doctest
-matrix:
-  allow_failures:
-    - env: RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs
-    - env: RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs ALWAYS_LOCATE=false
-    - env: RAKE_TASK=spec WATIR_WEBDRIVER_BROWSER=phantomjs PREFER_CSS=1 SELECTOR_STATS=1

data/CHANGES.md

@@ -1,3 +1,19 @@
+### 0.9.0 (2015-10-08)
+
+* Improve performance for Select#include? (#375, thanks @Conky5)
+* Add support for waiting for elements to be enabled (#370, thanks @Rodney-QAGeek)
+* Remove unnecessary wire calls for navigation (#369)
+* Improve performance for Select#selected? with large drop-down lists (#367)
+* Add stale element protection and correct context assurance for Browser#text (#366)
+* Restore behavior for Wait#until to return result of block (#362, thanks @chrismikehogan)
+* Fix context switching between frames for element collections (#361)
+* AfterHooks run after closing an alert (#352)
+* New AfterHooks API that deprecates Checkers:
+  * Use `Browser#after_hooks#add` instead of `Browser#add_checker`
+  * Use `Browser#after_hooks#delete` instead of `Browser#disable_checker`
+  * Use `Browser#after_hooks#run` instead of `Browser#run_checkers`
+  * Use `Browser#after_hooks#without` instead of `Browser#without_checkers`
+
 ### 0.8.0 (2015-06-26)
 
 * Ruby 1.8 is no longer supported. Ruby 1.9 still works, but not supported as well (#327)

data/README.md

@@ -27,9 +27,12 @@ browser.close
 Description
 -----------
 
-The file in `lib/watir-webdriver/elements/html_generated.rb` is autogenerated from the HTML spec. This is done by extracting the IDL parts from the spec and processing them with the WebIDL gem (link below).
+The majority of element methods Watir provides with is autogenerated from specifications.
+This is done by extracting the IDL parts from the spec and processing them with the WebIDL gem (link below).
+Currently supported specifications are:
 
-The same is true for `lib/watir-webdriver/elements/svg_elements.rb`.
+* [HTML](https://www.whatwg.org/specs/web-apps/current-work/) (`lib/watir-webdriver/elements/html_generated.rb`)
+* [SVG](http://www.w3.org/TR/SVG2/single-page.html) (`lib/watir-webdriver/elements/svg_generated.rb`)
 
 Specs
 -----

data/Rakefile

@@ -121,3 +121,24 @@ end
 load "spec/watirspec/watirspec.rake" if File.exist?("spec/watirspec/watirspec.rake")
 
 task default: [:spec, 'yard:doctest']
+
+namespace :spec do
+  require 'selenium-webdriver'
+
+  desc 'Run specs in all browsers'
+  task all_browsers: [:firefox,
+                      :firefox_nightly,
+                      :chrome,
+                      (:safari if Selenium::WebDriver::Platform.os == :macosx),
+                      (:ie if Selenium::WebDriver::Platform.os == :windows),
+                      (:edge if Selenium::WebDriver::Platform.os == :windows),
+                      :phantomjs].compact
+
+  %w(firefox firefox_nightly chrome safari phantomjs ie edge).each do |browser|
+    desc "Run specs in #{browser}"
+    task browser do
+      ENV['WATIR_WEBDRIVER_BROWSER'] = browser
+      Rake::Task['spec'].execute
+    end
+  end
+end

data/lib/watir-webdriver.rb

@@ -18,6 +18,7 @@ require 'watir-webdriver/locators/child_row_locator'
 require 'watir-webdriver/locators/child_cell_locator'
 require 'watir-webdriver/browser'
 require 'watir-webdriver/screenshot'
+require 'watir-webdriver/after_hooks'
 
 module Watir
   @always_locate = true

data/lib/watir-webdriver/after_hooks.rb

@@ -0,0 +1,132 @@
+module Watir
+
+  #
+  # After hooks are blocks that run after certain browser events.
+  # They are generally used to ensure application under test does not encounter
+  # any error and are automatically executed after following events:
+  #   1. Open URL.
+  #   2. Refresh page.
+  #   3. Click, double-click or right-click on element.
+  #   4. Alert closing.
+  #
+
+  class AfterHooks
+    include Enumerable
+
+    def initialize(browser)
+      @browser = browser
+      @after_hooks = []
+    end
+
+    #
+    # Adds new after hook.
+    #
+    # @example
+    #   browser.after_hooks.add do |browser|
+    #     browser.text.include?("Server Error") and puts "Application exception or 500 error!"
+    #   end
+    #   browser.goto "www.watir.com/404"
+    #   "Application exception or 500 error!"
+    #
+    # @param [#call] after_hook Object responding to call
+    # @yield after_hook block
+    # @yieldparam [Watir::Browser]
+    #
+
+    def add(after_hook = nil, &block)
+      if block_given?
+        @after_hooks << block
+      elsif after_hook.respond_to? :call
+        @after_hooks << after_hook
+      else
+        raise ArgumentError, "expected block or object responding to #call"
+      end
+    end
+    alias_method :<<, :add
+
+    #
+    # Deletes after hook.
+    #
+    # @example
+    #   browser.after_hooks.add do |browser|
+    #     browser.text.include?("Server Error") and puts "Application exception or 500 error!"
+    #   end
+    #   browser.goto "www.watir.com/404"
+    #   "Application exception or 500 error!"
+    #   browser.after_hooks.delete browser.after_hooks[0]
+    #   browser.refresh
+    #
+
+    def delete(after_hook)
+      @after_hooks.delete(after_hook)
+    end
+
+    #
+    # Runs after hooks.
+    #
+
+    def run
+      if @after_hooks.any? && @browser.window.present?
+        each { |after_hook| after_hook.call(@browser) }
+      end
+    end
+
+    #
+    # Executes a block without running error after hooks.
+    #
+    # @example
+    #   browser.after_hooks.without do |browser|
+    #     browser.element(name: "new_user_button").click
+    #   end
+    #
+    # @yield Block that is executed without after hooks being run
+    # @yieldparam [Watir::Browser]
+    #
+
+    def without
+      current_after_hooks = @after_hooks
+      @after_hooks = []
+      yield(@browser)
+    ensure
+      @after_hooks = current_after_hooks
+    end
+
+    #
+    # Yields each after hook.
+    #
+    # @yieldparam [#call] after_hook Object responding to call
+    #
+
+    def each
+      @after_hooks.each { |after_hook| yield after_hook }
+    end
+
+    #
+    # Returns number of after hooks.
+    #
+    # @example
+    #   browser.after_hooks.add { puts 'Some after_hook.' }
+    #   browser.after_hooks.length
+    #   #=> 1
+    #
+    # @return [Fixnum]
+    #
+
+    def length
+      @after_hooks.length
+    end
+    alias_method :size, :length
+
+    #
+    # Gets the after hook at the given index.
+    #
+    # @param [Fixnum] index
+    # @return [#call]
+    #
+
+    def [](index)
+      @after_hooks[index]
+    end
+
+  end # AfterHooks
+end # Watir

data/lib/watir-webdriver/alert.rb

@@ -3,8 +3,8 @@ module Watir
 
     include EventuallyPresent
 
-    def initialize(target_locator)
-      @target_locator = target_locator
+    def initialize(browser)
+      @browser = browser
       @alert = nil
     end
 
@@ -35,6 +35,7 @@ module Watir
     def ok
       assert_exists
       @alert.accept
+      @browser.after_hooks.run
     end
 
     #
@@ -49,6 +50,7 @@ module Watir
     def close
       assert_exists
       @alert.dismiss
+      @browser.after_hooks.run
     end
 
     #
@@ -93,7 +95,7 @@ module Watir
     private
 
     def assert_exists
-      @alert = @target_locator.alert
+      @alert = @browser.driver.switch_to.alert
     rescue Selenium::WebDriver::Error::NoAlertPresentError
       raise Exception::UnknownObjectException, 'unable to locate alert'
     end

data/lib/watir-webdriver/browser.rb

@@ -10,6 +10,7 @@ module Watir
     include Waitable
 
     attr_reader :driver
+    attr_reader :after_hooks
     alias_method :wd, :driver # ensures duck typing with Watir::Element
 
     class << self
@@ -49,9 +50,9 @@ module Watir
         raise ArgumentError, "expected Symbol or Selenium::WebDriver::Driver, got #{browser.class}"
       end
 
-      @error_checkers = []
+      @after_hooks = AfterHooks.new(self)
       @current_frame  = nil
-      @closed         = false
+      @closed = false
     end
 
     def inspect
@@ -74,9 +75,9 @@ module Watir
       uri = "http://#{uri}" unless uri =~ URI.regexp
 
       @driver.navigate.to uri
-      run_checkers
+      @after_hooks.run
 
-      url
+      uri
     end
 
     #
@@ -169,7 +170,7 @@ module Watir
     #
 
     def text
-      @driver.find_element(:tag_name, "body").text
+      body.text
     end
 
     #
@@ -190,7 +191,7 @@ module Watir
     #
 
     def alert
-      Alert.new driver.switch_to
+      Alert.new(self)
     end
 
     #
@@ -199,7 +200,7 @@ module Watir
 
     def refresh
       @driver.navigate.refresh
-      run_checkers
+      @after_hooks.run
     end
 
     #
@@ -281,79 +282,39 @@ module Watir
     end
 
     #
-    # Adds new checker.
-    #
-    # Checkers are generally used to ensure application under test does not encounter
-    # any error. They are automatically executed after following events:
-    #   1. Open URL
-    #   2. Refresh page
-    #   3. Click, double-click or right-click on element
-    #
-    # @example
-    #   browser.add_checker do |page|
-    #     page.text.include?("Server Error") and puts "Application exception or 500 error!"
-    #   end
-    #   browser.goto "www.watir.com/404"
-    #   "Application exception or 500 error!"
-    #
-    # @param [#call] checker Object responding to call
-    # @yield Checker block
-    # @yieldparam [Watir::Browser]
+    # @deprecated Use `Watir::AfterHooks#add` instead
     #
 
     def add_checker(checker = nil, &block)
-      if block_given?
-        @error_checkers << block
-      elsif checker.respond_to? :call
-        @error_checkers << checker
-      else
-        raise ArgumentError, "expected block or object responding to #call"
-      end
+      warn 'Browser#add_checker is deprecated. Use Browser#after_hooks#add instead.'
+      @after_hooks.add(checker, &block)
     end
 
     #
-    # Deletes checker.
-    #
-    # @example
-    #   checker = lambda do |page|
-    #     page.text.include?("Server Error") and puts "Application exception or 500 error!"
-    #   end
-    #   browser.add_checker checker
-    #   browser.goto "www.watir.com/404"
-    #   "Application exception or 500 error!"
-    #   browser.disable_checker checker
-    #   browser.refresh
+    # @deprecated Use `Watir::AfterHooks#delete` instead
     #
 
     def disable_checker(checker)
-      @error_checkers.delete(checker)
+      warn 'Browser#disable_checker is deprecated. Use Browser#after_hooks#delete instead.'
+      @after_hooks.delete(checker)
     end
 
     #
-    # Runs checkers.
+    # @deprecated Use `Watir::AfterHooks#run` instead
     #
 
     def run_checkers
-      @error_checkers.each { |e| e.call(self) } if !@error_checkers.empty? && window.present?
+      warn 'Browser#run_checkers is deprecated. Use Browser#after_hooks#run instead.'
+      @after_hooks.run
     end
 
     #
-    # Executes a block without running error checkers.
-    #
-    # @example
-    #   browser.without_checkers do
-    #     browser.element(name: "new_user_button").click
-    #   end
-    #
-    # @yieldparam [Watir::Browser]
+    # @deprecated Use `Watir::AfterHooks#without` instead
     #
 
-    def without_checkers
-      current_checkers = @error_checkers
-      @error_checkers = []
-      yield(self)
-    ensure
-      @error_checkers = current_checkers
+    def without_checkers(&block)
+      warn 'Browser#without_checkers is deprecated. Use Browser#after_hooks#without instead.'
+      @after_hooks.without(&block)
     end
 
     #

data/lib/watir-webdriver/element_collection.rb

@@ -87,6 +87,8 @@ module Watir
     private
 
     def elements
+      @parent.is_a?(IFrame) ? @parent.switch_to! : @parent.send(:assert_exists)
+
       @elements ||= locator_class.new(
         @parent.wd,
         @selector,

data/lib/watir-webdriver/elements/checkbox.rb

@@ -5,6 +5,7 @@ module Watir
     # Sets checkbox to the given value.
     #
     # @example
+    #   checkbox = browser.checkbox(id: 'new_user_interests_cars')
     #   checkbox.set?        #=> false
     #   checkbox.set
     #   checkbox.set?        #=> true

data/lib/watir-webdriver/elements/element.rb

@@ -129,7 +129,7 @@ module Watir
         end
       end
 
-      run_checkers
+      browser.after_hooks.run
     end
 
     #
@@ -145,7 +145,7 @@ module Watir
       assert_has_input_devices_for :double_click
 
       element_call { driver.action.double_click(@element).perform }
-      run_checkers
+      browser.after_hooks.run
     end
 
     #
@@ -161,7 +161,7 @@ module Watir
       assert_has_input_devices_for :right_click
 
       element_call { driver.action.context_click(@element).perform }
-      run_checkers
+      browser.after_hooks.run
     end
 
     #
@@ -403,6 +403,16 @@ module Watir
       element_call { @element.displayed? }
     end
 
+    #
+    # Returns true if this element is present and enabled on the page.
+    #
+    # @return [Boolean]
+    #
+
+    def enabled?
+      present? && element_call { @element.enabled? }
+    end
+
     #
     # Returns true if the element exists and is visible on the page.
     #
@@ -438,14 +448,6 @@ module Watir
       end
     end
 
-    #
-    # Runs checkers.
-    #
-
-    def run_checkers
-      @parent.run_checkers
-    end
-
     #
     # Cast this Element instance to a more specific subtype.
     #

data/lib/watir-webdriver/elements/form.rb

@@ -10,7 +10,7 @@ module Watir
     def submit
       assert_exists
       element_call { @element.submit }
-      run_checkers
+      browser.after_hooks.run
     end
 
   end # Form

data/lib/watir-webdriver/elements/select.rb

@@ -45,8 +45,13 @@ module Watir
     #
 
     def include?(str_or_rx)
-      # TODO: optimize similar to selected?
-      options.any? { |e| str_or_rx === e.text }
+      assert_exists
+
+      element_call do
+        @element.find_elements(:tag_name, 'option').any? do |e|
+          str_or_rx === e.text || str_or_rx === e.attribute(:label)
+        end
+      end
     end
 
     #
@@ -86,17 +91,22 @@ module Watir
 
     def selected?(str_or_rx)
       assert_exists
-      matches = element_call do
-        @element.find_elements(:tag_name, 'option').select do |e|
-          str_or_rx === e.text || str_or_rx === e.attribute(:label)
+
+      match_found = false
+
+      element_call do
+        @element.find_elements(:tag_name, 'option').each do |e|
+          matched = str_or_rx === e.text || str_or_rx === e.attribute(:label)
+          if matched
+            return true if e.selected?
+            match_found = true
+          end
         end
       end
 
-      if matches.empty?
-        raise UnknownObjectException, "Unable to locate option matching #{str_or_rx.inspect}"
-      end
+      raise(UnknownObjectException, "Unable to locate option matching #{str_or_rx.inspect}") unless match_found
 
-      matches.any? { |e| e.selected? }
+      false
     end
 
     #

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/watir-webdriver/wait.rb

@@ -37,7 +37,10 @@ module Watir
 
       def until(timeout = nil, message = nil)
         timeout ||= Watir.default_timeout
-        run_with_timer(timeout) { return true if yield(self) }
+        run_with_timer(timeout) do
+          result = yield(self)
+          return result if result
+        end
         raise TimeoutError, message_for(timeout, message)
       end
 
@@ -91,15 +94,7 @@ module Watir
     end
   end
 
-  #
-  # Wraps an Element so that any subsequent method calls are
-  # put on hold until the element is present (exists and is visible) on the page.
-  #
-
-  class WhenPresentDecorator
-    extend Forwardable
-
-    def_delegator :@element, :present?
+  class BaseDecorator
 
     def initialize(element, timeout, message = nil)
       @element = element
@@ -116,12 +111,43 @@ module Watir
         raise NoMethodError, "undefined method `#{m}' for #{@element.inspect}:#{@element.class}"
       end
 
-      Watir::Wait.until(@timeout, @message) { @element.present? }
+      Watir::Wait.until(@timeout, @message) { wait_until }
 
       @element.__send__(m, *args, &block)
     end
+  end
+
+  #
+  # Wraps an Element so that any subsequent method calls are
+  # put on hold until the element is present (exists and is visible) on the page.
+  #
+
+  class WhenPresentDecorator < BaseDecorator
+    extend Forwardable
+
+    def_delegator :@element, :present?
+
+    private
+
+    def wait_until
+      @element.present?
+    end
   end # WhenPresentDecorator
 
+  #
+  # Wraps an Element so that any subsequent method calls are
+  # put on hold until the element is enabled (exists and is enabled) on the page.
+  #
+
+  class WhenEnabledDecorator < BaseDecorator
+
+    private
+
+    def wait_until
+      @element.enabled?
+    end
+  end # WhenEnabledDecorator
+
   #
   # Convenience methods for things that eventually become present.
   #
@@ -155,6 +181,30 @@ module Watir
       end
     end
 
+    #
+    # Waits until the element is enabled.
+    #
+    # @example
+    #   browser.button(name: "new_user_button_2").when_enabled.click
+    #
+    # @param [Fixnum] timeout seconds to wait before timing out
+    #
+    # @see Watir::Wait
+    # @see Watir::Element#enabled?
+    #
+
+    def when_enabled(timeout = nil)
+      timeout ||= Watir.default_timeout
+      message = "waiting for #{selector_string} to become enabled"
+
+      if block_given?
+        Watir::Wait.until(timeout, message) { enabled? }
+        yield self
+      else
+        WhenEnabledDecorator.new(self, timeout, message)
+      end
+    end
+
     #
     # Waits until the element is present.
     #

data/spec/click_spec.rb

@@ -15,29 +15,5 @@ describe Watir::Element do
         expect(browser.element(text: "You Clicked It!")).to exist
       end
     end
-
-    # TODO: make guards more flexible, in reality this currently only works on linux with native events
-    compliant_on %i(webdriver firefox native_events) do
-      it "should perform a click with no modifier keys" do
-        clicker.click
-        expect(log).to eq ["shift=false alt=false"]
-      end
-
-      it "should perform a click with the shift key pressed" do
-        clicker.click(:shift)
-        expect(log).to eq ["shift=true alt=false"]
-      end
-
-      it "should perform a click with the alt key pressed" do
-        clicker.click(:alt)
-        expect(log).to eq ["shift=false alt=true"]
-      end
-
-      it "should perform a click with the shift and alt keys pressed" do
-        clicker.click(:shift, :alt)
-        expect(log).to eq ["shift=true alt=true"]
-      end
-    end
-
   end
 end

data/spec/implementation.rb

@@ -72,7 +72,8 @@ class ImplementationConfig
       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
+      [: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?

data/support/doctest_helper.rb

@@ -33,11 +33,6 @@ YARD::Doctest.configure do |doctest|
     browser.button(id: 'prompt').click
   end
 
-  doctest.before('Watir::CheckBox#set') do
-    browser.goto WatirSpec.url_for('forms_with_input_elements.html')
-    checkbox = browser.checkbox(id: 'new_user_interests_cars')
-  end
-
   %w[Watir::Browser#execute_script Watir::Element#drag_and_drop].each do |name|
     doctest.before(name) do
       browser.goto WatirSpec.url_for('drag_and_drop.html')

data/support/travis.sh

@@ -3,9 +3,6 @@
 set -e
 set -x
 
-export CHROME_REVISION=228611
-export CHROMEDRIVER_VERSION=2.9
-
 sh -e /etc/init.d/xvfb start
 git submodule update --init
 
@@ -13,31 +10,15 @@ mkdir ~/.yard
 bundle exec yard config -a autoload_plugins yard-doctest
 
 if [[ "$WATIR_WEBDRIVER_BROWSER" = "chrome" ]]; then
-  sudo chmod 1777 /dev/shm
-
-  sudo apt-get update
-  sudo apt-get install -y unzip libxss1
+  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`
 
   curl -L -O "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/${CHROME_REVISION}/chrome-linux.zip"
   unzip chrome-linux.zip
 
-  # chrome sandbox doesn't currently work on travis: https://github.com/travis-ci/travis-ci/issues/938
-  sudo chown root:root chrome-linux/chrome_sandbox
-  sudo chmod 4755 chrome-linux/chrome_sandbox
-  export CHROME_DEVEL_SANDBOX="$PWD/chrome-linux/chrome_sandbox"
-
   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 [[ "$WATIR_WEBDRIVER_BROWSER" = "phantomjs" ]]; then
-  PHANTOMJS_NAME=phantomjs-1.9.0-linux-x86_64
-  curl -L -O "https://phantomjs.googlecode.com/files/$PHANTOMJS_NAME.tar.bz2"
-  tar -xvjf $PHANTOMJS_NAME.tar.bz2
-  chmod +x $PHANTOMJS_NAME/bin/phantomjs
-  sudo cp $PHANTOMJS_NAME/bin/phantomjs /usr/local/phantomjs/bin/phantomjs
-  phantomjs --version
-fi

data/watir-webdriver.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "activesupport", "~> 3.0" # for pluralization during code generation
   s.add_development_dependency "pry"
   s.add_development_dependency "coveralls"
-  s.add_development_dependency "yard-doctest", "0.1.4"
+  s.add_development_dependency "yard-doctest", "~> 0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -168,16 +168,16 @@ dependencies:
   name: yard-doctest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
 description: WebDriver-backed Watir
 email:
 - jari.bakken@gmail.com
@@ -195,6 +195,7 @@ files:
 - README.md
 - Rakefile
 - lib/watir-webdriver.rb
+- lib/watir-webdriver/after_hooks.rb
 - lib/watir-webdriver/alert.rb
 - lib/watir-webdriver/aliases.rb
 - lib/watir-webdriver/atoms.rb
@@ -308,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: watir-webdriver
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Watir on WebDriver