watir 6.4.0.rc1 → 6.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b67d137fb553725a3560f0a319874cc5306ccb4
-  data.tar.gz: 94a5b69d2a27b360ba506e974553fec6f5b7dcf8
+  metadata.gz: eec68739222be0a5bf1c319c164f3bbb78c0cfaa
+  data.tar.gz: 4d8ccb213aa1e2bb778ca6d83d751917f2f46dfb
 SHA512:
-  metadata.gz: 57eff53b2276128e6b44b27c840159aabe135e24b0fb76d255ab67d656de25e525ff90f1a9ff99ae8059410870fd424ddb53db3dab41495f177246d8f1410590
-  data.tar.gz: '08692e0b7d43a2b9aa9092ce1a2009f72d1bce025bf5f8918a6d7167353c08c9a23808230179694267d62c94962c5bfb97d0d45bebf8e1f2cd75a04d21f4b489'
+  metadata.gz: 1b287dce03a6b3a81ba1757b13ebe9440e75127b50e76b8f705b26f70d9593f05e9c0aea431c68e16786b5a4cbff712524c0b365e7ee4bfd77184bb44b6a770b
+  data.tar.gz: dc82c3c2faa4eb0efe2f4385baaa4d70649cff116f98b4902a13d9c8f8d5240629b9a032c8d8346d02e2a9d9b34aafb559de85c0a5411532d829c01c18cf86dc

data/.travis.yml

@@ -1,5 +1,8 @@
+# Please note that we should not be using container-based infrastructure
+# because Chrome requires a lot of shared memory and Travis does not allow
+# use host's /dev/shm.
+sudo: required
 dist: trusty
-sudo: require
 rvm:
   - 2.2.7
   - 2.3.4

data/CHANGES.md

@@ -1,4 +1,4 @@
-### 6.4.0.rc1 (2017-06-21)
+### 6.4.0 (unreleased)
 
 * Significant performance updates
 

data/lib/watir/elements/element.rb

@@ -523,6 +523,13 @@ module Watir
     end
 
     def wait_for_enabled
+      case self
+      when Input, Button, Select, Option
+        # noop
+      else
+        wait_for_exists && return
+      end
+
       return assert_enabled unless Watir.relaxed_locate?
 
       begin
@@ -650,20 +657,11 @@ module Watir
       already_locked = Wait.timer.locked?
       Wait.timer = Wait::Timer.new(timeout: Watir.default_timeout) unless already_locked
       begin
-        if exist_check == :wait_for_enabled
-          if self.is_a?(Input) || self.is_a?(Button) || self.is_a?(Select) || self.is_a?(Option)
-            wait_for_enabled
-          else
-            wait_for_exists
-          end
-        else
-          send(exist_check)
-        end
-
+        send exist_check
         yield
       rescue Selenium::WebDriver::Error::StaleElementReferenceError
         retry
-      rescue Selenium::WebDriver::Error::ElementNotVisibleError, Selenium::WebDriver::Error::ElementNotInteractableError
+      rescue Selenium::WebDriver::Error::ElementNotVisibleError, interact_error
         raise_present unless Wait.timer.remaining_time > 0
         raise_present unless exist_check == :wait_for_present || exist_check == :wait_for_enabled
         retry
@@ -679,6 +677,17 @@ module Watir
       end
     end
 
+
+    # Support for Selenium < 3.4.1 with latest Geckodriver
+    def interact_error
+      if defined?(Selenium::WebDriver::Error::ElementNotInteractable)
+        Selenium::WebDriver::Error::ElementNotInteractable
+      else
+        Selenium::WebDriver::Error::ElementNotInteractableError
+      end
+    end
+
+
     def method_missing(meth, *args, &blk)
       method = meth.to_s
       if method =~ Locators::Element::SelectorBuilder::WILDCARD_ATTRIBUTE

data/spec/watirspec_helper.rb

@@ -163,10 +163,6 @@ class ImplementationConfig
       Selenium::WebDriver::Chrome.path = path
     end
 
-    if ENV['TRAVIS']
-      opts[:args] << "--no-sandbox" # https://github.com/travis-ci/travis-ci/issues/938
-    end
-
     opts
   end
 

data/support/doctest_helper.rb

@@ -9,15 +9,7 @@ require 'watirspec'
 #
 
 def browser
-  @browser ||= begin
-    opts = {}
-    opts[:args] = ['--no-sandbox'] if ENV['TRAVIS']
-
-    browser = Watir::Browser.new(:chrome, opts)
-    browser.goto WatirSpec.url_for('forms_with_input_elements.html')
-
-    browser
-  end
+  $browser ||= Watir::Browser.new(:chrome)
 end
 
 YARD::Doctest.configure do |doctest|
@@ -29,6 +21,17 @@ YARD::Doctest.configure do |doctest|
   doctest.skip 'Watir::Window#size'
   doctest.skip 'Watir::Window#position'
 
+  doctest.before do
+    WatirSpec.run!
+    sleep 1 # give Chrome some time to breathe in
+    browser.goto WatirSpec.url_for('forms_with_input_elements.html')
+  end
+
+  doctest.after do
+    sleep 1 # give Chrome some time to breathe out
+    browser.windows.drop(1).each(&:close)
+  end
+
   %w[text ok close exists? present?].each do |name|
     doctest.before("Watir::Alert##{name}") do
       browser.goto WatirSpec.url_for('alerts.html')
@@ -41,6 +44,12 @@ YARD::Doctest.configure do |doctest|
     browser.button(id: 'prompt').click
   end
 
+  %w[text exists? present?].each do |name|
+    doctest.after("Watir::Alert##{name}") do
+      browser.alert.close
+    end
+  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')
@@ -64,13 +73,10 @@ YARD::Doctest.configure do |doctest|
     end
   end
 
-  doctest.before do
-    WatirSpec.run!
-  end
-
-  doctest.after do
-    browser.quit
-    @browser = nil
+  doctest.after('Watir::AfterHooks') do
+    browser.after_hooks.each do |hook|
+      browser.after_hooks.delete(hook)
+    end
   end
 end
 

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.4.0.rc1'
+  s.version     = '6.4.0.rc2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Alex Rodionov', 'Titus Fortner']
   s.email       = ['p0deje@gmail.com', 'titusfortner@gmail.com']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.4.0.rc1
+  version: 6.4.0.rc2
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver