watir 7.0.0.beta1 → 7.0.0.beta2

data/lib/watir/has_window.rb

@@ -1,5 +1,7 @@
 module Watir
   module HasWindow
+    attr_writer :original_window
+
     #
     # Returns browser windows array.
     #

data/lib/watir/locators.rb

@@ -14,6 +14,10 @@ require 'watir/locators/button/matcher'
 require 'watir/locators/cell/selector_builder'
 require 'watir/locators/cell/selector_builder/xpath'
 
+require 'watir/locators/option/matcher'
+require 'watir/locators/option/selector_builder'
+require 'watir/locators/option/selector_builder/xpath'
+
 require 'watir/locators/row/selector_builder'
 require 'watir/locators/row/selector_builder/xpath'
 

data/lib/watir/locators/element/matcher.rb

@@ -82,7 +82,7 @@ module Watir
           when :tag_name
             element.tag_name.downcase
           when :text
-            execute_js(:getTextContent, element)
+            execute_js(:getTextContent, element).gsub(/\s+/, ' ').strip
           when :visible
             element.displayed?
           when :visible_text

data/lib/watir/locators/element/selector_builder.rb

@@ -88,9 +88,6 @@ module Watir
 
         def normalize_locator(how, what)
           case how
-          when 'text'
-            Watir.logger.deprecate "String 'text' as a locator", 'Symbol :text', ids: [:text_string]
-            [:text, what]
           when :tag_name
             what = what.to_s if what.is_a?(::Symbol)
             [how, what]

data/lib/watir/locators/option/matcher.rb

@@ -0,0 +1,24 @@
+module Watir
+  module Locators
+    class Option
+      class Matcher < Element::Matcher
+        def fetch_value(element, how)
+          case how
+          when :any
+            [element.attribute(:value),
+             execute_js(:getTextContent, element).gsub(/\s+/, ' ').strip,
+             element.attribute(:label)]
+          else
+            super
+          end
+        end
+
+        def matches_values?(found, expected)
+          return super unless found.is_a?(Array)
+
+          found.find { |possible| matches_values?(possible, expected) }
+        end
+      end
+    end
+  end
+end

data/lib/watir/locators/option/selector_builder.rb

@@ -0,0 +1,8 @@
+module Watir
+  module Locators
+    class Option
+      class SelectorBuilder < Element::SelectorBuilder
+      end
+    end
+  end
+end

data/lib/watir/locators/option/selector_builder/xpath.rb

@@ -0,0 +1,37 @@
+module Watir
+  module Locators
+    class Option
+      class SelectorBuilder
+        class XPath < Element::SelectorBuilder::XPath
+          private
+
+          def attribute_string
+            result = if @selector.key?(:any)
+                       to_match = @selector.delete :any
+                       value = process_attribute(:value, to_match)
+                       text = process_attribute(:text, to_match)
+                       label = process_attribute(:label, to_match)
+                       "[#{value} or #{text} or #{label}]"
+                     else
+                       ''
+                     end
+
+            attributes = @selector.keys.map { |key|
+              process_attribute(key, @selector.delete(key))
+            }.flatten.compact
+            attribute_values = attributes.empty? ? '' : "[#{attributes.join(' and ')}]"
+            "#{result}#{attribute_values}"
+          end
+
+          def add_to_matching(key, regexp, results = nil)
+            return unless results.nil? || requires_matching?(results, regexp)
+
+            return super unless %i[value text label].include? key
+
+            @built[:any] = regexp
+          end
+        end
+      end
+    end
+  end
+end

data/lib/watir/logger.rb

@@ -16,84 +16,13 @@ module Watir
   #   Watir.logger.info('This is info message')
   #   Watir.logger.warn('This is warning message')
   #
-  class Logger
-    extend Forwardable
-    include ::Logger::Severity
-
-    def_delegators :@logger, :debug, :debug?,
-                   :info, :info?,
-                   :warn?,
-                   :error, :error?,
-                   :fatal, :fatal?,
-                   :level, :level=
-
-    def initialize(progname = 'Watir')
-      @logger = create_logger($stdout)
-      @logger.progname = progname
-      @ignored = []
-    end
-
-    def ignore(ids)
-      @ignored.concat Array(ids).map(&:to_s)
-    end
-
-    def output=(io)
-      @logger.reopen(io)
-    end
-
-    #
-    # Only log a warn message if it is not set to be ignored.
-    #
-    def warn(message, ids: [], &block)
-      msg = ids.empty? ? '' : "[#{ids.map!(&:to_s).map(&:inspect).join(', ')}] "
-      msg += message
-      @logger.warn(msg, &block) unless (@ignored & ids).any?
-    end
-
-    #
-    # Returns IO object used by logger internally.
-    #
-    # Normally, we would have never needed it, but we want to
-    # use it as IO object for all child processes to ensure their
-    # output is redirected there.
-    #
-    # It is only used in debug level, in other cases output is suppressed.
-    #
-    # @api private
-    #
-    def io
-      @logger.instance_variable_get(:@logdev).instance_variable_get(:@dev)
-    end
-
-    #
-    # Marks code as deprecated with replacement.
-    #
-    # @param [String] old
-    # @param [String] new
-    #
-    def deprecate(old, new, reference: '', ids: [])
-      return if @ignored.include?('deprecations') || (@ignored & ids.map!(&:to_s)).any?
-
-      msg = ids.empty? ? '' : "[#{ids.map(&:inspect).join(', ')}] "
-      ref_msg = reference.empty? ? '.' : "; see explanation for this deprecation: #{reference}."
-      warn "[DEPRECATION] #{msg}#{old} is deprecated. Use #{new} instead#{ref_msg}"
+  class Logger < Selenium::WebDriver::Logger
+    def initialize
+      super('Watir')
     end
 
     def selenium=(val)
       Selenium::WebDriver.logger.level = val
     end
-
-    private
-
-    def create_logger(output)
-      logger = ::Logger.new(output)
-      logger.progname = 'Watir'
-      logger.level = ($DEBUG ? DEBUG : WARN)
-      logger.formatter = proc do |severity, time, progname, msg|
-        "#{time.strftime('%F %T')} #{severity} #{progname} #{msg}\n"
-      end
-
-      logger
-    end
   end
 end

data/lib/watir/radio_set.rb

@@ -139,6 +139,7 @@ module Watir
       end
       raise UnknownObjectException, "Unable to locate radio matching #{str_or_rx.inspect}"
     end
+    alias set select
 
     #
     # Returns true if any of the radio button label matches the given value.

data/lib/watir/screenshot.rb

@@ -1,14 +1,8 @@
 module Watir
   class Screenshot
     def initialize(browser)
-      if browser.is_a? Selenium::WebDriver::Driver
-        msg = 'Initializing `Watir::Screenshot` with a `Selenium::Driver` instance', 'a `Watir::Browser` instance'
-        Watir.logger.deprecate msg, ids: [:screenshot_driver]
-        @driver = browser
-      else
-        @browser = browser
-        @driver = browser.wd
-      end
+      @browser = browser
+      @driver = browser.wd
     end
 
     #

data/lib/watir/user_editable.rb

@@ -15,16 +15,23 @@ module Watir
     alias value= set
 
     #
-    # Uses JavaScript to enter most of the given value.
-    # Selenium is used to enter the first and last characters
+    # Returns true if element is user_editable because it has a content_editable attribute set
     #
-    # @param [String, Symbol] args
+    # @return [Boolean]
     #
 
     def content_editable
       defined?(@content_editable) && content_editable?
     end
 
+    #
+    # Uses JavaScript to enter most of the given value.
+    # Selenium is used to enter the first and last characters
+    # This might provide a performance improvement when entering a lot of text on a local machine
+    #
+    # @param [String, Symbol] args
+    #
+
     def set!(*args)
       msg = '#set! does not support special keys, use #set instead'
       raise ArgumentError, msg if args.any? { |v| v.is_a?(::Symbol) }

