watir 6.14.0 → 6.15.0

data/spec/watirspec/window_switching_spec.rb

@@ -226,7 +226,18 @@ describe 'Window' do
             browser.window(title: 'closeable window').use
             browser.a(id: 'close').click
             Watir::Wait.until { browser.windows.size == 1 }
-            expect(browser.window).to_not be_present
+            expect(browser.window).to_not exist
+          end
+
+          it 'returns false if window closes during iteration' do
+            browser.window(title: 'closeable window').use
+            original_handle = browser.original_window.instance_variable_get('@handle')
+            handles = browser.windows.map { |w| w.instance_variable_get('@handle') }
+
+            browser.a(id: 'close').click
+            Watir::Wait.until { browser.windows.size == 1 }
+            allow(browser.wd).to receive(:window_handles).and_return(handles, [original_handle])
+            expect(browser.window(title: 'closeable window')).to_not exist
           end
         end
       end
@@ -272,6 +283,48 @@ describe 'Window' do
         end
       end
     end
+
+    it 'raises an exception when using an element on a closed window' do
+      window = browser.window(title: 'closeable window')
+      window.use
+      browser.a(id: 'close').click
+      msg = 'browser window was closed'
+      expect { browser.a.text }.to raise_exception(Watir::Exception::NoMatchingWindowFoundException, msg)
+    end
+
+    it 'raises an exception when locating a closed window' do
+      browser.window(title: 'closeable window').use
+      handles = browser.windows.map(&:handle)
+      browser.a(id: 'close').click
+      allow(browser.wd).to receive(:window_handles).and_return(handles, [browser.original_window.handle])
+      expect { browser.window(title: 'closeable window').use }.to raise_no_matching_window_exception
+    end
+
+    it 'raises an exception when locating a window closed during lookup' do
+      browser.window(title: 'closeable window').use
+      browser.a(id: 'close-delay').click
+
+      begin
+        module Watir
+          class Browser
+            alias title_old title
+
+            def title
+              sleep 0.5
+              title_old
+            end
+          end
+        end
+
+        expect { browser.window(title: 'closeable window').use }.to raise_no_matching_window_exception
+      ensure
+        module Watir
+          class Browser
+            alias title title_old
+          end
+        end
+      end
+    end
   end
 
   bug 'https://bugzilla.mozilla.org/show_bug.cgi?id=1223277', :firefox do

data/spec/watirspec_helper.rb

@@ -1,6 +1,8 @@
 require 'watirspec'
 require 'spec_helper'
 
+Watir.default_timeout = 8
+
 if ENV['SELENIUM_STATS'] == 'true'
   require 'selenium_statistics'
   at_exit { SeleniumStatistics.print_results }

data/watir.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'selenium-webdriver', '~> 3.4', '>= 3.4.1'
+  s.add_runtime_dependency 'regexp_parser', '~>1.2'
 
   s.add_development_dependency 'activesupport', '~> 4.0', '>= 4.1.11' # for pluralization during code generation
   s.add_development_dependency 'coveralls'
@@ -35,9 +36,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake', '~> 0.9.2'
   s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rspec-retry'
   s.add_development_dependency 'rubocop', '~> 0.59'
   s.add_development_dependency 'selenium_statistics'
-  s.add_development_dependency 'webdrivers', '~> 3.4'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'simplecov-console'
+  # This forces chromedriver 2.42 since 2.43 breaks some alert / windows things
+  # https://bugs.chromium.org/p/chromedriver/issues/detail?id=2615
+  s.add_development_dependency 'webdrivers', '= 3.4.1'
   s.add_development_dependency 'webidl', '>= 0.2.2'
   s.add_development_dependency 'yard', '> 0.8.2.1'
   s.add_development_dependency 'yard-doctest', '>= 0.1.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.14.0
+  version: 6.15.0
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -31,6 +31,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.1
+- !ruby/object:Gem::Dependency
+  name: regexp_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +149,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -163,20 +191,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: webidl
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +360,7 @@ files:
 - lib/watir/js_snippets.rb
 - lib/watir/js_snippets/attributeValues.js
 - lib/watir/js_snippets/backgroundColor.js
+- lib/watir/js_snippets/elementObscured.js
 - lib/watir/js_snippets/fireEvent.js
 - lib/watir/js_snippets/focus.js
 - lib/watir/js_snippets/getInnerHtml.js
@@ -316,24 +373,30 @@ files:
 - lib/watir/js_snippets/selectOptionsValue.js
 - lib/watir/js_snippets/selectText.js
 - lib/watir/js_snippets/selectedOptions.js
+- lib/watir/js_snippets/selectedText.js
 - lib/watir/js_snippets/setText.js
 - lib/watir/js_snippets/setValue.js
 - lib/watir/legacy_wait.rb
 - lib/watir/locators.rb
+- lib/watir/locators/anchor/selector_builder.rb
 - lib/watir/locators/button/locator.rb
 - lib/watir/locators/button/selector_builder.rb
 - lib/watir/locators/button/selector_builder/xpath.rb
 - lib/watir/locators/button/validator.rb
 - lib/watir/locators/cell/locator.rb
 - lib/watir/locators/cell/selector_builder.rb
