capybara 2.16.0 → 2.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee26f641aae1c298d4f5c3d7e8a98376c133c1e2d6ac90b3a3a274ae0dddd13f
-  data.tar.gz: 12a92103cb8b03439ba345d2433385d5d8ec698713c1fda8d8d496c1d7a5db4a
+  metadata.gz: 94085614fef28d8c100eac0e0e11e213f0bb89ab487bb538a864da3b2ec21951
+  data.tar.gz: b61bc9c51db0e61c730bd14e3d593ff9885e45178403dd5200a368f3e67fc8e2
 SHA512:
-  metadata.gz: b63bffec8f36f684af468659992edc8368844838a7f92f0cacaca2cfb070c8d5d62baebc6308dc60bac7646a0e4a7221eca416014cbdc2a0f82ce189dedc1172
-  data.tar.gz: 26d2d8319225c85ef3ea5c1c546f321a92063adcf08a97ed1e530782e7af18aa9c7b2e8c59faaac2bf02c5a3d0d7d37d82a124dc1a0472605296745fe26f2ca8
+  metadata.gz: 465a59847ac6f986ab374e6a84c678078c8804a60341c9ecd52625cf86e1041d98629806a4e4dc08531337e9db8190dfdbea3e64e40387ad3f16bb5a1d42cf09
+  data.tar.gz: 43a4b4aaead1b7a66058269e5f8ea3f09782a2c7766c0bb7cd4c3e7f56abe7b852fe28859d3ef746135798e73b86c8c72dde7fdabce57f2765b58639c232b1e8

data/History.md

@@ -1,3 +1,11 @@
+# Version 2.16.1
+Release data: 2017-11-20
+
+### Fixed
+
+* Fix rack_test driver for rack_test 0.7.1/0.8.0 [Thomas Walpole]
+* `accept_prompt` response text can contain quotes when using selenium with headless chrome [Thomas Walpole]
+
 # Version 2.16.0
 Release date: 2017-11-13
 

data/lib/capybara/rack_test/form.rb

@@ -13,6 +13,8 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
     def original_filename; ""; end
     def content_type; "application/octet-stream"; end
     def path; @empty_file.path; end
+    def size; 0; end
+    def read; ""; end
   end
 
   def params(button)

data/lib/capybara/selenium/driver.rb

@@ -36,25 +36,8 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def initialize(app, options={})
+    load_selenium
     @session = nil
-    begin
-      require 'selenium-webdriver'
-      # Fix for selenium-webdriver 3.4.0 which misnamed these
-      if !defined?(::Selenium::WebDriver::Error::ElementNotInteractableError)
-        ::Selenium::WebDriver::Error.const_set('ElementNotInteractableError', Class.new(::Selenium::WebDriver::Error::WebDriverError))
-      end
-      if !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
-
-
     @app = app
     @browser = nil
     @exit_status = nil
@@ -375,6 +358,16 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def insert_modal_handlers(accept, response_text)
+    prompt_response = if accept
+      if response_text.nil?
+        "default_text"
+      else
+        "'#{response_text.gsub("\\", "\\\\\\").gsub("'", "\\\\'")}'"
+      end
+    else
+      'null'
+    end
+
     script = <<-JS
       if (typeof window.capybara  === 'undefined') {
         window.capybara = {
@@ -412,7 +405,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       }
       window.prompt = function(str = "", default_text = "") {
         window.capybara.handler_called(modal_handler, str.toString());
-        return #{accept ? (response_text.nil? ? "default_text" : "'#{response_text}'") : 'null'};
+        return #{prompt_response};
       }
     JS
     execute_script script
@@ -497,4 +490,23 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       arg
     end
   end
+
+  def load_selenium
+    begin
+      require 'selenium-webdriver'
+      # Fix for selenium-webdriver 3.4.0 which misnamed these
+      if !defined?(::Selenium::WebDriver::Error::ElementNotInteractableError)
+        ::Selenium::WebDriver::Error.const_set('ElementNotInteractableError', Class.new(::Selenium::WebDriver::Error::WebDriverError))
+      end
+      if !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
 end

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

@@ -40,13 +40,20 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
   end
 
   it "should accept the prompt with a blank response when there is a default" do
-    pending "Geckodriver doesn't set a blank response currently" if @session.respond_to?(:mode) && @session.mode.to_s == "selenium_marionette"
+    pending "Geckodriver doesn't set a blank response currently" if marionette?(@session)
     @session.accept_prompt with: '' do
       @session.click_link('Open defaulted prompt')
     end
     expect(@session).to have_xpath("//a[@id='open-prompt-with-default' and @response='']")
   end
 
+  it "should allow special characters in the reponse" do
+    @session.accept_prompt with: '\'the\' \b "response"' do
+      @session.click_link('Open prompt')
+    end
+    expect(@session).to have_xpath(%{//a[@id='open-prompt' and @response=concat("'the' ", '\\b "response"')]})
+  end
+
   it "should accept the prompt if the message matches" do
     @session.accept_prompt 'Prompt opened', with: 'matched' do
       @session.click_link('Open prompt')
@@ -62,7 +69,6 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
     end.to raise_error(Capybara::ModalNotFound)
   end
 
-
   it "should return the message presented" do
     message = @session.accept_prompt with: 'the response' do
       @session.click_link('Open prompt')

data/lib/capybara/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.16.1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri