capybara 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78eeeb205ad6e29addf7c2729e180b39076becacfee989561cea4c9e29f6bd65
-  data.tar.gz: 9adb328acd7184ee33e156ec4b842ca048aa792ddda95e9396a515778a04b82d
+  metadata.gz: 8304f8ac3e0f20f8fae8db3eedea4f623de6756708c0ba95ec83fc4587ec4321
+  data.tar.gz: dff277e0f6abb0275ff4462de9fd9de8c930032f4a574448af16688af337c58c
 SHA512:
-  metadata.gz: 89ba8bfe2b60b8dc5dd3234c6f1bff37576d93432d64e13478dde82b94d6e2e6d46ec7e4c28791744382c578223edfc242c27f34695e2a078a7637465fc01833
-  data.tar.gz: e8334635068aef37f9ca3a2bd66b9de9fa2b467391dfd9ffa1d72df333cbbeb1adb5ac120471d162286ed14ccf85af160a3421c700ce98ee7f9e3bfb2edc4377
+  metadata.gz: 7b7bfa133c75b1556490b7337178cfd3e9137157e16c922679b72067b055fd54d659237367c7f066bbb7e2a6d75311db8736abc8e4d94030898a39e39a297ae9
+  data.tar.gz: b320cdc763f873e87f13b83ec693db1f590a32a2193fb56a7dfd82310101b39636c26a1da520b723dca31672f289201d649b90a0288f1ae281ac40b6b3d612bc

data/History.md

@@ -1,3 +1,12 @@
+# Version 3.0.3
+Release date: 2018-04-30
+
+### Fixes
+
+* Issue in `check` where the locator string could not be omitted
+* Selenium browser type detection when using remote [Ian Ker-Seymer]
+* Potential hang when waiting for requests to complete [Chris Zetter]
+
 # Version 3.0.2
 Release date: 2018-04-13
 

data/lib/capybara.rb

@@ -494,6 +494,7 @@ Capybara.register_driver :selenium_chrome do |app|
 end
 
 Capybara.register_driver :selenium_chrome_headless do |app|
+  Capybara::Selenium::Driver.load_selenium
   browser_options = ::Selenium::WebDriver::Chrome::Options.new
   browser_options.args << '--headless'
   browser_options.args << '--disable-gpu'

data/lib/capybara/node/actions.rb

@@ -129,7 +129,7 @@ module Capybara
       #   @macro waiting_behavior
       #
       # @return [Capybara::Node::Element]  The element checked or the label clicked
-      def check(locator, **options)
+      def check(locator = nil, **options)
         _check_with_label(:checkbox, true, locator, **options)
       end
 

data/lib/capybara/selenium/driver.rb

@@ -13,12 +13,29 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   attr_reader :app, :options
 
+  def self.load_selenium
+    require 'selenium-webdriver'
+    # Fix for selenium-webdriver 3.4.0 which misnamed these
+    unless defined?(::Selenium::WebDriver::Error::ElementNotInteractableError)
+      ::Selenium::WebDriver::Error.const_set('ElementNotInteractableError', Class.new(::Selenium::WebDriver::Error::WebDriverError))
+    end
+    unless defined?(::Selenium::WebDriver::Error::ElementClickInterceptedError)
+      ::Selenium::WebDriver::Error.const_set('ElementClickInterceptedError', Class.new(::Selenium::WebDriver::Error::WebDriverError))
+    end
+  rescue LoadError => e
+    if e.message =~ /selenium-webdriver/
+      raise LoadError, "Capybara's selenium driver is unable to load `selenium-webdriver`, please install the gem and add `gem 'selenium-webdriver'` to your Gemfile if you are using bundler."
+    else
+      raise e
+    end
+  end
+
   def browser
     unless @browser
-      if firefox?
-        options[:desired_capabilities] ||= {}
-        options[:desired_capabilities][:unexpectedAlertBehaviour] = "ignore"
-      end
+      # if firefox?
+      #   options[:desired_capabilities] ||= {}
+      #   options[:desired_capabilities][:unexpectedAlertBehaviour] = "ignore"
+      # end
 
       @processed_options = options.reject { |key, _val| SPECIAL_OPTIONS.include?(key) }
       @browser = Selenium::WebDriver.for(options[:browser], @processed_options)
@@ -38,7 +55,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def initialize(app, **options)
-    load_selenium
+    self.class.load_selenium
     @session = nil
     @app = app
     @browser = nil
@@ -288,30 +305,26 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   # @api private
   def firefox?
-    browser_name == "firefox"
+    browser.browser == :firefox
   end
 
   # @api private
   def chrome?
-    browser_name == "chrome"
+    browser.browser == :chrome
   end
 
   # @api private
   def edge?
-    browser_name == "edge"
+    browser.browser == :edge
   end
 
   # @api private
   def ie?
-    browser_name == "ie"
+    browser.browser == :ie
   end
 
 private
 
-  def browser_name
-    options[:browser].to_s
-  end
-
   def clear_storage
     if options[:clear_session_storage]
       if @browser.respond_to? :session_storage
@@ -472,21 +485,4 @@ private
       arg
     end
   end
-
-  def load_selenium
-    require 'selenium-webdriver'
-    # Fix for selenium-webdriver 3.4.0 which misnamed these
-    unless defined?(::Selenium::WebDriver::Error::ElementNotInteractableError)
-      ::Selenium::WebDriver::Error.const_set('ElementNotInteractableError', Class.new(::Selenium::WebDriver::Error::WebDriverError))
-    end
-    unless defined?(::Selenium::WebDriver::Error::ElementClickInterceptedError)
-      ::Selenium::WebDriver::Error.const_set('ElementClickInterceptedError', Class.new(::Selenium::WebDriver::Error::WebDriverError))
-    end
-  rescue LoadError => e
-    if e.message =~ /selenium-webdriver/
-      raise LoadError, "Capybara's selenium driver is unable to load `selenium-webdriver`, please install the gem and add `gem 'selenium-webdriver'` to your Gemfile if you are using bundler."
-    else
-      raise e
-    end
-  end
 end

data/lib/capybara/selenium/node.rb

@@ -255,7 +255,7 @@ private
 
   def set_date(value) # rubocop:disable Naming/AccessorMethodName
     if value.respond_to?(:to_date)
-      set_text(value.to_date.strftime(SET_FORMATS[driver.options[:browser].to_sym][:date]))
+      set_text(value.to_date.strftime(SET_FORMATS[driver.browser.browser][:date]))
     else
       set_text(value)
     end
@@ -263,7 +263,7 @@ private
 
   def set_time(value) # rubocop:disable Naming/AccessorMethodName
     if value.respond_to?(:to_time)
-      set_text(value.to_time.strftime(SET_FORMATS[driver.options[:browser].to_sym][:time]))
+      set_text(value.to_time.strftime(SET_FORMATS[driver.browser.browser][:time]))
     else
       set_text(value)
     end
@@ -271,7 +271,7 @@ private
 
   def set_datetime_local(value) # rubocop:disable Naming/AccessorMethodName
     if value.respond_to?(:to_time)
-      set_text(value.to_time.strftime(SET_FORMATS[driver.options[:browser].to_sym][:datetime]))
+      set_text(value.to_time.strftime(SET_FORMATS[driver.browser.browser][:datetime]))
     else
       set_text(value)
     end

data/lib/capybara/server.rb

@@ -90,9 +90,13 @@ module Capybara
     end
 
     def wait_for_pending_requests
-      Timeout.timeout(60) { sleep(0.01) while pending_requests? }
-    rescue Timeout::Error
-      raise "Requests did not finish in 60 seconds"
+      start_time = Capybara::Helpers.monotonic_time
+      while pending_requests?
+        if (Capybara::Helpers.monotonic_time - start_time) > 60
+          raise "Requests did not finish in 60 seconds"
+        end
+        sleep 0.01
+      end
     end
 
     def boot
@@ -103,11 +107,15 @@ module Capybara
           Capybara.server.call(middleware, port, host)
         end
 
-        Timeout.timeout(60) { @server_thread.join(0.1) until responsive? }
+        start_time = Capybara::Helpers.monotonic_time
+        until responsive?
+          if (Capybara::Helpers.monotonic_time - start_time) > 60
+            raise "Rack application timed out during boot"
+          end
+          @server_thread.join(0.1)
+        end
       end
-    rescue Timeout::Error
-      raise "Rack application timed out during boot"
-    else
+
       self
     end
 

data/lib/capybara/spec/session/check_spec.rb

@@ -62,6 +62,12 @@ Capybara::SpecHelper.spec "#check" do
     expect(extract_results(@session)['pets']).to include('dog', 'cat', 'hamster')
   end
 
+  it "should work without a locator string" do
+    @session.check(id: "form_pets_cat")
+    @session.click_button('awesome')
+    expect(extract_results(@session)['pets']).to include('dog', 'cat', 'hamster')
+  end
+
   it "casts to string" do
     @session.check(:form_pets_cat)
     @session.click_button('awesome')

data/lib/capybara/spec/session/choose_spec.rb

@@ -17,6 +17,12 @@ Capybara::SpecHelper.spec "#choose" do
     expect(extract_results(@session)['gender']).to eq('both')
   end
 
+  it "should work without a locator string" do
+    @session.choose(id: "gender_male")
+    @session.click_button('awesome')
+    expect(extract_results(@session)['gender']).to eq('male')
+  end
+
   it "casts to string" do
     @session.choose("Both")
     @session.click_button(:awesome)

data/lib/capybara/spec/session/uncheck_spec.rb

@@ -19,6 +19,13 @@ Capybara::SpecHelper.spec "#uncheck" do
     expect(extract_results(@session)['pets']).not_to include('hamster')
   end
 
+  it "should work without a locator string" do
+    @session.uncheck(id: "form_pets_hamster")
+    @session.click_button('awesome')
+    expect(extract_results(@session)['pets']).to include('dog')
+    expect(extract_results(@session)['pets']).not_to include('hamster')
+  end
+
   it "casts to string" do
     @session.uncheck(:form_pets_hamster)
     @session.click_button('awesome')

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
 end

data/spec/selenium_spec_chrome_remote.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'selenium-webdriver'
+require 'shared_selenium_session'
+require 'rspec/shared_spec_matchers'
+
+def selenium_host
+  ENV.fetch('SELENIUM_HOST', '0.0.0.0')
+end
+
+def selenium_port
+  ENV.fetch('SELENIUM_PORT', 4444)
+end
+
+def ensure_selenium_running!
+  TCPSocket.open(selenium_host, selenium_port)
+rescue
+  raise 'Selenium is not running. ' \
+        "You can run a selenium server easily with: \n" \
+        '  $ docker-compose up -d selenium'
+end
+
+Capybara.register_driver :selenium_chrome_remote do |app|
+  ensure_selenium_running!
+
+  url = "http://#{selenium_host}:#{selenium_port}/wd/hub"
+  caps = Selenium::WebDriver::Remote::Capabilities.chrome
+
+  Capybara::Selenium::Driver.new app,
+                                 browser: :remote,
+                                 desired_capabilities: caps,
+                                 url: url
+end
+
+CHROME_REMOTE_DRIVER = :selenium_chrome_remote
+
+module TestSessions
+  Chrome = Capybara::Session.new(CHROME_REMOTE_DRIVER, TestApp)
+end
+
+skipped_tests = %i[response_headers status_code trigger]
+# skip window tests when headless for now - closing a window not supported by chromedriver/chrome
+skipped_tests << :windows if ENV['TRAVIS'] && (ENV['SKIP_WINDOW'] || ENV['HEADLESS'])
+
+Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_REMOTE_DRIVER.to_s, capybara_skip: skipped_tests
+
+RSpec.describe "Capybara::Session with chrome" do
+  include Capybara::SpecHelper
+  include_examples  "Capybara::Session", TestSessions::Chrome, CHROME_REMOTE_DRIVER
+  include_examples  Capybara::RSpecMatchers, TestSessions::Chrome, CHROME_REMOTE_DRIVER
+
+  it 'is considered to be chrome' do
+    expect(session.driver).to be_chrome
+  end
+end

data/spec/shared_selenium_session.rb

@@ -43,13 +43,15 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       end
 
       it "should have return code 1 when running selenium_driver_rspec_failure.rb" do
-        skip if ENV['HEADLESS']
+        skip if headless_or_remote?
+
         system(@env, 'rspec spec/fixtures/selenium_driver_rspec_failure.rb', out: File::NULL, err: File::NULL)
         expect($CHILD_STATUS.exitstatus).to eq(1)
       end
 
       it "should have return code 0 when running selenium_driver_rspec_success.rb" do
-        skip if ENV['HEADLESS']
+        skip if headless_or_remote?
+
         system(@env, 'rspec spec/fixtures/selenium_driver_rspec_success.rb', out: File::NULL, err: File::NULL)
         expect($CHILD_STATUS.exitstatus).to eq(0)
       end
@@ -226,4 +228,8 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       end
     end
   end
+
+  def headless_or_remote?
+    !ENV['HEADLESS'].nil? || session.driver.options[:browser] == :remote
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -473,6 +473,7 @@ files:
 - spec/rspec_spec.rb
 - spec/selector_spec.rb
 - spec/selenium_spec_chrome.rb
+- spec/selenium_spec_chrome_remote.rb
 - spec/selenium_spec_edge.rb
 - spec/selenium_spec_ie.rb
 - spec/selenium_spec_marionette.rb