watir 6.5.0 → 6.6.0

data/spec/watirspec_helper.rb

@@ -1,7 +1,7 @@
 require 'watirspec'
 require 'spec_helper'
 
-class ImplementationConfig
+class LocalConfig
   def initialize(imp)
     @imp = imp
   end
@@ -10,68 +10,30 @@ class ImplementationConfig
     @browser ||= (ENV['WATIR_BROWSER'] || :chrome).to_sym
   end
 
-  def remote_browser
-    @remote_browser ||= (ENV['REMOTE_BROWSER'] || :chrome).to_sym
-  end
-
   def configure
     set_webdriver
-    start_remote_server if remote? && !ENV["REMOTE_SERVER_URL"]
     set_browser_args
     set_guard_proc
   end
 
   private
 
-  def start_remote_server
-    require 'selenium/server'
-
-    @server ||= Selenium::Server.new(remote_server_jar,
-                                     port: Selenium::WebDriver::PortProber.above(4444),
-                                     log: !!$DEBUG,
-                                     background: true,
-                                     timeout: 60)
-
-    @server.start
-    at_exit { @server.stop }
-  end
-
-  def remote_server_jar
-    if ENV['LOCAL_SELENIUM']
-      local = File.expand_path('../selenium/buck-out/gen/java/server/src/org/openqa/grid/selenium/selenium.jar')
-    end
-
-    if File.exist?(ENV['REMOTE_SERVER_BINARY'] || '')
-      ENV['REMOTE_SERVER_BINARY']
-    elsif ENV['LOCAL_SELENIUM'] && File.exists?(local)
-      local
-    elsif !Dir.glob('*selenium*.jar').empty?
-      Dir.glob('*selenium*.jar').first
-    else
-      Selenium::Server.download :latest
-    end
-  rescue SocketError
-    # not connected to internet
-    raise Watir::Exception::Error, "unable to find or download selenium-server-standalone jar"
-  end
-
   def set_webdriver
     @imp.name          = :webdriver
     @imp.browser_class = Watir::Browser
   end
 
   def set_browser_args
-    args = case browser
-           when :firefox
-             firefox_args
-           when :ff_legacy
-             ff_legacy_args
-           when :chrome
-             chrome_args
-           when :remote
-             remote_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
-             {desired_capabilities: Selenium::WebDriver::Remote::Capabilities.send(browser)}
+             {}
            end
 
     if ENV['SELECTOR_STATS']
@@ -80,120 +42,100 @@ class ImplementationConfig
       at_exit { listener.report }
     end
 
-    @imp.browser_args = [browser, args]
-  end
-
-  def ie?
-    [:internet_explorer].include? browser
+    args
   end
 
-  def safari?
-    browser == :safari
-  end
+  def set_guard_proc
+    matching_guards = add_guards
 
-  def remote?
-    browser == :remote
+    @imp.guard_proc = lambda { |args|
+      args.any? { |arg| matching_guards.include?(arg) }
+    }
   end
 
-  def set_guard_proc
+  def add_guards
     matching_guards = [:webdriver]
 
-    if remote?
-      matching_browser = remote_browser
-      matching_guards << :remote
-      matching_guards << [:remote, matching_browser]
-      matching_guards << [:remote, :ff_legacy] if @ff_legacy
-    else
-      matching_browser = browser
-    end
-
-    matching_guards << :ff_legacy if @ff_legacy
-    matching_guards << matching_browser
-    matching_guards << [matching_browser, Selenium::WebDriver::Platform.os]
+    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
-
-    @imp.guard_proc = lambda { |args|
-      args.any? { |arg| matching_guards.include?(arg) }
-    }
+    matching_guards
   end
 
   def firefox_args
-    path = ENV['FIREFOX_BINARY']
-    Selenium::WebDriver::Firefox::Binary.path = path if path
-    {desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox}
+    ENV['FIREFOX_BINARY'] ? {options: {binary: ENV['FIREFOX_BINARY']}} : {}
   end
 
-  def ff_legacy_args
-    @browser = :firefox
-    @ff_legacy = true
-    caps = Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false)
-    path = ENV['FF_LEGACY_BINARY']
-    Selenium::WebDriver::Firefox::Binary.path = path if path
-    {desired_capabilities: caps}
+  def safari_args
+    {technology_preview: true}
   end
 
   def chrome_args
-    opts = {args: ["--disable-translate"],
-            desired_capabilities: Selenium::WebDriver::Remote::Capabilities.chrome}
-
-    if url = ENV['WATIR_CHROME_SERVER']
-      opts[:url] = url
-    end
-
-    if driver = ENV['WATIR_CHROME_DRIVER']
-      Selenium::WebDriver::Chrome.driver_path = driver
-    end
-
-    if path = ENV['WATIR_CHROME_BINARY']
-      Selenium::WebDriver::Chrome.path = path
-    end
-
+    opts = {args: ["--disable-translate"]}
+    opts[:headless] = true if ENV['HEADLESS'] == 'true'
+    opts[:options] = {binary: ENV['CHROME_BINARY']} if ENV['CHROME_BINARY']
     opts
   end
 
-  def remote_args
-    url = ENV["REMOTE_SERVER_URL"] || "http://127.0.0.1:#{@server.port}/wd/hub"
-    opts = {}
-    if remote_browser == :ff_legacy
-      path = ENV['FF_LEGACY_BINARY']
-      opts[:firefox_binary] = path if path
-      @remote_browser = :firefox
-      @ff_legacy = true
-      opts[:marionette] = false
-    elsif remote_browser == :firefox
-      path = ENV['FIREFOX_BINARY']
-      opts[:firefox_binary] = path if path
-    end
-
-    caps = Selenium::WebDriver::Remote::Capabilities.send(remote_browser, opts)
-    {url: url, desired_capabilities: caps}
-  end
-
   class SelectorListener < Selenium::WebDriver::Support::AbstractEventListener
     def initialize
       @counts = Hash.new(0)
     end
 
-    def before_find(how, what, driver)
+    def before_find(how, _what, _driver)
       @counts[how] += 1
     end
 
     def report
       total = @counts.values.inject(0) { |mem, var| mem + var }
-      puts "\nSelenium selector stats: "
+      str = "Selenium selector stats: \n"
       @counts.each do |how, count|
-        puts "\t#{how.to_s.ljust(20)}: #{count * 100 / total} (#{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
+    @url = ENV["REMOTE_SERVER_URL"] || begin
+      require 'watirspec/remote_server'
 
+      remote_server = WatirSpec::RemoteServer.new
+      remote_server.start
+      remote_server.server.webdriver_url
+    end
+    super
   end
+
+  private
+
+  def add_guards
+    matching_guards = super
+    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
 
-ImplementationConfig.new(WatirSpec.implementation).configure
 WatirSpec.run!

data/support/doctest_helper.rb

@@ -73,6 +73,10 @@ YARD::Doctest.configure do |doctest|
     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)

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.5.0'
+  s.version     = '6.6.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Alex Rodionov', 'Titus Fortner']
   s.email       = ['p0deje@gmail.com', 'titusfortner@gmail.com']
@@ -21,7 +21,7 @@ It facilitates the writing of automated tests by mimicing the behavior of a user
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'selenium-webdriver', '~> 3.0'
+  s.add_dependency 'selenium-webdriver', '~> 3.4', '>= 3.4.1'
 
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'yard', '> 0.8.2.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -17,14 +17,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +218,7 @@ files:
 - lib/watir/atoms/selectText.js
 - lib/watir/attribute_helper.rb
 - lib/watir/browser.rb
+- lib/watir/capabilities.rb
 - lib/watir/cell_container.rb
 - lib/watir/container.rb
 - lib/watir/cookies.rb
@@ -281,6 +288,7 @@ files:
 - lib/watir/locators/text_field/selector_builder.rb
 - lib/watir/locators/text_field/selector_builder/xpath.rb
 - lib/watir/locators/text_field/validator.rb
+- lib/watir/logger.rb
 - lib/watir/row_container.rb
 - lib/watir/screenshot.rb
 - lib/watir/user_editable.rb
@@ -292,6 +300,7 @@ files:
 - lib/watirspec/guards.rb
 - lib/watirspec/implementation.rb
 - lib/watirspec/rake_tasks.rb
+- lib/watirspec/remote_server.rb
 - lib/watirspec/runner.rb
 - lib/watirspec/server.rb
 - lib/watirspec/server/app.rb
@@ -303,6 +312,7 @@ files:
 - spec/implementation_spec.rb
 - spec/input_spec.rb
 - spec/locator_spec_helper.rb
+- spec/logger_spec.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
 - spec/watirspec/adjacent_spec.rb
@@ -494,6 +504,7 @@ test_files:
 - spec/implementation_spec.rb
 - spec/input_spec.rb
 - spec/locator_spec_helper.rb
+- spec/logger_spec.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
 - spec/watirspec/adjacent_spec.rb