data/lib/watir/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = '7.0.0.beta1'.freeze
+  VERSION = '7.0.0.beta2'.freeze
 end

data/lib/watir/window.rb

@@ -179,10 +179,21 @@ module Watir
     #   end
     #
 
-    def use(&blk)
-      @browser.original_window ||= current_window
+    def use
       wait_for_exists
-      @driver.switch_to.window(handle, &blk)
+      cache_current = current_window
+      @browser.original_window ||= cache_current
+      restore_to = unless cache_current == handle
+                     @driver.switch_to.window(handle)
+                     cache_current
+                   end
+      if block_given?
+        begin
+          yield
+        ensure
+          @driver.switch_to.window(restore_to) if restore_to
+        end
+      end
       self
     end
 
@@ -205,7 +216,7 @@ module Watir
     end
 
     def assert_exists
-      return if @driver.window_handles.include?(handle)
+      return if !handle.nil? && @driver.window_handles.include?(handle)
 
       raise(NoMatchingWindowFoundException, selector_string)
     end

data/lib/watir/window_collection.rb

@@ -39,6 +39,15 @@ module Watir
     end
     alias eql? ==
 
+    def restore!
+      return if @browser.closed?
+
+      window_list.reject { |win| win.handle == @browser.original_window.handle }.each(&:close)
+      @browser.original_window.use
+    rescue StandardError
+      @browser.close
+    end
+
     def reset!
       @window_list = nil
     end

data/lib/watirspec.rb

@@ -53,7 +53,9 @@ module WatirSpec
       @implementation = imp
     end
 
-    def new_browser
+    def new_browser(pause = 1)
+      sleep pause
+
       klass = WatirSpec.implementation.browser_class
       args = Array(WatirSpec.implementation.browser_args).map { |e| e.is_a?(Hash) ? e.dup : e }
 
@@ -80,7 +82,7 @@ module WatirSpec
       info << @implementation.driver_info
 
       Watir.logger.warn "running watirspec against #{info.join ' '} using:\n#{WatirSpec.implementation.inspect_args}",
-                        ids: [:browser_info]
+                        id: [:browser_info]
     rescue StandardError
       # ignored
     end

data/lib/watirspec/guards.rb

@@ -21,7 +21,7 @@ module WatirSpec
             guard_name = "#{guard[:name]}:".ljust(15)
             str << " \t#{guard_name} #{guard[:data].inspect}\n"
           end
-          Watir.logger.warn str, ids: [:guard_names]
+          Watir.logger.warn str, id: [:guard_names]
         end
       end
     end # class << self

data/lib/watirspec/server.rb

@@ -56,7 +56,7 @@ module WatirSpec
 
         client.write(response(status, headers, body))
       rescue Errno::ECONNRESET
-        Watir.logger.warn 'Client reset connection, skipping.', ids: [:reset_connection]
+        Watir.logger.warn 'Client reset connection, skipping.', id: [:reset_connection]
       ensure
         client.close
       end

data/spec/spec_helper.rb

@@ -20,13 +20,3 @@ end
 require 'watir'
 require 'locator_spec_helper'
 require 'rspec'
-
-if ENV['AUTOMATIC_RETRY']
-  require 'rspec/retry'
-  RSpec.configure do |config|
-    config.verbose_retry = true
-    config.display_try_failure_messages = true
-    config.default_retry_count = 3
-    config.exceptions_to_retry = [IOError, Net::ReadTimeout]
-  end
-end

data/spec/unit/capabilities_spec.rb

@@ -1,4 +1,4 @@
-require 'watirspec_helper'
+require_relative 'unit_helper'
 
 describe Watir::Capabilities do
   before(:all) { Watir.logger.ignore(:watir_client) }

data/spec/unit/match_elements/element_spec.rb

@@ -332,6 +332,17 @@ describe Watir::Locators::Element::Matcher do
     end
 
     context 'when matching Regular Expressions' do