+- lib/watir/locators/cell/selector_builder/xpath.rb
 - lib/watir/locators/element/locator.rb
 - lib/watir/locators/element/selector_builder.rb
+- lib/watir/locators/element/selector_builder/regexp_disassembler.rb
 - lib/watir/locators/element/selector_builder/xpath.rb
+- lib/watir/locators/element/selector_builder/xpath_support.rb
 - lib/watir/locators/element/validator.rb
 - lib/watir/locators/row/locator.rb
 - lib/watir/locators/row/selector_builder.rb
-- lib/watir/locators/text_area/locator.rb
+- lib/watir/locators/row/selector_builder/xpath.rb
 - lib/watir/locators/text_area/selector_builder.rb
+- lib/watir/locators/text_area/selector_builder/xpath.rb
 - lib/watir/locators/text_field/locator.rb
 - lib/watir/locators/text_field/selector_builder.rb
 - lib/watir/locators/text_field/selector_builder/xpath.rb
@@ -348,7 +411,6 @@ files:
 - lib/watir/wait.rb
 - lib/watir/wait/timer.rb
 - lib/watir/window.rb
-- lib/watir/xpath_support.rb
 - lib/watirspec.rb
 - lib/watirspec/guards.rb
 - lib/watirspec/implementation.rb
@@ -360,6 +422,8 @@ files:
 - spec/implementation_spec.rb
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
+- spec/unit/anchor_locator_spec.rb
+- spec/unit/capabilities_spec.rb
 - spec/unit/container_spec.rb
 - spec/unit/element_locator_spec.rb
 - spec/unit/logger_spec.rb
@@ -510,6 +574,7 @@ files:
 - spec/watirspec/html/nested_iframes.html
 - spec/watirspec/html/nested_tables.html
 - spec/watirspec/html/non_control_elements.html
+- spec/watirspec/html/obscured.html
 - spec/watirspec/html/removed_element.html
 - spec/watirspec/html/right_click.html
 - spec/watirspec/html/special_chars.html
@@ -522,6 +587,11 @@ files:
 - spec/watirspec/radio_set_spec.rb
 - spec/watirspec/relaxed_locate_spec.rb
 - spec/watirspec/screenshot_spec.rb
+- spec/watirspec/selector_builder/button_spec.rb
+- spec/watirspec/selector_builder/cell_spec.rb
+- spec/watirspec/selector_builder/element_spec.rb
+- spec/watirspec/selector_builder/row_spec.rb
+- spec/watirspec/selector_builder/text_spec.rb
 - spec/watirspec/special_chars_spec.rb
 - spec/watirspec/support/rspec_matchers.rb
 - spec/watirspec/user_editable_spec.rb
@@ -561,6 +631,8 @@ test_files:
 - spec/implementation_spec.rb
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
+- spec/unit/anchor_locator_spec.rb
+- spec/unit/capabilities_spec.rb
 - spec/unit/container_spec.rb
 - spec/unit/element_locator_spec.rb
 - spec/unit/logger_spec.rb
@@ -711,6 +783,7 @@ test_files:
 - spec/watirspec/html/nested_iframes.html
 - spec/watirspec/html/nested_tables.html
 - spec/watirspec/html/non_control_elements.html
+- spec/watirspec/html/obscured.html
 - spec/watirspec/html/removed_element.html
 - spec/watirspec/html/right_click.html
 - spec/watirspec/html/special_chars.html
@@ -723,6 +796,11 @@ test_files:
 - spec/watirspec/radio_set_spec.rb
 - spec/watirspec/relaxed_locate_spec.rb
 - spec/watirspec/screenshot_spec.rb
+- spec/watirspec/selector_builder/button_spec.rb
+- spec/watirspec/selector_builder/cell_spec.rb
+- spec/watirspec/selector_builder/element_spec.rb
+- spec/watirspec/selector_builder/row_spec.rb
+- spec/watirspec/selector_builder/text_spec.rb
 - spec/watirspec/special_chars_spec.rb
 - spec/watirspec/support/rspec_matchers.rb
 - spec/watirspec/user_editable_spec.rb

data/lib/watir/locators/text_area/locator.rb

@@ -1,13 +0,0 @@
-module Watir
-  module Locators
-    class TextArea
-      class Locator < Element::Locator
-        private
-
-        def can_convert_regexp_to_contains?
-          false
-        end
-      end
-    end
-  end
-end

data/lib/watir/xpath_support.rb

@@ -1,18 +0,0 @@
-module Watir
-  module XpathSupport
-    def self.escape(value)
-      if value.include? "'"
-        parts = value.split("'", -1).map { |part| "'#{part}'" }
-        string = parts.join(%(,"'",))
-
-        "concat(#{string})"
-      else
-        "'#{value}'"
-      end
-    end
-
-    def self.downcase(value)
-      "translate(#{value},'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"
-    end
-  end # XpathSupport
-end # Watir