watir 6.10.1 → 6.10.2

data/lib/watir/capabilities.rb

@@ -1,124 +1,124 @@
-module Watir
-  class Capabilities
-
-    attr_reader :options
-
-    def initialize(browser, options = {})
-      @options = options.dup
-      Watir.logger.info "Creating Browser instance of #{browser} with user provided options: #{@options.inspect}"
-      @browser = if browser == :remote && @options.key?(:browser)
-                   @options.delete(:browser)
-                 elsif browser == :remote && @options.key?(:desired_capabilities)
-                   @options[:desired_capabilities].browser_name.to_sym
-                 else
-                   browser.to_sym
-                 end
-      @selenium_browser = browser == :remote || options[:url] ? :remote : browser
-
-      @selenium_opts = {}
-    end
-
-    def to_args
-      [@selenium_browser, process_arguments]
-    end
-
-    private
-
-    def process_arguments
-      url = @options.delete(:url)
-      @selenium_opts[:url] = url if url
-
-      create_http_client
-
-      @selenium_opts[:port] = @options.delete(:port) if @options.key?(:port)
-      @selenium_opts[:driver_opts] = @options.delete(:driver_opts) if @options.key?(:driver_opts)
-      @selenium_opts[:listener] = @options.delete(:listener) if @options.key?(:listener)
-
-      process_browser_options
-      process_capabilities
-      Watir.logger.info "Creating Browser instance with Watir processed options: #{@selenium_opts.inspect}"
-
-      @selenium_opts
-    end
-
-    def create_http_client
-      client_timeout = @options.delete(:client_timeout)
-      open_timeout = @options.delete(:open_timeout)
-      read_timeout = @options.delete(:read_timeout)
-
-      http_client = @options.delete(:http_client)
-
-      %i(open_timeout read_timeout client_timeout).each do |t|
-        next if http_client.nil? || !respond_to?(t)
-        Watir.logger.warn "You can now pass #{t} value directly into Watir::Browser opt without needing to use :http_client"
-      end
-
-      http_client ||= Selenium::WebDriver::Remote::Http::Default.new
-
-      http_client.timeout = client_timeout if client_timeout
-      http_client.open_timeout = open_timeout if open_timeout
-      http_client.read_timeout = read_timeout if read_timeout
-      @selenium_opts[:http_client] = http_client
-    end
-
-    def process_browser_options
-      browser_options = @options.delete(:options) || {}
-
-      case @selenium_browser
-      when :chrome
-        if @options.key?(:args) || @options.key?(:switches)
-          browser_options ||= {}
-          browser_options[:args] = (@options.delete(:args) || @options.delete(:switches)).dup
-        end
-        if @options.delete(:headless)
-          browser_options ||= {}
-          browser_options[:args] ||= []
-          browser_options[:args] += ['--headless', '--disable-gpu']
-        end
-        @selenium_opts[:options] = browser_options if browser_options.is_a? Selenium::WebDriver::Chrome::Options
-        @selenium_opts[:options] ||= Selenium::WebDriver::Chrome::Options.new(browser_options)
-      when :firefox
-        profile = @options.delete(:profile)
-        if browser_options.is_a? Selenium::WebDriver::Firefox::Options
-          @selenium_opts[:options] = browser_options
-          Watir.logger.deprecate 'Initializing Browser with both :profile and :option', ':profile as a key inside :option' if profile
-        end
-        if @options.delete(:headless)
-          browser_options ||= {}
-          browser_options[:args] ||= []
-          browser_options[:args] += ['--headless']
-        end
-        @selenium_opts[:options] ||= Selenium::WebDriver::Firefox::Options.new(browser_options)
-        @selenium_opts[:options].profile = profile if profile
-      when :safari
-        Selenium::WebDriver::Safari.technology_preview! if @options.delete(:technology_preview)
-      when :remote
-        if @browser == :chrome && @options.delete(:headless)
-          args = @options.delete(:args) || @options.delete(:switches) || []
-          @options['chromeOptions'] = {'args' => args + ['--headless', '--disable-gpu']}
-        end
-        if @browser == :firefox && @options.delete(:headless)
-          args = @options.delete(:args) || @options.delete(:switches) || []
-          @options[Selenium::WebDriver::Firefox::Options.KEY] = {'args' => args + ['--headless']}
-        end
-        if @browser == :safari && @options.delete(:technology_preview)
-          @options["safari.options"] = {'technologyPreview' => true}
-        end
-      end
-    end
-
-    def process_capabilities
-      caps = @options.delete(:desired_capabilities)
-
-      if caps
-        Watir.logger.warn 'You can now pass values directly into Watir::Browser opt without needing to use :desired_capabilities'
-        @selenium_opts.merge!(@options)
-      else
-        caps = Selenium::WebDriver::Remote::Capabilities.send @browser, @options
-      end
-
-      @selenium_opts[:desired_capabilities] = caps
-    end
-
-  end
+module Watir
+  class Capabilities
+
+    attr_reader :options
+
+    def initialize(browser, options = {})
+      @options = options.dup
+      Watir.logger.info "Creating Browser instance of #{browser} with user provided options: #{@options.inspect}"
+      @browser = if browser == :remote && @options.key?(:browser)
+                   @options.delete(:browser)
+                 elsif browser == :remote && @options.key?(:desired_capabilities)
+                   @options[:desired_capabilities].browser_name.to_sym
+                 else
+                   browser.to_sym
+                 end
+      @selenium_browser = browser == :remote || options[:url] ? :remote : browser
+
+      @selenium_opts = {}
+    end
+
+    def to_args
+      [@selenium_browser, process_arguments]
+    end
+
+    private
+
+    def process_arguments
+      url = @options.delete(:url)
+      @selenium_opts[:url] = url if url
+
+      create_http_client
+
+      @selenium_opts[:port] = @options.delete(:port) if @options.key?(:port)
+      @selenium_opts[:driver_opts] = @options.delete(:driver_opts) if @options.key?(:driver_opts)
+      @selenium_opts[:listener] = @options.delete(:listener) if @options.key?(:listener)
+
+      process_browser_options
+      process_capabilities
+      Watir.logger.info "Creating Browser instance with Watir processed options: #{@selenium_opts.inspect}"
+
+      @selenium_opts
+    end
+
+    def create_http_client
+      client_timeout = @options.delete(:client_timeout)
+      open_timeout = @options.delete(:open_timeout)
+      read_timeout = @options.delete(:read_timeout)
+
+      http_client = @options.delete(:http_client)
+
+      %i(open_timeout read_timeout client_timeout).each do |t|
+        next if http_client.nil? || !respond_to?(t)
+        Watir.logger.warn "You can now pass #{t} value directly into Watir::Browser opt without needing to use :http_client"
+      end
+
+      http_client ||= Selenium::WebDriver::Remote::Http::Default.new
+
+      http_client.timeout = client_timeout if client_timeout
+      http_client.open_timeout = open_timeout if open_timeout
+      http_client.read_timeout = read_timeout if read_timeout
+      @selenium_opts[:http_client] = http_client
+    end
+
+    def process_browser_options
+      browser_options = @options.delete(:options) || {}
+
+      case @selenium_browser
+      when :chrome
+        if @options.key?(:args) || @options.key?(:switches)
+          browser_options ||= {}
+          browser_options[:args] = (@options.delete(:args) || @options.delete(:switches)).dup
+        end
+        if @options.delete(:headless)
+          browser_options ||= {}
+          browser_options[:args] ||= []
+          browser_options[:args] += ['--headless', '--disable-gpu']
+        end
+        @selenium_opts[:options] = browser_options if browser_options.is_a? Selenium::WebDriver::Chrome::Options
+        @selenium_opts[:options] ||= Selenium::WebDriver::Chrome::Options.new(browser_options)
+      when :firefox
+        profile = @options.delete(:profile)
+        if browser_options.is_a? Selenium::WebDriver::Firefox::Options
+          @selenium_opts[:options] = browser_options
+          Watir.logger.deprecate 'Initializing Browser with both :profile and :option', ':profile as a key inside :option' if profile
+        end
+        if @options.delete(:headless)
+          browser_options ||= {}
+          browser_options[:args] ||= []
+          browser_options[:args] += ['--headless']
+        end
+        @selenium_opts[:options] ||= Selenium::WebDriver::Firefox::Options.new(browser_options)
+        @selenium_opts[:options].profile = profile if profile
+      when :safari
+        Selenium::WebDriver::Safari.technology_preview! if @options.delete(:technology_preview)
+      when :remote
+        if @browser == :chrome && @options.delete(:headless)
+          args = @options.delete(:args) || @options.delete(:switches) || []
+          @options['chromeOptions'] = {'args' => args + ['--headless', '--disable-gpu']}
+        end
+        if @browser == :firefox && @options.delete(:headless)
+          args = @options.delete(:args) || @options.delete(:switches) || []
+          @options[Selenium::WebDriver::Firefox::Options.KEY] = {'args' => args + ['--headless']}
+        end
+        if @browser == :safari && @options.delete(:technology_preview)
+          @options["safari.options"] = {'technologyPreview' => true}
+        end
+      end
+    end
+
+    def process_capabilities
+      caps = @options.delete(:desired_capabilities)
+
+      if caps
+        Watir.logger.warn 'You can now pass values directly into Watir::Browser opt without needing to use :desired_capabilities'
+        @selenium_opts.merge!(@options)
+      else
+        caps = Selenium::WebDriver::Remote::Capabilities.send @browser, @options
+      end
+
+      @selenium_opts[:desired_capabilities] = caps
+    end
+
+  end
 end

