capybara 2.14.1 → 2.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f26eecbab15830d1234ded90963559b1bcc5a189
-  data.tar.gz: 1c53aa8f1da2909f235f41c778b48c0633749025
+  metadata.gz: 2dc6b7471732df96709e856d00f104f1e2f43aac
+  data.tar.gz: 7c8e722e733587c8f3854e461f7e5ab168a93c26
 SHA512:
-  metadata.gz: 5d610898b0ab9dd9d8cdddc43de6e4933d041bc48bf38882865537986d5851e1ee24de44bbc172ea825a69dfe1ae4e98acc42269c0f86869cf54cc213da825b7
-  data.tar.gz: 6c7cc0c84a10b0b10f3990ab570cd065cdb329ec0ef3f55304d4fb6f66fa53e6e4498239e4c364fb80d9fedcf3c52bf5712f7d4131169c74e95b586c02c569f7
+  metadata.gz: 18629cb7fd46d4d80ee6de85508ebd7349ee9544cf0653b421c4184e13a289edad3da27a5ba7eeca44a3921c7b0db24de9d7440c56955a97d8b9dfa4d7b8ac0e
+  data.tar.gz: 81ec7b11745dfc178f4c1c9c57d7b6dbc0f56b1f5ec68bde85ed3375fee04fcd9ed7f4c6a19a040b13556400933e67a4c246bc0873e7b02370ec17ea251cf1f3

data/History.md

@@ -1,3 +1,11 @@
+# Version 2.14.2
+
+Release date: 2017-06-09
+
+### Fixed
+
+* Workaround for system modals when using headless Chrome now works if the page changes
+
 # Version 2.14.1
 
 Release date: 2017-06-07

data/lib/capybara/selenium/driver.rb

@@ -368,6 +368,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
         prompt: window.prompt,
         confirm: window.confirm,
         alert: window.alert,
+        called: false
       }
       window.capybara.add_handler(modal_handler);
 
@@ -420,15 +421,19 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       ignore: Selenium::WebDriver::Error::NoAlertPresentError)
     begin
       wait.until do
-        called, alert_text = evaluate_script('window.capybara.current_modal_status()')
+        called, alert_text = evaluate_script('window.capybara && window.capybara.current_modal_status()')
         if called
-          execute_script('window.capybara.modal_handlers.shift()')
+          execute_script('window.capybara && window.capybara.modal_handlers.shift()')
           regexp = options[:text].is_a?(Regexp) ? options[:text] : Regexp.escape(options[:text].to_s)
           if alert_text.match(regexp)
             alert_text
           else
             raise Capybara::ModalNotFound.new("Unable to find modal dialog#{" with #{options[:text]}" if options[:text]}")
           end
+        elsif called.nil?
+          # page changed so modal_handler data has gone away
+          warn "Can't verify modal text when page change occurs - ignoring" if options[:text]
+          ""
         else
           nil
         end

data/lib/capybara/spec/public/test.js

@@ -87,6 +87,10 @@ $(function() {
       $(link).attr('opened', 'true');
     }, 3000);
   });
+  $('#alert-page-change').click(function() {
+    alert('Page is changing');
+    return true;
+  });
   $('#open-confirm').click(function() {
     if(confirm('Confirm opened')) {
       $(this).attr('confirmed', 'true');

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

@@ -47,6 +47,14 @@ Capybara::SpecHelper.spec '#accept_alert', requires: [:modals] do
     expect(message).to eq('Alert opened [*Yay?*]')
   end
 
+  it "should handle the alert if the page changes" do
+    @session.accept_alert do
+      @session.click_link('Alert page change')
+      sleep 1 # ensure page change occurs before the accept_alert block exits
+    end
+    expect(@session).to have_current_path('/with_html')
+  end
+
   context "with an asynchronous alert" do
     it "should accept the alert" do
       @session.accept_alert do

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

@@ -76,6 +76,7 @@
 
     <p>
       <a href="#" id="open-alert">Open alert</a>
+      <a href="/with_html" id="alert-page-change">Alert page change</a>
     </p>
 
     <p>

data/lib/capybara/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.14.1
+  version: 2.14.2
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri