capybara 2.17.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f913df68a0c00ede749cba87a0b229ff28e9e6b8f8f45bbbbd07577729f1c6a
-  data.tar.gz: 37a3fdfec9dc3cab859eae2300819d4691c1f20ccb05acf98807e7e287796c98
+  metadata.gz: fb46b7bc5ae7408ca3870b781d015a84bd84abd0a9c7e3ea2bcdf3d8fff85ce8
+  data.tar.gz: 1865dc1efa384c3792161a134bc536c56dca3aa0670ca298ad9f3aa12b49830d
 SHA512:
-  metadata.gz: 1edbf3df7b7357bbb96937c10eecffa5afa6ead2c119b0607bae820973702197de1536ec540968100d00355d07227c1f531f793156d645124d9f1a0250802996
-  data.tar.gz: e5a51fbceb1d26ddf7a101712bb407bc835ab701038b6e103c9f25c7677308fbda93ec515701862b297810b962dffac3b0e3ed35032296a6cf1f78c4adb4b79e
+  metadata.gz: 9bc2cb739af408323d977b7ca829aa0862ef68ab7d1778c5ae67fb127a47a09258c1f5b53f9d7955bcfcd2892c869a136d7a5346b9115a9e55713ea47c95ebb3
+  data.tar.gz: e8d234ded45305e026b615c60e4eb8597e31fd67b7daefff51d13ab3d79868745e21668a6b45452366ac5a552b38e8c01dc669e73dbe45a9b38ecf8363b54e83

data/History.md

@@ -1,3 +1,15 @@
+#Version 2.18.0
+Release date: 2018-02-12
+
+### Fixed
+
+* Firefox/geckodriver setting of contenteditable childs contents
+* Ignore Selenium::WebDriver::Error::SessionNotCreatedError when quitting driver [Tim Connor]
+
+### Removed
+
+* Headless chrome modal JS injection that is no longer needed for Chrome 64+/chromedriver 2.35+
+
 # Version 2.17.0
 Release date: 2018-01-02
 

data/lib/capybara/selenium/driver.rb

@@ -232,41 +232,27 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def accept_modal(_type, options={})
-    if headless_chrome?
-      raise ArgumentError, "Block that triggers the system modal is missing" unless block_given?
-      insert_modal_handlers(true, options[:with])
-      yield
-      find_headless_modal(options)
-    else
-      yield if block_given?
-      modal = find_modal(options)
+    yield if block_given?
+    modal = find_modal(options)
 
-      modal.send_keys options[:with] if options[:with]
+    modal.send_keys options[:with] if options[:with]
 
-      message = modal.text
-      modal.accept
-      message
-    end
+    message = modal.text
+    modal.accept
+    message
   end
 
   def dismiss_modal(_type, options={})
-    if headless_chrome?
-      raise ArgumentError, "Block that triggers the system modal is missing" unless block_given?
-      insert_modal_handlers(false, options[:with])
-      yield
-      find_headless_modal(options)
-    else
-      yield if block_given?
-      modal = find_modal(options)
-      message = modal.text
-      modal.dismiss
-      message
-    end
+    yield if block_given?
+    modal = find_modal(options)
+    message = modal.text
+    modal.dismiss
+    message
   end
 
   def quit
     @browser.quit if @browser
-  rescue Errno::ECONNREFUSED
+  rescue Selenium::WebDriver::Error::SessionNotCreatedError, Errno::ECONNREFUSED
     # Browser must have already gone
   rescue Selenium::WebDriver::Error::UnknownError => e
     unless silenced_unknown_error_message?(e.message) # Most likely already gone
@@ -308,18 +294,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser_name == "chrome"
   end
 
-  # @api private
-  def headless_chrome?
-    if chrome?
-      caps = @processed_options[:desired_capabilities]
-      chrome_options = caps[:chrome_options] || caps[:chromeOptions] || {}
-      args = chrome_options['args'] || chrome_options[:args] || []
-      return args.include?("--headless") || args.include?("headless")
-    end
-    return false
-  end
-
-
   # @deprecated This method is being removed
   def browser_initialized?
     super && !@browser.nil?

data/lib/capybara/selenium/node.rb

@@ -78,7 +78,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
         JS
         driver.execute_script script, self
 
-        if (driver.chrome?) || (driver.firefox? && !driver.marionette?)
+        if driver.chrome? || driver.firefox?
           # chromedriver raises a can't focus element for child elements if we use native.send_keys
           # we've already focused it so just use action api
           driver.browser.action.send_keys(value.to_s).perform

data/lib/capybara/spec/views/initial_alert.erb

@@ -0,0 +1,10 @@
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+  <body>
+    <div>
+      Initial alert page
+    </div>
+    <script>
+      window.alert("Initial alert");
+    </script>
+  </body>
+</html>

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.17.0'
+  VERSION = '2.18.0'
 end

data/spec/shared_selenium_session.rb

@@ -58,16 +58,16 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
     describe "#accept_alert" do
       it "supports a blockless mode" do
         @session.visit('/with_js')
-        skip "Headless Chrome doesn't support blockless modal methods" if @session.driver.send(:headless_chrome?)
         @session.click_link('Open alert')
         @session.accept_alert
         expect{@session.driver.browser.switch_to.alert}.to raise_error(@session.driver.send(:modal_error))
       end
 
-      it "raises if block is missing" do
-        @session.visit('/with_js')
-        skip "Only Headless Chrome requires the block due to system modal JS injection" unless @session.driver.send(:headless_chrome?)
-        expect { @session.accept_alert }.to raise_error(ArgumentError)
+      it "can be called before visiting" do
+        @session.accept_alert "Initial alert" do
+          @session.visit('/initial_alert')
+        end
+        expect(@session).to have_text('Initial alert page')
       end
     end
 
@@ -205,9 +205,6 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
 
     describe "Element#click" do
       it "should handle fixed headers/footers" do
-        if mode == :selenium_marionette && !(ENV['TRAVIS_ALLOW_FAILURE']=='true')
-          pending "geckodriver/firefox/marionette just fail to click without reporting an error - no way for us to detect/catch"
-        end
         @session.visit('/with_fixed_header_footer')
         # @session.click_link('Go to root')
         @session.find(:link, 'Go to root').click

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -449,6 +449,7 @@ files:
 - lib/capybara/spec/views/frame_two.erb
 - lib/capybara/spec/views/header_links.erb
 - lib/capybara/spec/views/host_links.erb
+- lib/capybara/spec/views/initial_alert.erb
 - lib/capybara/spec/views/path.erb
 - lib/capybara/spec/views/popup_one.erb
 - lib/capybara/spec/views/popup_two.erb
@@ -516,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,