data/lib/watir/cell_container.rb

@@ -1,25 +1,25 @@
-module Watir
-  module CellContainer
-
-    #
-    # Returns table cell.
-    #
-    # @return [Cell]
-    #
-
-    def cell(*args)
-      Cell.new(self, extract_selector(args).merge(tag_name: /^(th|td)$/))
-    end
-
-    #
-    # Returns table cells collection.
-    #
-    # @return [Cell]
-    #
-
-    def cells(*args)
-      CellCollection.new(self, extract_selector(args).merge(tag_name: /^(th|td)$/))
-    end
-
-  end # CellContainer
-end # Watir
+module Watir
+  module CellContainer
+
+    #
+    # Returns table cell.
+    #
+    # @return [Cell]
+    #
+
+    def cell(*args)
+      Cell.new(self, extract_selector(args).merge(tag_name: /^(th|td)$/))
+    end
+
+    #
+    # Returns table cells collection.
+    #
+    # @return [Cell]
+    #
+
+    def cells(*args)
+      CellCollection.new(self, extract_selector(args).merge(tag_name: /^(th|td)$/))
+    end
+
+  end # CellContainer
+end # Watir

data/lib/watir/container.rb

@@ -1,51 +1,51 @@
-module Watir
-  module Container
-    include XpathSupport
-    include JSSnippets
-
-    #
-    # Returns element.
-    #
-    # @example
-    #   browser.element(data_bind: 'func')
-    #
-    # @return [HTMLElement]
-    #
-
-    def element(*args)
-      HTMLElement.new(self, extract_selector(args))
-    end
-
-    #
-    # Returns element collection.
-    #
-    # @example
-    #   browser.elements(data_bind: 'func')
-    #
-    # @return [HTMLElementCollection]
-    #
-
-    def elements(*args)
-      HTMLElementCollection.new(self, extract_selector(args))
-    end
-
-    #
-    # @api private
-    #
-
-    def extract_selector(selectors)
-      case selectors.size
-      when 2
-        return { selectors[0] => selectors[1] }
-      when 1
-        obj = selectors.first
-        return obj if obj.kind_of? Hash
-      when 0
-        return {}
-      end
-
-      raise ArgumentError, "expected Hash or (:how, 'what'), got #{selectors.inspect}"
-    end
-
-  end # Container
-end # Watir
+module Watir
+  module Container
+    include XpathSupport
+    include JSSnippets
+
+    #
+    # Returns element.
+    #
+    # @example
+    #   browser.element(data_bind: 'func')
+    #
+    # @return [HTMLElement]
+    #
+
+    def element(*args)
+      HTMLElement.new(self, extract_selector(args))
+    end
+
+    #
+    # Returns element collection.
+    #
+    # @example
+    #   browser.elements(data_bind: 'func')
+    #
+    # @return [HTMLElementCollection]
+    #
+
+    def elements(*args)
+      HTMLElementCollection.new(self, extract_selector(args))
+    end
+
+    #
+    # @api private
+    #
+
+    def extract_selector(selectors)
+      case selectors.size
+      when 2
+        return { selectors[0] => selectors[1] }
+      when 1
+        obj = selectors.first
+        return obj if obj.kind_of? Hash
+      when 0
+        return {}
+      end
+
+      raise ArgumentError, "expected Hash or (:how, 'what'), got #{selectors.inspect}"
+    end
+
+  end # Container
+end # Watir

