watir 6.19.0 → 7.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 249f59d4a6bd6bff5ddd7e49d32e2cc5a3ecd887586de1a41d51aecc37c6946a
-  data.tar.gz: 407024609aa1b7e0eb052ecbcc279ebdfcb6e486e326ee8f1dd0994b79f4be75
+  metadata.gz: 84196be031b435273f620aea6539dfb373602174b861fe624faf8591b3a803b6
+  data.tar.gz: 934de2c077de5657f76fdbc7dc4f6c8c4b9408f278b644b9e01b5c5b7f8d401b
 SHA512:
-  metadata.gz: f89c38c9bd61bef959ebb41672e729be867ad7991530f6f432dddae7900db15c31dfd717d413cc500f5f2708a3ce500b3d9687091d603ca4e4acbfbbc5af20cc
-  data.tar.gz: 34f9dc6a5e675c734c4a2e5e5c234695204b23ba887268f523c95d72f33a0b5b02c843fcd61033592c8e937b721d86bc80b790e9b06c4c9ca4d03f7b55df7357
+  metadata.gz: 8f51aeb6d0f69bf20150a689b4e29ba5fb6217abd735e9a18c9917ce60dab6810a3d43b10581ae19fb85b23e7231a1cd541fdfd255cc17a80a58c78f308973a6
+  data.tar.gz: 5130d9bc13f3ac40b247756d009813c6cb99584e6744a1f883b3beede4a51099a778549e6e9a15f273784aed5fe1849ac384161947e38dfc770deef0b051ec45

data/.github/actions/install-chrome/action.yml

@@ -1,4 +1,5 @@
 name: 'Install Chrome'
+description: 'Install Chrome Stable'
 runs:
   using: "composite"
   steps:

data/.github/actions/setup-linux/action.yml

@@ -0,0 +1,8 @@
+name: 'Setup Linux'
+description: 'Run Linux in Virtual Desktop'
+runs:
+  using: "composite"
+  steps:
+    - shell: bash
+      run: |
+        Xvfb :99 &

data/.github/workflows/tests.yml

@@ -0,0 +1,104 @@
+name: All Tests
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  documentation-test:
+    name: Yard Doctest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - run: bundle install
+      - uses: ./.github/actions/install-chrome
+      - uses: ./.github/actions/setup-linux
+      - run: |
+          bundle exec rake yard:doctest
+
+  unit-test:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.5', '2.6', '2.7', '3.0']
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - uses: ./.github/actions/install-chrome
+      - uses: ./.github/actions/setup-linux
+      - run: |
+          bundle exec rake spec:unit
+        env:
+          DISPLAY: :99
+
+  linter-test:
+    name: Rubocop Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - run: bundle install
+      - run: bundle exec rubocop
+
+  local-tests:
+    name: Local Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        ruby: [ 2.6, 3.0 ]
+        task: [ chrome, firefox, edge ]
+        include:
+          - os: 'macos-latest'
+            ruby: 2.6
+            task: 'safari'
+          - os: 'macos-latest'
+            ruby: 3.0
+            task: 'safari'
+          - os: 'windows-latest'
+            ruby: 2.6
+            task: 'ie'
+          - os: 'windows-latest'
+            ruby: 3.0
+            task: 'ie'
+        exclude:
+          - os: 'ubuntu-latest'
+            task: 'edge'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/install-chrome
+        if: |
+          matrix.task == 'chrome' &&
+          matrix.os == 'ubuntu-latest'
+      - uses: ./.github/actions/setup-linux
+        if:  matrix.os == 'ubuntu-latest'
+      - uses: browser-actions/setup-firefox@latest
+        with:
+          firefox-version: '86.0'
+        if: matrix.task == 'firefox'
+      - uses: ./.github/actions/enable-safari
+        if: matrix.task == 'safari'
+      - run: |
+          echo "COVERAGE=true" >> $GITHUB_ENV
+        if: |
+          matrix.os == 'ubuntu-latest' ||
+          matrix.os == 'macos-latest'
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: |
+          bundle exec rake spec:${{ matrix.task }}
+        env:
+          DISPLAY: :99

data/.rubocop.yml

@@ -19,17 +19,12 @@ Lint/UnifiedInteger:
 
 # Default: 17
 Metrics/AbcSize:
-  Max: 20
+  Max: 22
   Exclude:
-    - 'lib/watir/capabilities.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/locator.rb'
+    - 'lib/watir/locators/element/selector_builder/*.rb'
     - 'lib/watir/generator/base/generator.rb'
