watir 6.10.1 → 6.10.2

data/Rakefile

@@ -1,153 +1,153 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.rspec_opts = %w[--color --require fuubar --format Fuubar]
-  spec.pattern = 'spec/**/*_spec.rb'
-end
-
-namespace :spec do
-  RSpec::Core::RakeTask.new(:html) do |spec|
-    spec.rspec_opts = "--format html --out #{ENV["SPEC_REPORT"] || "specs.html"}"
-    spec.pattern = 'spec/**/*_spec.rb'
-  end
-end
-
-{
-  html: 'https://www.w3.org/TR/html/single-page.html',
-  svg: 'http://www.w3.org/TR/SVG2/single-page.html'
-}.each do |type, spec_uri|
-  namespace type do
-    spec_path = "support/#{type}.html"
-
-    task generator_lib: :lib do
-      require "watir/generator"
-    end
-
-    desc "Download #{type.upcase} spec from #{spec_uri}"
-    task :download do
-      require "open-uri"
-      mv spec_path, "#{spec_path}.old" if File.exist?(spec_path)
-      downloaded_bytes = 0
-
-      File.open(spec_path, "w") do |io|
-        io << "<!--  downloaded from #{spec_uri} on #{Time.now} -->\n"
-        io << data = open(spec_uri).read
-        downloaded_bytes = data.bytesize
-      end
-
-      puts "#{spec_uri} => #{spec_path} (#{downloaded_bytes} bytes)"
-    end
-
-    desc "Print IDL parts from #{spec_uri}"
-    task print: :generator_lib do
-      extractor = Watir::Generator.const_get("#{type.upcase}::SpecExtractor").new(spec_path)
-
-      extractor.process.each do |tag_name, interface_definitions|
-        puts "#{tag_name.ljust(10)} => #{interface_definitions.map(&:name)}"
-      end
-
-      extractor.print_hierarchy
-
-      if extractor.errors.any?
-        puts "\n\n<======================= ERRORS =======================>\n\n"
-        puts extractor.errors.join("\n" + "=" * 80 + "\n")
-      end
-    end
-
-    desc 'Re-generate the base Watir element classes from the spec'
-    task generate: :generator_lib do
-      old_file = "lib/watir/elements/#{type}_elements.rb"
-      generator = Watir::Generator.const_get(type.upcase).new
-
-      File.open("#{old_file}.new", "w") do |file|
-        generator.generate(spec_path, file)
-      end
-
-      if File.exist?(old_file)
-        system "diff -Naut #{old_file} #{old_file}.new | less"
-      end
-    end
-
-    desc "Move #{type}.rb.new to #{type}.rb"
-    task :overwrite do
-      file = "lib/watir/elements/#{type}_elements.rb"
-      mv "#{file}.new", file
-    end
-
-    desc "download spec -> generate -> #{type}.rb"
-    task update: [:download, :generate, :overwrite]
-  end
-end
-
-require 'yard'
-YARD::Rake::YardocTask.new do |task|
-  task.options = %w[--debug] # this is pretty slow, so nice with some output
-end
-
-require 'yard-doctest'
-YARD::Doctest::RakeTask.new do |task|
-  task.doctest_opts = ['-v']
-end
-
-namespace :changes do
-  task :differ do
-    require './support/version_differ'
-  end
-
-  desc 'Update CHANGES.md'
-  task update: :differ do
-    VersionDiffer.new.update('CHANGES.md')
-  end
-
-  desc 'Generate CHANGES.md from scratch'
-  task generate: :differ do
-    VersionDiffer.new.generate('CHANGES.md')
-  end
-
-  desc 'Print latest diff'
-  task print: :differ do
-    VersionDiffer.new.print_latest(STDOUT)
-  end
-end
-
-task default: [:spec, 'yard:doctest']
-
-namespace :spec do
-  require 'selenium-webdriver'
-
-  desc 'Run specs in all browsers'
-  task all_browsers: [:browsers, :remote_browsers]
-
-  desc 'Run specs locally for all browsers'
-  task browsers: [:chrome,
-                  :firefox,
-                  (:safari if Selenium::WebDriver::Platform.mac?),
-                  (:ie if Selenium::WebDriver::Platform.windows?),
-                  (:edge if Selenium::WebDriver::Platform.windows?)].compact
-
-  desc 'Run specs remotely for all browsers'
-  task remote_browsers: [:remote_chrome,
-                         :remote_firefox,
-                         (:remote_safari if Selenium::WebDriver::Platform.mac?),
-                         (:remote_ie if Selenium::WebDriver::Platform.windows?),
-                         (:remote_edge if Selenium::WebDriver::Platform.windows?)].compact
-
-  %w(firefox chrome safari ie edge).each do |browser|
-    desc "Run specs in #{browser}"
-    task browser do
-      ENV['WATIR_BROWSER'] = browser
-      Rake::Task[:spec].execute
-    end
-
-    desc "Run specs in Remote #{browser}"
-    task "remote_#{browser}" do
-      ENV['WATIR_BROWSER'] = browser
-      ENV["USE_REMOTE"] = 'true'
-      Rake::Task[:spec].execute
-    end
-  end
-end
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = %w[--color --require fuubar --format Fuubar]
+  spec.pattern = 'spec/**/*_spec.rb'
+end
+
+namespace :spec do
+  RSpec::Core::RakeTask.new(:html) do |spec|
+    spec.rspec_opts = "--format html --out #{ENV["SPEC_REPORT"] || "specs.html"}"
+    spec.pattern = 'spec/**/*_spec.rb'
+  end
+end
+
+{
+  html: 'https://www.w3.org/TR/html/single-page.html',
+  svg: 'http://www.w3.org/TR/SVG2/single-page.html'
+}.each do |type, spec_uri|
+  namespace type do
+    spec_path = "support/#{type}.html"
+
+    task generator_lib: :lib do
+      require "watir/generator"
+    end
+
+    desc "Download #{type.upcase} spec from #{spec_uri}"
+    task :download do
+      require "open-uri"
+      mv spec_path, "#{spec_path}.old" if File.exist?(spec_path)
+      downloaded_bytes = 0
+
+      File.open(spec_path, "w") do |io|
+        io << "<!--  downloaded from #{spec_uri} on #{Time.now} -->\n"
+        io << data = open(spec_uri).read
+        downloaded_bytes = data.bytesize
+      end
+
+      puts "#{spec_uri} => #{spec_path} (#{downloaded_bytes} bytes)"
+    end
+
+    desc "Print IDL parts from #{spec_uri}"
+    task print: :generator_lib do
+      extractor = Watir::Generator.const_get("#{type.upcase}::SpecExtractor").new(spec_path)
+
+      extractor.process.each do |tag_name, interface_definitions|
+        puts "#{tag_name.ljust(10)} => #{interface_definitions.map(&:name)}"
+      end
+
+      extractor.print_hierarchy
+
+      if extractor.errors.any?
+        puts "\n\n<======================= ERRORS =======================>\n\n"
+        puts extractor.errors.join("\n" + "=" * 80 + "\n")
+      end
+    end
+
+    desc 'Re-generate the base Watir element classes from the spec'
+    task generate: :generator_lib do
+      old_file = "lib/watir/elements/#{type}_elements.rb"
+      generator = Watir::Generator.const_get(type.upcase).new
+
+      File.open("#{old_file}.new", "w") do |file|
+        generator.generate(spec_path, file)
+      end
+
+      if File.exist?(old_file)
+        system "diff -Naut #{old_file} #{old_file}.new | less"
+      end
+    end
+
+    desc "Move #{type}.rb.new to #{type}.rb"
+    task :overwrite do
+      file = "lib/watir/elements/#{type}_elements.rb"
+      mv "#{file}.new", file
+    end
+
+    desc "download spec -> generate -> #{type}.rb"
+    task update: [:download, :generate, :overwrite]
+  end
+end
+
+require 'yard'
+YARD::Rake::YardocTask.new do |task|
+  task.options = %w[--debug] # this is pretty slow, so nice with some output
+end
+
+require 'yard-doctest'
+YARD::Doctest::RakeTask.new do |task|
+  task.doctest_opts = ['-v']
+end
+
+namespace :changes do
+  task :differ do
+    require './support/version_differ'
+  end
+
+  desc 'Update CHANGES.md'
+  task update: :differ do
+    VersionDiffer.new.update('CHANGES.md')
+  end
+
+  desc 'Generate CHANGES.md from scratch'
+  task generate: :differ do
+    VersionDiffer.new.generate('CHANGES.md')
+  end
+
+  desc 'Print latest diff'
+  task print: :differ do
+    VersionDiffer.new.print_latest(STDOUT)
+  end
+end
+
+task default: [:spec, 'yard:doctest']
+
+namespace :spec do
+  require 'selenium-webdriver'
+
+  desc 'Run specs in all browsers'
+  task all_browsers: [:browsers, :remote_browsers]
+
+  desc 'Run specs locally for all browsers'
+  task browsers: [:chrome,
+                  :firefox,
+                  (:safari if Selenium::WebDriver::Platform.mac?),
+                  (:ie if Selenium::WebDriver::Platform.windows?),
+                  (:edge if Selenium::WebDriver::Platform.windows?)].compact
+
+  desc 'Run specs remotely for all browsers'
+  task remote_browsers: [:remote_chrome,
+                         :remote_firefox,
+                         (:remote_safari if Selenium::WebDriver::Platform.mac?),
+                         (:remote_ie if Selenium::WebDriver::Platform.windows?),
+                         (:remote_edge if Selenium::WebDriver::Platform.windows?)].compact
+
+  %w(firefox chrome safari ie edge).each do |browser|
+    desc "Run specs in #{browser}"
+    task browser do
+      ENV['WATIR_BROWSER'] = browser
+      Rake::Task[:spec].execute
+    end
+
+    desc "Run specs in Remote #{browser}"
+    task "remote_#{browser}" do
+      ENV['WATIR_BROWSER'] = browser
+      ENV["USE_REMOTE"] = 'true'
+      Rake::Task[:spec].execute
+    end
+  end
+end