data/lib/watir/cookies.rb

@@ -1,134 +1,134 @@
-require 'yaml'
-
-module Watir
-  class Cookies
-
-    def initialize(control)
-      @control = control
-    end
-
-    #
-    # Returns array of cookies.
-    #
-    # @example
-    #   browser.cookies.to_a
-    #   #=> {:name=>"my_session", :value=>"BAh7B0kiD3Nlc3Npb25faWQGOgZFRkk", :domain=>"mysite.com"}
-    #
-    # @return [Array<Hash>]
-    #
-
-    def to_a
-      @control.all_cookies.map do |e|
-        e.merge(expires: e[:expires] ? to_time(e[:expires]) : nil)
-      end
-    end
-
-    #
-    # Returns a cookie by name.
-    #
-    # @example
-    #   browser.cookies[:my_session]
-    #   #=> {:name=>"my_session", :value=>"BAh7B0kiD3Nlc3Npb25faWQGOgZFRkk", :domain=>"mysite.com"}
-    #
-    # @param [Symbol] name
-    # @return <Hash> or nil if not found
-    #
-
-    def [](name)
-      to_a.find { |c| c[:name] == name.to_s }
-    end
-
-    #
-    # Adds new cookie.
-    #
-    # @example
-    #   browser.cookies.add 'my_session', 'BAh7B0kiD3Nlc3Npb25faWQGOgZFRkk', secure: true
-    #
-    # @param [String] name
-    # @param [String] value
-    # @param [Hash] opts
-    # @option opts [Boolean] :secure
-    # @option opts [String] :path
-    # @option opts [Time, DateTime, NilClass] :expires
-    # @option opts [String] :domain
-    #
-
-    def add(name, value, opts = {})
-      cookie = {
-        name: name,
-        value: value}
-      cookie[:secure] = opts[:secure] if opts.key?(:secure)
-      cookie[:path] = opts[:path] if opts.key?(:path)
-      expires = opts[:expires]
-      if expires
-        cookie[:expires] = ::Time.parse(expires) if expires.is_a?(String) else expires
-      end
-      cookie[:domain] = opts[:domain] if opts.key?(:domain)
-
-      @control.add_cookie cookie
-    end
-
-    #
-    # Deletes cookie by given name.
-    #
-    # @example
-    #   browser.cookies.delete 'my_session'
-    #
-    # @param [String] name
-    #
-
-    def delete(name)
-      @control.delete_cookie(name)
-    end
-
-    #
-    # Deletes all cookies.
-    #
-    # @example
-    #   browser.cookies.clear
-    #
-
-    def clear
-      @control.delete_all_cookies
-    end
-
-    #
-    # Save cookies to file
-    #
-    # @example
-    #   browser.cookies.save '.cookies'
-    #
-    # @param [String] file
-    #
-
-    def save(file = '.cookies')
-      IO.write(file, to_a.to_yaml)
-    end
-
-    #
-    # Load cookies from file
-    #
-    # @example
-    #   browser.cookies.load '.cookies'
-    #
-    # @param [String] file
-    #
-
-    def load(file = '.cookies')
-      YAML.load(IO.read(file)).each do |c|
-        add(c.delete(:name), c.delete(:value), c)
-      end
-    end
-
-    private
-
-    def to_time(t)
-      if t.respond_to?(:to_time)
-        t.to_time
-      else
-        ::Time.local t.year, t.month, t.day, t.hour, t.min, t.sec
-      end
-    end
-
-  end # Cookies
-end # Watir
+require 'yaml'
+
+module Watir
+  class Cookies
+
+    def initialize(control)
+      @control = control
+    end
+
+    #
+    # Returns array of cookies.
+    #
+    # @example
+    #   browser.cookies.to_a
+    #   #=> {:name=>"my_session", :value=>"BAh7B0kiD3Nlc3Npb25faWQGOgZFRkk", :domain=>"mysite.com"}
+    #
+    # @return [Array<Hash>]
+    #
+
+    def to_a
+      @control.all_cookies.map do |e|
+        e.merge(expires: e[:expires] ? to_time(e[:expires]) : nil)
+      end
+    end
+
+    #
+    # Returns a cookie by name.
+    #
+    # @example
+    #   browser.cookies[:my_session]
+    #   #=> {:name=>"my_session", :value=>"BAh7B0kiD3Nlc3Npb25faWQGOgZFRkk", :domain=>"mysite.com"}
+    #
+    # @param [Symbol] name
+    # @return <Hash> or nil if not found
+    #
+
+    def [](name)
+      to_a.find { |c| c[:name] == name.to_s }
+    end
+
+    #
+    # Adds new cookie.
+    #
+    # @example
+    #   browser.cookies.add 'my_session', 'BAh7B0kiD3Nlc3Npb25faWQGOgZFRkk', secure: true
+    #
+    # @param [String] name
+    # @param [String] value
+    # @param [Hash] opts
+    # @option opts [Boolean] :secure
+    # @option opts [String] :path
+    # @option opts [Time, DateTime, NilClass] :expires
+    # @option opts [String] :domain
+    #
+
+    def add(name, value, opts = {})
+      cookie = {
+        name: name,
+        value: value}
+      cookie[:secure] = opts[:secure] if opts.key?(:secure)
+      cookie[:path] = opts[:path] if opts.key?(:path)
+      expires = opts[:expires]
+      if expires
+        cookie[:expires] = ::Time.parse(expires) if expires.is_a?(String) else expires
+      end
+      cookie[:domain] = opts[:domain] if opts.key?(:domain)
+
+      @control.add_cookie cookie
+    end
+
+    #
+    # Deletes cookie by given name.
+    #
+    # @example
+    #   browser.cookies.delete 'my_session'
+    #
+    # @param [String] name
+    #
+
+    def delete(name)
+      @control.delete_cookie(name)
+    end
+
+    #
+    # Deletes all cookies.
+    #
+    # @example
+    #   browser.cookies.clear
+    #
+
+    def clear
+      @control.delete_all_cookies
+    end
+
+    #
+    # Save cookies to file
+    #
+    # @example
+    #   browser.cookies.save '.cookies'
+    #
+    # @param [String] file
+    #
+
+    def save(file = '.cookies')
+      IO.write(file, to_a.to_yaml)
+    end
+
+    #
+    # Load cookies from file
+    #
+    # @example
+    #   browser.cookies.load '.cookies'
+    #
+    # @param [String] file
+    #
+
+    def load(file = '.cookies')
+      YAML.load(IO.read(file)).each do |c|
+        add(c.delete(:name), c.delete(:value), c)
+      end
+    end
+
+    private
+
+    def to_time(t)
+      if t.respond_to?(:to_time)
+        t.to_time
+      else
+        ::Time.local t.year, t.month, t.day, t.hour, t.min, t.sec
+      end
+    end
+
+  end # Cookies
+end # Watir