-    - 'lib/watir/generator/base/visitor.rb'
     - 'spec/locator_spec_helper.rb'
-    - 'spec/watirspec_helper.rb'
 
 Metrics/BlockLength:
   Exclude:

data/CHANGES.md

@@ -1,3 +1,41 @@
+### 7.0.0.beta4 (2021-05-29)
+
+* Fix Bug in using negative class names within a collection (#934)
+
+### 7.0.0.beta3 (2021-05-05)
+
+* Fix Bug preventing proper use of vendor extension capabilities
+* Changed how timeouts are supported in Watir Capabilities (#932)
+* Changed the default Alert Behavior not to automatically get dismissed when an exception happens (#931)
+
+### 7.0.0.beta2 (2021-03-28)
+
+* Replace Watir Logger implementation with Selenium Logger subclass
+* Change Watir Guards to use Selenium's new Guards. Tests run as pending when guarded.
+* Implement `#set` as standard interface for each Input Element (#405)
+* Implement `Element#set` to take correct `#set` behavior based on evaluated element (#664)
+* Optimize Performance for Select Lists (#846)
+* Allow user to set values on Select List exclusively by `:label`, `:text`, or `:value` (#846)
+* Allow user to check if option selected in Select List by `:label`, `:text`, or `:value` (#929)
+* Implement `Window#restore!` to return to original Window and close all others (#923)
+* Minor performance improvement for iterating over windows (#923)
+* Implement `Browser#closed?`; same as `Browser#exists?` without the Windows checks (#923)
+* Update methods that use Selenium's Actions class to scroll element into view before acting (#847)
+* Fix bug for `:text` locator with `Regexp` value based on whitespace (#924)
+* Remove executing after hooks when changing frames (#888)
+
+### 7.0.0.beta1 (2021-03-18)
+
+* Requires Selenium 4
+* Supports Ruby 3
+* Add support for Microsoft Edge Chromium
+* Remove support for all deprecated functionality
+
+### 6.19.1 (2021-03-17)
+
+* Fix bug preventing using Selenium 4
+* Fix bug preventing non-xml characters in attributes (#787)
+
 ### 6.19.0 (2021-03-12)
 
 * Create custom Watir HTTP Client

data/README.md

@@ -3,10 +3,7 @@
 Watir Powered By Selenium!
 
 [![Gem Version](https://badge.fury.io/rb/watir.svg)](http://badge.fury.io/rb/watir)
-[![Unit Tests](https://github.com/watir/watir/workflows/Unit%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Unit+Tests%22)
-[![Mac Tests](https://github.com/watir/watir/workflows/Mac%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Mac+Tests%22)
-[![Windows Tests](https://github.com/watir/watir/workflows/Windows%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Windows+Tests%22)
-[![Linux Tests](https://github.com/watir/watir/workflows/Linux%20Tests/badge.svg)](https://github.com/watir/watir/actions?query=workflow%3A%22Linux+Tests%22)
+[![All Tests](https://github.com/watir/watir/actions/workflows/tests.yml/badge.svg)](https://github.com/watir/watir/actions/workflows/tests.yml)
 [![Code Climate](https://codeclimate.com/github/watir/watir.svg)](https://codeclimate.com/github/watir/watir)
 [![Coverage Status](https://coveralls.io/repos/github/watir/watir/badge.svg?branch=main)](https://coveralls.io/github/watir/watir?branch=main)
 

data/Rakefile

@@ -25,7 +25,7 @@ end
 
 {
   html: 'https://www.w3.org/TR/html52/single-page.html',
-  svg: 'http://www.w3.org/TR/SVG2/single-page.html'
+  svg: 'https://www.w3.org/TR/2018/CR-SVG2-20180807/single-page.html'
 }.each do |type, spec_uri|
   namespace type do
     spec_path = "support/#{type}.html"

data/lib/watir.rb

@@ -2,7 +2,6 @@ require 'selenium-webdriver'
 require 'time'
 
 require 'watir/scroll'
-require 'watir/legacy_wait'
 require 'watir/wait'
 require 'watir/exception'
 require 'watir/window'
@@ -24,51 +23,8 @@ require 'watir/logger'
 require 'watir/version'
 
 module Watir
-  @relaxed_locate = true
-
   class << self
-    attr_writer :relaxed_locate, :always_locate, :default_timeout, :prefer_css
-
-    #
-    # Whether or not Watir should wait for an element to be found or present
-    # before taking an action.
-    # Defaults to true.
-    #
-
-    def relaxed_locate?
-      @relaxed_locate
-    end
-
-    #
-    # Whether or not Watir should re-locate a stale Element on use.
-    #
-
-    def always_locate?
-      always_locate_message
-      true
-    end
-
-    def always_locate_message
-      msg = 'Watir#always_locate'
-      repl_msg = 'Element#stale? or Element#wait_until(&:stale?) if needed for flow control'
-      Watir.logger.deprecate msg, repl_msg, ids: [:always_locate]
-    end
-
-    #
-    # Whether or not Watir should prefer CSS when translating the Watir selector to Selenium.
-    #
-
-    def prefer_css?
-      prefer_css_message
-      false
-    end
-
-    def prefer_css_message
-      msg = 'Watir#prefer_css'
-      repl_msg = 'watir_css gem - https://github.com/watir/watir_css'
-
-      Watir.logger.deprecate msg, repl_msg, ids: [:prefer_css]
-    end
+    attr_writer :default_timeout
 
     #
     # Default wait time for wait methods.

data/lib/watir/alert.rb

@@ -1,6 +1,5 @@
 module Watir
   class Alert
-    include EventuallyPresent
     include Waitable
     include Exception
 
@@ -104,13 +103,9 @@ module Watir
     end
 
     def wait_for_exists
-      return assert_exists unless Watir.relaxed_locate?
-
-      begin
-        wait_until(message: 'waiting for alert', &:exists?)
-      rescue Wait::TimeoutError
-        raise UnknownObjectException, 'unable to locate alert'
-      end
+      wait_until(message: 'waiting for alert', &:exists?)
+    rescue Wait::TimeoutError
+      raise UnknownObjectException, 'unable to locate alert'
     end
   end # Alert
 end # Watir

data/lib/watir/browser.rb

@@ -55,16 +55,21 @@ module Watir
       @default_context = true
     end
 
+    # rubocop:disable Metrics/AbcSize
+    # TODO: w3c default behavior does not like checking if alert exists
     def inspect
       if alert.exists?
         format('#<%s:0x%x alert=true>', self.class, hash * 2)
       else
         format('#<%s:0x%x url=%s title=%s>', self.class, hash * 2, url.inspect, title.inspect)
       end
+    rescue Selenium::WebDriver::Error::NoSuchWindowError
+      format('#<%s:0x%x closed=%s>', self.class, hash * 2, closed?)
     rescue Errno::ECONNREFUSED
       format('#<%s:0x%x closed=true>', self.class, hash * 2)
     end
     alias selector_string inspect
+    # rubocop:enable Metrics/AbcSize
 
     #
     # Returns URL of current page.
@@ -101,13 +106,23 @@ module Watir
     #
 
     def close
-      return if @closed
+      return if closed?
 
       @driver.quit
       @closed = true
     end
     alias quit close
 
+    #
+    # Returns true if browser is closed and false otherwise.
+    #
+    # @return [Boolean]
+    #
+
+    def closed?
+      @closed
+    end
+
     #
     # Handles cookies.
     #
@@ -252,12 +267,12 @@ module Watir
     #
 
     def exist?
-      !@closed && window.present?
+      !closed? && window.present?
     end
     alias exists? exist?
 
     def locate
-      raise Error, 'browser was closed' if @closed
+      raise Error, 'browser was closed' if closed?
 
       ensure_context
     end
@@ -267,7 +282,6 @@ module Watir
 
       driver.switch_to.default_content
       @default_context = true
-      after_hooks.run
     end
 
     def browser

data/lib/watir/capabilities.rb

@@ -11,14 +11,14 @@ module Watir
       @options = options.dup
       Watir.logger.info "Creating Browser instance of #{browser} with user provided options: #{@options.inspect}"
 
-      deprecate_options_capabilities
-      deprecate_desired_capabilities
-      deprecate_url_service if @options.key?(:service) && @options.key?(:url)
+      if @options.key?(:capabilities) && @options.key?(:options)
+        raise(ArgumentError, ':capabilities and :options are not both allowed')
+      end
+      raise(ArgumentError, ':url and :service are not both allowed') if @options.key?(:service) && @options.key?(:url)
 
-      @browser = deprecate_remote(browser) || browser.nil? && infer_browser || browser.to_sym
+      @browser = browser.nil? && infer_browser || browser
 
-      @selenium_browser = options[:url] ? :remote : @browser
-      @selenium_opts = {}
+      @selenium_browser = @options.key?(:url) ? :remote : @browser
     end
 
     def to_args
@@ -28,270 +28,125 @@ module Watir
     private
 
     def process_arguments
-      @selenium_opts[:listener] = @options.delete(:listener) if @options.key?(:listener)
+      selenium_opts = {}
+      selenium_opts[:listener] = @options.delete(:listener) if @options.key?(:listener)
 
       if @options.key?(:url)
-        @selenium_opts[:url] = @options.delete(:url)
+        selenium_opts[:url] = @options.delete(:url)
       else
-        process_service(@options.delete(:service))
+        service = process_service
+        selenium_opts[:service] = service if service
       end
 
-      process_http_client
-      process_browser_options
-      process_capabilities
-      Watir.logger.info "Creating Browser instance with Watir processed options: #{@selenium_opts.inspect}"
+      selenium_opts[:http_client] = process_http_client
+      selenium_opts[:capabilities] = @options.delete(:capabilities) || process_browser_options
 
-      @selenium_opts
+      Watir.logger.info "Creating Browser instance with Watir processed options: #{selenium_opts.inspect}"
+      selenium_opts
     end
 
     def process_http_client
       http_client = @options.delete(:http_client) || Watir::HttpClient.new
-      if http_client.is_a?(Hash)
-        http_client = Watir::HttpClient.new(http_client)
-      elsif !http_client.is_a?(Selenium::WebDriver::Remote::Http::Common)
-        raise TypeError, ':http_client must be a Hash or a Selenium HTTP Client instance'
-      end
 
-      unless http_client.is_a?(Watir::HttpClient)
+      case http_client
+      when Hash
+        Watir::HttpClient.new(**http_client)
+      when Watir::HttpClient
+        http_client
+      when Selenium::WebDriver::Remote::Http::Common
         Watir.logger.warn 'Check out the new Watir::HttpClient and let us know if there are missing features you need',
-                          ids: [:watir_client]
-      end
-
-      process_http_client_timeouts(http_client)
-      @selenium_opts[:http_client] = http_client
-    end
-
-    def process_browser_options
-      browser_options = @options.delete(:options) || {}
-      process_w3c_capabilities(browser_options)
-
-      case @browser
-      when :chrome
-        process_chrome_options(browser_options)
-      when :firefox
-        process_firefox_options(browser_options)
-      when :safari
-        process_safari_options(browser_options)
-      when :ie, :internet_explorer
-        process_ie_options(browser_options)
-      end
-    end
-
-    def process_capabilities
-      caps = @options.delete(:capabilities)
-
-      unless @options.empty?
-        Watir.logger.deprecate('passing unrecognized arguments into Browser constructor',
-                               'appropriate keyword to nest all arguments',
-                               ids: %i[unknown_keyword capabilities],
-                               reference: 'http://watir.com/guides/capabilities.html')
-      end
-
-      if caps
-        @selenium_opts.merge!(@options)
+                          id: [:watir_client]
+        http_client
       else
-        caps = Selenium::WebDriver::Remote::Capabilities.send @browser, @options.merge(@w3c_caps)
+        raise TypeError, ':http_client must be a Hash or a Selenium HTTP Client instance'
       end
-
-      @selenium_opts[:desired_capabilities] = caps
     end
 
-    def deprecate_desired_capabilities
-      return unless @options.key?(:desired_capabilities)
-
-      Watir.logger.deprecate(':desired_capabilities to initialize Browser',
-                             ':capabilities or preferably :options',
-                             ids: [:desired_capabilities],
-                             reference: 'http://watir.com/guides/capabilities.html')
-      @options[:capabilities] = @options.delete(:desired_capabilities)
-    end
-
-    def deprecate_url_service
-      Watir.logger.deprecate('allowing Browser initialization with both :url & :service',
-                             'just :service',
-                             ids: [:url_service],
-                             reference: 'http://watir.com/guides/capabilities.html')
-    end
+    def process_browser_options
+      browser_options = @options.delete(:options).dup || {}
+      vendor_caps = process_vendor_capabilities(browser_options)
 
-    def process_http_client_timeouts(http_client)
-      deprecate_client_timeout(http_client) if @options.key? :client_timeout
-      deprecate_open_timeout(http_client) if @options.key? :open_timeout
-      deprecate_read_timeout(http_client) if @options.key? :read_timeout
-    end
+      options = if browser_options.is_a? Selenium::WebDriver::Options
+                  browser_options
+                else
+                  convert_timeouts(browser_options)
+                  Selenium::WebDriver::Options.send(@browser, **browser_options)
+                end
 
-    def deprecate_client_timeout(http_client)
-      Watir.logger.deprecate(':client_timeout to initialize Browser',
-                             ':open_timeout and/or :read_timeout in a Hash with :http_client key',
-                             ids: [:http_client_timeout],
-                             reference: 'http://watir.com/guides/capabilities.html')
-      timeout = @options.delete(:client_timeout)
-      http_client.open_timeout = timeout
-      http_client.read_timeout = timeout
-    end
+      options.unhandled_prompt_behavior ||= :ignore
+      browser_specific_options(options)
+      raise ArgumentError, "#{@options} are unrecognized arguments for Browser constructor" unless @options.empty?
 
-    def deprecate_open_timeout(http_client)
-      Watir.logger.deprecate(':open_timeout to initialize Browser',
-                             ':open_timeout in a Hash with :http_client key',
-                             ids: %i[http_open_timeout capabilities],
-                             reference: 'http://watir.com/guides/capabilities.html')
-      http_client.open_timeout = @options.delete(:open_timeout)
+      vendor_caps << options
     end
 
-    def deprecate_read_timeout(http_client)
-      Watir.logger.deprecate(':read_timeout to initialize Browser',
-                             ':read_timeout in a Hash with :http_client key',
-                             ids: %i[http_read_timeout capabilities],
-                             reference: 'http://watir.com/guides/capabilities.html')
-      http_client.read_timeout = @options.delete(:read_timeout)
-    end
-
-    def process_chrome_options(browser_options)
-      @selenium_opts[:options] = browser_options if browser_options.is_a? Selenium::WebDriver::Chrome::Options
-      @selenium_opts[:options] ||= Selenium::WebDriver::Chrome::Options.new(**browser_options)
-
-      process_args
-
-      return unless @options.delete(:headless)
+    def process_vendor_capabilities(opts)
+      return [] unless opts.is_a? Hash
 
-      @selenium_opts[:options].args << '--headless'
-      @selenium_opts[:options].args << '--disable-gpu'
+      vendor = opts.select { |key, _val| key.to_s.include?(':') && opts.delete(key) }
+      vendor.map { |k, v| Selenium::WebDriver::Remote::Capabilities.new(k => v) }
     end
 
-    def process_firefox_options(browser_options)
-      @selenium_opts[:options] = browser_options if browser_options.is_a? Selenium::WebDriver::Firefox::Options
+    def convert_timeouts(browser_options)
+      browser_options[:timeouts] ||= {}
+      browser_options[:timeouts].keys.each do |key|
+        raise(ArgumentError, 'do not set implicit wait, Watir handles waiting automatically') if key.to_s == 'implicit'
 
-      @selenium_opts[:options] ||= Selenium::WebDriver::Firefox::Options.new(**browser_options)
-      if @options.key?(:profile)
-        new = 'Initializing Browser with both :profile and :option'
-        old = ':profile as a key inside :option'
-        Watir.logger.deprecate new, old, ids: [:firefox_profile]
-
-        @selenium_opts[:options].profile = @options.delete(:profile)
+        Watir.logger.deprecate('using timeouts directly in options',
+                               ":#{key}_timeout",
+                               id: 'timeouts')
+      end
+      if browser_options.key?(:page_load_timeout)
+        browser_options[:timeouts][:page_load] = browser_options.delete(:page_load_timeout) * 1000
       end
 
-      @selenium_opts[:options].args << '--headless' if @options.delete(:headless)
-    end
-
-    def process_safari_options(browser_options)
-      @selenium_opts[:options] = browser_options if browser_options.is_a? Selenium::WebDriver::Safari::Options
-      @selenium_opts[:options] ||= Selenium::WebDriver::Safari::Options.new(**browser_options)
-      Selenium::WebDriver::Safari.technology_preview! if @options.delete(:technology_preview)
-    end
-
-    def process_ie_options(browser_options)
-      @selenium_opts[:options] = browser_options if browser_options.is_a? Selenium::WebDriver::IE::Options
-      @selenium_opts[:options] ||= Selenium::WebDriver::IE::Options.new(**browser_options)
-
-      process_args
-    end
-
-    def process_service(service)
-      service = deprecate_service_keywords if service.nil?
-
-      @selenium_opts[:service] = case service
-                                 when Hash
-                                   return if service.empty?
+      return unless browser_options.key?(:script_timeout)
 
-                                   Selenium::WebDriver::Service.send(@browser, service)
-                                 when Selenium::WebDriver::Service
-                                   service
-                                 else
-                                   raise TypeError, "#{service} needs to be Selenium Service or Hash instance"
-                                 end
+      browser_options[:timeouts][:script] = browser_options.delete(:script_timeout) * 1000
     end
 
-    def deprecate_service_keywords
-      service = {}
-      if @options.key?(:port)
-        Watir.logger.deprecate(':port to initialize Browser',
-                               ':port in a Hash with :service key',
-                               ids: %i[port_keyword capabilities],
-                               reference: 'http://watir.com/guides/capabilities.html')
-        service[:port] = @options.delete(:port)
-      end
-      if @options.key?(:driver_opts)
-        Watir.logger.deprecate(':driver_opts to initialize Browser',
-                               ':args as Array in a Hash with :service key',
-                               ids: %i[driver_opts_keyword capabilities],
-                               reference: 'http://watir.com/guides/capabilities.html')
-        service[:args] = @options.delete(:driver_opts)
+    def browser_specific_options(options)
+      case @browser
+      when :chrome, :edge, :microsoftedge
+        if @options.delete(:headless)
+          options.args << '--headless'
+          options.args << '--disable-gpu'
+          options.args << '--no-sandbox'
+        end
+      when :firefox
+        options.headless! if @options.delete(:headless)
+      when :safari
+        Selenium::WebDriver::Safari.technology_preview! if @options.delete(:technology_preview)
       end
-      service
-    end
-
-    def process_args
-      args = if @options.key?(:args)
-               deprecate_args
-               @options.delete(:args)
-             elsif @options.key?(:switches)
-               deprecate_switches
-               @options.delete(:switches)
-             else
-               []
-             end
-      args.each { |arg| @selenium_opts[:options].args << arg }
-    end
-
-    def deprecate_args
-      Watir.logger.deprecate(':args to initialize Browser',
-                             ':args inside Hash with :options key',
-                             ids: %i[args_keyword capabilities],
-                             reference: 'http://watir.com/guides/capabilities.html')
     end
 
-    def deprecate_switches
-      Watir.logger.deprecate(':switches to initialize Browser',
-                             ':switches inside Hash with :options key',
-                             ids: %i[switches_keyword capabilities],
-                             reference: 'http://watir.com/guides/capabilities.html')
-    end
+    def process_service
+      service = @options.delete(:service)
 
-    def deprecate_remote(browser)
-      return unless browser == :remote
+      case service
+      when nil
+        nil
+      when Hash
+        return if service.empty?
 
-      Watir.logger.deprecate(':remote to initialize Browser',
-                             'browser key along with remote url',
-                             ids: %i[remote_keyword capabilities],
-                             reference: 'http://watir.com/guides/capabilities.html')
-      infer_browser
+        Selenium::WebDriver::Service.send(@browser, **service)
+      when Selenium::WebDriver::Service
+        service
+      else
+        raise TypeError, "#{service} needs to be Selenium Service or Hash instance"
+      end
     end
 
     def infer_browser
       if @options.key?(:browser)
         @options.delete(:browser)
       elsif @options.key?(:capabilities)
-        @options[:capabilities].browser_name.tr(' ', '_').to_sym
+        @options[:capabilities].browser_name.tr(' ', '_').downcase.to_sym
       elsif @options.key?(:options)
         @options[:options].class.to_s.split('::')[-2].downcase.to_sym
       else
         :chrome
       end
     end
-
-    def process_w3c_capabilities(opts)
-      @w3c_caps = {}
-      return unless opts.is_a?(Hash)
-
-      w3c_keys = %i[browser_version platform_name accept_insecure_certs page_load_strategy proxy set_window_rect
-                    timeouts unhandled_prompt_behavior strict_file_interactibility]
-
-      opts.each do |key, _val|
-        next unless key.to_s.include?(':') || w3c_keys.include?(key)
-
-        @w3c_caps[key] = opts.delete(key)
-      end
-    end
-
-    def deprecate_options_capabilities
-      return unless @options.key?(:capabilities) && @options.key?(:options)
-
-      old = 'initializing Browser with both options and capabilities'
-      new = 'Hash with :options, Selenium Options instance with :options or' \
-'Selenium Capabilities instance with :capabilities'
-      Watir.logger.deprecate(old,
-                             new,
-                             ids: %i[options_capabilities capabilities],
-                             reference: 'http://watir.com/guides/capabilities.html')
-    end
   end
 end