+      it 'with white space' do
+        allow(browser).to receive(:execute_script).and_return("\n match this \n", 'no', 'match  this')
+
+        elements = [wd_element,
+                    wd_element,
+                    wd_element]
+        @values_to_match = {text: /^match this$/}
+
+        expect(matcher.match(elements, values_to_match, @filter)).to eq [elements[0], elements[2]]
+      end
+
       it 'with tag_name' do
         elements = [wd_element(tag_name: 'div'),
                     wd_element(tag_name: 'span'),

data/spec/watirspec/after_hooks_spec.rb

@@ -85,14 +85,12 @@ describe 'Browser::AfterHooks' do
       expect(@yield).to be true
     end
 
-    bug 'https://gist.github.com/titusfortner/bd32f27ec2458b3a733d83374d156940', :safari do
-      it 'runs after_hooks after Element#submit' do
-        browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-        @page_after_hook = proc { @yield = browser.div(id: 'messages').text == 'submit' }
-        browser.after_hooks.add @page_after_hook
-        browser.form(id: 'new_user').submit
-        expect(@yield).to be true
-      end
+    it 'runs after_hooks after Element#submit' do
+      browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
+      @page_after_hook = proc { @yield = browser.div(id: 'messages').text == 'submit' }
+      browser.after_hooks.add @page_after_hook
+      browser.form(id: 'new_user').submit
+      expect(@yield).to be true
     end
 
     it 'runs after_hooks after Element#double_click' do
@@ -115,28 +113,6 @@ describe 'Browser::AfterHooks' do
       expect(@yield).to be true
     end
 
-    it 'runs after_hooks after FramedDriver#switch!' do
-      browser.goto(WatirSpec.url_for('iframes.html'))
-      @page_after_hook = proc { @yield = browser.title == 'Iframes' }
-      browser.after_hooks.add @page_after_hook
-
-      browser.iframe.element(css: '#senderElement').exists?
-
-      expect(@yield).to be true
-    end
-
-    it 'runs after_hooks after Browser#ensure_context if not @default_context' do
-      browser.goto(WatirSpec.url_for('iframes.html'))
-      browser.iframe.element(css: '#senderElement').locate
-
-      @page_after_hook = proc { @yield = browser.title == 'Iframes' }
-      browser.after_hooks.add @page_after_hook
-
-      browser.locate
-
-      expect(@yield).to be true
-    end
-
     it 'runs after_hooks after Alert#ok' do
       browser.goto(WatirSpec.url_for('alerts.html'))
       @page_after_hook = proc { @yield = browser.title == 'Alerts' }
@@ -187,21 +163,22 @@ describe 'Browser::AfterHooks' do
       browser.alert.ok
     end
 
-    bug 'Clicking an Element that Closes a Window is returning NoMatchingWindowFoundException', :safari do
-      bug 'https://github.com/mozilla/geckodriver/issues/1847', :firefox do
-        it 'does not raise error when running error checks on closed window' do
-          url = WatirSpec.url_for('window_switching.html')
-          @page_after_hook = proc { browser.url }
-          browser.after_hooks.add @page_after_hook
-          browser.goto url
-          browser.a(id: 'open').click
-
-          window = browser.window(title: 'closeable window')
-          window.use
-          expect { browser.a(id: 'close').click }.to_not raise_error
-          browser.original_window.use
-        end
-      end
+    it 'does not raise error when running error checks on closed window',
+       except: {browser: :safari,
+                reason: 'Clicking an Element that Closes a Window is returning NoMatchingWindowFoundException'},
+       exclude: {browser: :firefox,
+                 platform: :windows,
+                 reason: 'https://github.com/mozilla/geckodriver/issues/1847'} do
+      url = WatirSpec.url_for('window_switching.html')
+      @page_after_hook = proc { browser.url }
+      browser.after_hooks.add @page_after_hook
+      browser.goto url
+      browser.a(id: 'open').click
+
+      window = browser.window(title: 'closeable window')
+      window.use
+      expect { browser.a(id: 'close').click }.to_not raise_error
+      browser.original_window.use
     end
   end