watir 6.10.1 → 6.10.2

data/spec/watirspec_helper.rb

@@ -1,161 +1,161 @@
-require 'watirspec'
-require 'spec_helper'
-
-class LocalConfig
-  def initialize(imp)
-    @imp = imp
-  end
-
-  def browser
-    @browser ||= (ENV['WATIR_BROWSER'] || :chrome).to_sym
-  end
-
-  def configure
-    set_webdriver
-    set_browser_args
-    set_guard_proc
-    load_webdrivers
-  end
-
-  private
-
-  def load_webdrivers
-    case browser
-    when :chrome
-      Webdrivers::Chromedriver.update
-    when :firefox
-      Webdrivers::Geckodriver.update
-    end
-  end
-
-  def set_webdriver
-    @imp.name          = :webdriver
-    @imp.browser_class = Watir::Browser
-  end
-
-  def set_browser_args
-    args = create_args
-    @imp.browser_args = [browser, args]
-  end
-
-  def create_args
-    method = "#{browser}_args".to_sym
-    args = if private_methods.include?(method)
-             send method
-           else
-             {}
-           end
-
-    if ENV['SELECTOR_STATS']
-      listener = SelectorListener.new
-      args.merge!(listener: listener)
-      at_exit { listener.report }
-    end
-
-    args
-  end
-
-  def set_guard_proc
-    matching_guards = add_guards
-
-    @imp.guard_proc = lambda { |args|
-      args.any? { |arg| matching_guards.include?(arg) }
-    }
-  end
-
-  def add_guards
-    matching_guards = common_guards
-    matching_guards << :local
-    matching_guards << [:local, browser]
-    matching_guards
-  end
-
-  def common_guards
-    matching_guards = [:webdriver]
-
-    matching_guards << browser
-    matching_guards << [browser, Selenium::WebDriver::Platform.os]
-    matching_guards << :relaxed_locate if Watir.relaxed_locate?
-    matching_guards << :not_relaxed_locate unless Watir.relaxed_locate?
-    if @imp.browser_args.last[:headless]
-      matching_guards << :headless
-    end
-
-    if !Selenium::WebDriver::Platform.linux? || ENV['DESKTOP_SESSION']
-      # some specs (i.e. Window#maximize) needs a window manager on linux
-      matching_guards << :window_manager
-    end
-    matching_guards
-  end
-
-  def firefox_args
-    ENV['FIREFOX_BINARY'] ? {options: {binary: ENV['FIREFOX_BINARY']}} : {}
-  end
-
-  def safari_args
-    {technology_preview: true}
-  end
-
-  def chrome_args
-    opts = {args: ["--disable-translate"]}
-    opts[:headless] = true if ENV['HEADLESS'] == 'true'
-    opts[:options] = {binary: ENV['CHROME_BINARY']} if ENV['CHROME_BINARY']
-    opts
-  end
-
-  class SelectorListener < Selenium::WebDriver::Support::AbstractEventListener
-    def initialize
-      @counts = Hash.new(0)
-    end
-
-    def before_find(how, _what, _driver)
-      @counts[how] += 1
-    end
-
-    def report
-      total = @counts.values.inject(0) { |mem, var| mem + var }
-      str = "Selenium selector stats: \n"
-      @counts.each do |how, count|
-        str << "\t#{how.to_s.ljust(20)}: #{count * 100 / total} (#{count})\n"
-      end
-      Watir.logger.warn str
-    end
-  end
-end
-
-class RemoteConfig < LocalConfig
-  def configure
-    load_webdrivers
-    @url = ENV["REMOTE_SERVER_URL"] || begin
-      require 'watirspec/remote_server'
-
-      remote_server = WatirSpec::RemoteServer.new
-      args = ["-Dwebdriver.chrome.driver=#{Webdrivers::Chromedriver.send :binary}",
-              "-Dwebdriver.gecko.driver=#{Webdrivers::Geckodriver.send :binary}"]
-      remote_server.start(4444, args: args)
-      remote_server.server.webdriver_url
-    end
-    super
-  end
-
-  private
-
-  def add_guards
-    matching_guards = common_guards
-    matching_guards << :remote
-    matching_guards << [:remote, browser]
-    matching_guards
-  end
-
-  def create_args
-    super.merge(url: @url)
-  end
-end
-
-if ENV["REMOTE_SERVER_URL"] || ENV["USE_REMOTE"]
-  RemoteConfig.new(WatirSpec.implementation).configure
-else
-  LocalConfig.new(WatirSpec.implementation).configure
-end
-
-WatirSpec.run!
+require 'watirspec'
+require 'spec_helper'
+
+class LocalConfig
+  def initialize(imp)
+    @imp = imp
+  end
+
+  def browser
+    @browser ||= (ENV['WATIR_BROWSER'] || :chrome).to_sym
+  end
+
+  def configure
+    set_webdriver
+    set_browser_args
+    set_guard_proc
+    load_webdrivers
+  end
+
+  private
+
+  def load_webdrivers
+    case browser
+    when :chrome
+      Webdrivers::Chromedriver.update
+    when :firefox
+      Webdrivers::Geckodriver.update
+    end
+  end
+
+  def set_webdriver
+    @imp.name          = :webdriver
+    @imp.browser_class = Watir::Browser
+  end
+
+  def set_browser_args
+    args = create_args
+    @imp.browser_args = [browser, args]
+  end
+
+  def create_args
+    method = "#{browser}_args".to_sym
+    args = if private_methods.include?(method)
+             send method
+           else
+             {}
+           end
+
+    if ENV['SELECTOR_STATS']
+      listener = SelectorListener.new
+      args.merge!(listener: listener)
+      at_exit { listener.report }
+    end
+
+    args
+  end
+
+  def set_guard_proc
+    matching_guards = add_guards
+
+    @imp.guard_proc = lambda { |args|
+      args.any? { |arg| matching_guards.include?(arg) }
+    }
+  end
+
+  def add_guards
+    matching_guards = common_guards
+    matching_guards << :local
+    matching_guards << [:local, browser]
+    matching_guards
+  end
+
+  def common_guards
+    matching_guards = [:webdriver]
+
+    matching_guards << browser
+    matching_guards << [browser, Selenium::WebDriver::Platform.os]
+    matching_guards << :relaxed_locate if Watir.relaxed_locate?
+    matching_guards << :not_relaxed_locate unless Watir.relaxed_locate?
+    if @imp.browser_args.last[:headless]
+      matching_guards << :headless
+    end
+
+    if !Selenium::WebDriver::Platform.linux? || ENV['DESKTOP_SESSION']
+      # some specs (i.e. Window#maximize) needs a window manager on linux
+      matching_guards << :window_manager
+    end
+    matching_guards
+  end
+
+  def firefox_args
+    ENV['FIREFOX_BINARY'] ? {options: {binary: ENV['FIREFOX_BINARY']}} : {}
+  end
+
+  def safari_args
+    {technology_preview: true}
+  end
+
+  def chrome_args
+    opts = {args: ["--disable-translate"]}
+    opts[:headless] = true if ENV['HEADLESS'] == 'true'
+    opts[:options] = {binary: ENV['CHROME_BINARY']} if ENV['CHROME_BINARY']
+    opts
+  end
+
+  class SelectorListener < Selenium::WebDriver::Support::AbstractEventListener
+    def initialize
+      @counts = Hash.new(0)
+    end
+
+    def before_find(how, _what, _driver)
+      @counts[how] += 1
+    end
+
+    def report
+      total = @counts.values.inject(0) { |mem, var| mem + var }
+      str = "Selenium selector stats: \n"
+      @counts.each do |how, count|
+        str << "\t#{how.to_s.ljust(20)}: #{count * 100 / total} (#{count})\n"
+      end
+      Watir.logger.warn str
+    end
+  end
+end
+
+class RemoteConfig < LocalConfig
+  def configure
+    load_webdrivers
+    @url = ENV["REMOTE_SERVER_URL"] || begin
+      require 'watirspec/remote_server'
+
+      remote_server = WatirSpec::RemoteServer.new
+      args = ["-Dwebdriver.chrome.driver=#{Webdrivers::Chromedriver.send :binary}",
+              "-Dwebdriver.gecko.driver=#{Webdrivers::Geckodriver.send :binary}"]
+      remote_server.start(4444, args: args)
+      remote_server.server.webdriver_url
+    end
+    super
+  end
+
+  private
+
+  def add_guards
+    matching_guards = common_guards
+    matching_guards << :remote
+    matching_guards << [:remote, browser]
+    matching_guards
+  end
+
+  def create_args
+    super.merge(url: @url)
+  end
+end
+
+if ENV["REMOTE_SERVER_URL"] || ENV["USE_REMOTE"]
+  RemoteConfig.new(WatirSpec.implementation).configure
+else
+  LocalConfig.new(WatirSpec.implementation).configure
+end
+
+WatirSpec.run!

data/support/appveyor.cmd

@@ -1,9 +1,9 @@
-if "%RAKE_TASK%"=="spec:firefox" (
-  choco install -y curl
-  choco install -y 7zip.commandline
-  curl -L -O --insecure https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-win32.zip
-  7za e geckodriver-v0.11.1-win32.zip
-  move geckodriver.exe C:\Tools\WebDriver
-
-  geckodriver.exe --version
-)
+if "%RAKE_TASK%"=="spec:firefox" (
+  choco install -y curl
+  choco install -y 7zip.commandline
+  curl -L -O --insecure https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-win32.zip
+  7za e geckodriver-v0.11.1-win32.zip
+  move geckodriver.exe C:\Tools\WebDriver
+
+  geckodriver.exe --version
+)

data/support/doctest_helper.rb

@@ -1,101 +1,101 @@
-require 'watir'
-require 'watirspec'
-require 'webdrivers'
-
-#
-# 1. If example does not start browser, start new one, reuse until example
-#    finishes and close after.
-# 2. If example starts browser and assigns it to local variable `browser`,
-#    it will still be closed.
-#
-
-def browser
-  $browser ||= Watir::Browser.new(:chrome)
-end
-
-YARD::Doctest.configure do |doctest|
-  doctest.skip 'Watir::Browser.start'
-  doctest.skip 'Watir::Cookies'
-  doctest.skip 'Watir::Element#to_subtype'
-  doctest.skip 'Watir::Option'
-  doctest.skip 'Watir::Screenshot'
-  doctest.skip 'Watir::Window#size'
-  doctest.skip 'Watir::Window#position'
-  doctest.skip 'Watir::Window#maximize'
-
-  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')
-      browser.button(id: 'alert').click
-    end
-  end
-
-  doctest.before('Watir::Alert#set') do
-    browser.goto WatirSpec.url_for('alerts.html')
-    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')
-    end
-  end
-
-  %w[attribute_value attribute].each do |name|
-    doctest.before("Watir::Element##{name}") do
-      browser.goto WatirSpec.url_for('non_control_elements.html')
-    end
-  end
-
-  %w[Watir::JSExecution Watir::List].each do |name|
-    doctest.before(name) do
-      browser.goto WatirSpec.url_for('non_control_elements.html')
-    end
-  end
-
-  %w[fire_event].each do |name|
-    doctest.before("Watir::JSExecution##{name}") do
-      browser.goto WatirSpec.url_for('forms_with_input_elements.html')
-    end
-  end
-
-  doctest.before('Watir::Table') do
-    browser.goto WatirSpec.url_for('tables.html')
-  end
-
-  %w[Watir::HasWindow Watir::Window#== Watir::Window#use].each do |name|
-    doctest.before(name) do
-      browser.goto WatirSpec.url_for('window_switching.html')
-      browser.a(id: 'open').click
-    end
-  end
-
-  doctest.after('Watir::Logger') do
-    Watir.logger.level = :warn
-  end
-
-  doctest.after('Watir::AfterHooks') do
-    browser.after_hooks.each do |hook|
-      browser.after_hooks.delete(hook)
-    end
-  end
-end
-
-ENV['DISPLAY'] = ':99.0' if ENV['TRAVIS']
+require 'watir'
+require 'watirspec'
+require 'webdrivers'
+
+#
+# 1. If example does not start browser, start new one, reuse until example
+#    finishes and close after.
+# 2. If example starts browser and assigns it to local variable `browser`,
+#    it will still be closed.
+#
+
+def browser
+  $browser ||= Watir::Browser.new(:chrome)
+end
+
+YARD::Doctest.configure do |doctest|
+  doctest.skip 'Watir::Browser.start'
+  doctest.skip 'Watir::Cookies'
+  doctest.skip 'Watir::Element#to_subtype'
+  doctest.skip 'Watir::Option'
+  doctest.skip 'Watir::Screenshot'
+  doctest.skip 'Watir::Window#size'
+  doctest.skip 'Watir::Window#position'
+  doctest.skip 'Watir::Window#maximize'
+
+  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')
+      browser.button(id: 'alert').click
+    end
+  end
+
+  doctest.before('Watir::Alert#set') do
+    browser.goto WatirSpec.url_for('alerts.html')
+    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')
+    end
+  end
+
+  %w[attribute_value attribute].each do |name|
+    doctest.before("Watir::Element##{name}") do
+      browser.goto WatirSpec.url_for('non_control_elements.html')
+    end
+  end
+
+  %w[Watir::JSExecution Watir::List].each do |name|
+    doctest.before(name) do
+      browser.goto WatirSpec.url_for('non_control_elements.html')
+    end
+  end
+
+  %w[fire_event].each do |name|
+    doctest.before("Watir::JSExecution##{name}") do
+      browser.goto WatirSpec.url_for('forms_with_input_elements.html')
+    end
+  end
+
+  doctest.before('Watir::Table') do
+    browser.goto WatirSpec.url_for('tables.html')
+  end
+
+  %w[Watir::HasWindow Watir::Window#== Watir::Window#use].each do |name|
+    doctest.before(name) do
+      browser.goto WatirSpec.url_for('window_switching.html')
+      browser.a(id: 'open').click
+    end
+  end
+
+  doctest.after('Watir::Logger') do
+    Watir.logger.level = :warn
+  end
+
+  doctest.after('Watir::AfterHooks') do
+    browser.after_hooks.each do |hook|
+      browser.after_hooks.delete(hook)
+    end
+  end
+end
+
+ENV['DISPLAY'] = ':99.0' if ENV['TRAVIS']