data/appveyor.yml

@@ -1,13 +1,13 @@
-version: "#{build}"
-build: off
-clone_depth: 100
-install:
-  - set PATH=C:\Ruby23\bin;%PATH%
-  - bundle install
-  - support/appveyor.cmd
-test_script:
-  - bundle exec rake %RAKE_TASK%
-environment:
-  matrix:
-    - RAKE_TASK: spec:chrome
-    - RAKE_TASK: spec:firefox
+version: "#{build}"
+build: off
+clone_depth: 100
+install:
+  - set PATH=C:\Ruby23\bin;%PATH%
+  - bundle install
+  - support/appveyor.cmd
+test_script:
+  - bundle exec rake %RAKE_TASK%
+environment:
+  matrix:
+    - RAKE_TASK: spec:chrome
+    - RAKE_TASK: spec:firefox

data/lib/watir-webdriver.rb

@@ -1,2 +1,2 @@
-require 'watir'
-warn Kernel.caller.first + ': `require "watir-webdriver"` is deprecated. Please, use `require "watir"`.'
+require 'watir'
+warn Kernel.caller.first + ': `require "watir-webdriver"` is deprecated. Please, use `require "watir"`.'

data/lib/watir.rb

@@ -1,158 +1,158 @@
-require 'selenium-webdriver'
-
-require 'watir/legacy_wait'
-require 'watir/wait'
-require 'watir/exception'
-require 'watir/xpath_support'
-require 'watir/window'
-require 'watir/has_window'
-require 'watir/adjacent'
-require 'watir/js_execution'
-require 'watir/alert'
-require 'watir/js_snippets'
-require 'watir/container'
-require 'watir/cookies'
-require 'watir/capabilities'
-require 'watir/browser'
-require 'watir/screenshot'
-require 'watir/after_hooks'
-require 'watir/logger'
-
-module Watir
-
-  @relaxed_locate = true
-
-  class << self
-
-    attr_writer :relaxed_locate, :always_locate, :default_timeout, :prefer_css, :locator_namespace
-
-    #
-    # 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
-      Watir.logger.warn <<-EOS
-Watir#always_locate is deprecated; elements are always cached and will always
-be re-located if they go stale before use.
-Use Element#stale? or Element#wait_until(&:stale?) if needed for flow control.
-      EOS
-    end
-
-    #
-    # Whether or not Watir should prefer CSS when translating the Watir selectors to Selenium.
-    #
-
-    def prefer_css?
-      prefer_css_message
-      false
-    end
-
-    def prefer_css_message
-      Watir.logger.warn <<-EOS
-Watir#prefer_css is deprecated; all elements that can not be passed directly
-as Selenium locators will be translated to XPath. To continue using CSS Selectors
-require the watir_css gem - https://github.com/watir/watir_css
-      EOS
-    end
-
-    #
-    # Default wait time for wait methods.
-    #
-
-    def default_timeout
-      @default_timeout ||= 30
-    end
-
-    #
-    # Whether the locators should be used from a different namespace.
-    # Defaults to Watir::Locators.
-    #
-
-    def locator_namespace
-      @locator_namespace ||= Watir::Locators
-    end
-
-    #
-    # @api private
-    #
-
-    def tag_to_class
-      @tag_to_class ||= {}
-    end
-
-    #
-    # @api private
-    #
-
-    def element_class_for(tag_name)
-      tag_to_class[tag_name.to_sym] || HTMLElement
-    end
-  end
-
-  #
-  # Returns logger instance that can be used across the whole Selenium.
-  #
-  # @return [Logger]
-  #
-
-  def self.logger
-    @logger ||= Watir::Logger.new
-  end
-
-end
-require 'watir/locators'
-
-require 'watir/attribute_helper'
-require 'watir/row_container'
-require 'watir/cell_container'
-require 'watir/user_editable'
-require 'watir/element_collection'
-require 'watir/elements/element'
-
-require 'watir/elements/html_elements'
-require 'watir/elements/svg_elements'
-
-require 'watir/elements/area'
-require 'watir/elements/button'
-require 'watir/elements/cell'
-require 'watir/elements/checkbox'
-require 'watir/elements/dlist'
-require 'watir/elements/file_field'
-require 'watir/elements/font'
-require 'watir/elements/form'
-require 'watir/elements/iframe'
-require 'watir/elements/hidden'
-require 'watir/elements/image'
-require 'watir/elements/link'
-require 'watir/elements/list'
-require 'watir/elements/option'
-require 'watir/elements/radio'
-require 'watir/elements/row'
-require 'watir/elements/select'
-require 'watir/elements/table'
-require 'watir/elements/table_cell'
-require 'watir/elements/table_row'
-require 'watir/elements/table_section'
-require 'watir/elements/text_area'
-require 'watir/elements/text_field'
-require 'watir/elements/input'
-require 'watir/radio_set'
-
-require 'watir/aliases'
-
-Watir.tag_to_class.freeze
+require 'selenium-webdriver'
+
+require 'watir/legacy_wait'
+require 'watir/wait'
+require 'watir/exception'
+require 'watir/xpath_support'
+require 'watir/window'
+require 'watir/has_window'
+require 'watir/adjacent'
+require 'watir/js_execution'
+require 'watir/alert'
+require 'watir/js_snippets'
+require 'watir/container'
+require 'watir/cookies'
+require 'watir/capabilities'
+require 'watir/browser'
+require 'watir/screenshot'
+require 'watir/after_hooks'
+require 'watir/logger'
+
+module Watir
+
+  @relaxed_locate = true
+
+  class << self
+
+    attr_writer :relaxed_locate, :always_locate, :default_timeout, :prefer_css, :locator_namespace
+
+    #
+    # 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
+      Watir.logger.warn <<-EOS
+Watir#always_locate is deprecated; elements are always cached and will always
+be re-located if they go stale before use.
+Use Element#stale? or Element#wait_until(&:stale?) if needed for flow control.
+      EOS
+    end
+
+    #
+    # Whether or not Watir should prefer CSS when translating the Watir selectors to Selenium.
+    #
+
+    def prefer_css?
+      prefer_css_message
+      false
+    end
+
+    def prefer_css_message
+      Watir.logger.warn <<-EOS
+Watir#prefer_css is deprecated; all elements that can not be passed directly
+as Selenium locators will be translated to XPath. To continue using CSS Selectors
+require the watir_css gem - https://github.com/watir/watir_css
+      EOS
+    end
+
+    #
+    # Default wait time for wait methods.
+    #
+
+    def default_timeout
+      @default_timeout ||= 30
+    end
+
+    #
+    # Whether the locators should be used from a different namespace.
+    # Defaults to Watir::Locators.
+    #
+
+    def locator_namespace
+      @locator_namespace ||= Watir::Locators
+    end
+
+    #
+    # @api private
+    #
+
+    def tag_to_class
+      @tag_to_class ||= {}
+    end
+
+    #
+    # @api private
+    #
+
+    def element_class_for(tag_name)
+      tag_to_class[tag_name.to_sym] || HTMLElement
+    end
+  end
+
+  #
+  # Returns logger instance that can be used across the whole Selenium.
+  #
+  # @return [Logger]
+  #
+
+  def self.logger
+    @logger ||= Watir::Logger.new
+  end
+
+end
+require 'watir/locators'
+
+require 'watir/attribute_helper'
+require 'watir/row_container'
+require 'watir/cell_container'
+require 'watir/user_editable'
+require 'watir/element_collection'
+require 'watir/elements/element'
+
+require 'watir/elements/html_elements'
+require 'watir/elements/svg_elements'
+
+require 'watir/elements/area'
+require 'watir/elements/button'
+require 'watir/elements/cell'
+require 'watir/elements/checkbox'
+require 'watir/elements/dlist'
+require 'watir/elements/file_field'
+require 'watir/elements/font'
+require 'watir/elements/form'
+require 'watir/elements/iframe'
+require 'watir/elements/hidden'
+require 'watir/elements/image'
+require 'watir/elements/link'
+require 'watir/elements/list'
+require 'watir/elements/option'
+require 'watir/elements/radio'
+require 'watir/elements/row'
+require 'watir/elements/select'
+require 'watir/elements/table'
+require 'watir/elements/table_cell'
+require 'watir/elements/table_row'
+require 'watir/elements/table_section'
+require 'watir/elements/text_area'
+require 'watir/elements/text_field'
+require 'watir/elements/input'
+require 'watir/radio_set'
+
+require 'watir/aliases'
+
+Watir.tag_to_class.freeze