capybara 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e04794fbb1724e14269beeff9388b53a6f8603b
-  data.tar.gz: 377ee4cf8d61e2c1420ad7bc44b400e1f991ac30
+  metadata.gz: 07946b3e00d76327b735257b253d81a77f0bfd00
+  data.tar.gz: d374024318381ec84383a452871be665f7645168
 SHA512:
-  metadata.gz: afcaeaf6eb1aa0690b74ffa21acbaea6282b2ed0aba4382bc926ec6a6fbdd43bff3facc886e2d5558f7cf9af167a8278ef9ded0e946dbc9052168fc6583e94f4
-  data.tar.gz: b6be9f0cd07cc125a46f14c9a322b789547eb875252a10d217b4c1410080bf4be0c146c83361846a17a114b1c648416dca1a3301eefdb26087f215a0fa120872
+  metadata.gz: 0d5d700c0b6473d31e6196ff3def9f259a72038c4bfc4082e2b2351bda87ecbe20d25843d59eaba8f6b50de19f0314e708d9e340149cf0385eb2e8c0874f2bfc
+  data.tar.gz: 5ce06798a097f56b478b3d1d9345aa50bc21977db980832747dba6429edd9506ea20aecbaebd320aae9e17675c46201f168bbdbc34ddf9cc3923e3458eef6184

data/History.md

@@ -1,3 +1,11 @@
+#2.10.1
+Release date: 2016-10-08
+
+### Fixed
+* App errors are now correctly raised with the explanatory cause in JRuby [Thomas Walpole]
+* Capybara::Result optimization disabled in JRuby due to issue with lazy enumerator evaluation [Thomas Walpole]
+  See: https://github.com/jruby/jruby/issues/4212
+
 #2.10.0
 Release date: 2016-10-05
 

data/lib/capybara/result.rb

@@ -28,6 +28,11 @@ module Capybara
       @result_cache = []
       @results_enum = lazy_select_elements { |node| query.matches_filters?(node) }
       @query = query
+      # JRuby has an issue with eagerly finding next in lazy enumerators which
+      # causes a concurrency issue with network requests here
+      # https://github.com/jruby/jruby/issues/4212
+      # Just force all the results to be evaluated
+      full_results if RUBY_PLATFORM == 'java'
     end
 
     def_delegators :full_results, :size, :length, :last, :values_at, :inspect, :sample

data/lib/capybara/selector.rb

@@ -345,6 +345,7 @@ Capybara.add_selector(:select) do
     end
     options.sort == actual.sort
   end
+
   filter(:with_options) do |node, options|
     finder_settings = { minimum: 0 }
     if !node.visible?
@@ -352,6 +353,7 @@ Capybara.add_selector(:select) do
     end
     options.all? { |option| node.first(:option, option, finder_settings) }
   end
+
   filter(:selected) do |node, selected|
     actual = node.all(:xpath, './/option', visible: false).select { |option| option.selected? }.map { |option| option.text(:all) }
     [selected].flatten.sort == actual.sort

data/lib/capybara/selenium/driver.rb

@@ -2,6 +2,7 @@
 require "uri"
 
 class Capybara::Selenium::Driver < Capybara::Driver::Base
+
   DEFAULT_OPTIONS = {
     :browser => :firefox
   }
@@ -40,6 +41,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       end
     end
 
+
     @app = app
     @browser = nil
     @exit_status = nil

data/lib/capybara/session.rb

@@ -125,7 +125,7 @@ module Capybara
         begin
           raise CapybaraError, "Your application server raised an error - It has been raised in your test code because Capybara.raise_server_errors == true"
         rescue CapybaraError
-          raise @server.error
+          raise @server.error.class, @server.error.message, @server.error.backtrace
         end
       end
     ensure

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

@@ -70,7 +70,7 @@ $(function() {
     }
   });
   $('#open-alert').click(function() {
-    alert('Alert opened');
+    alert('Alert opened [*Yay?*]');
     $(this).attr('opened', 'true');
   });
   $('#open-delayed-alert').click(function() {

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

@@ -18,6 +18,20 @@ Capybara::SpecHelper.spec '#accept_alert', requires: [:modals] do
     expect(@session).to have_xpath("//a[@id='open-alert' and @opened='true']")
   end
 
+  it 'should accept the alert if text contains "special" Regex characters' do
+    @session.accept_alert 'opened [*Yay?*]' do
+      @session.click_link('Open alert')
+    end
+    expect(@session).to have_xpath("//a[@id='open-alert' and @opened='true']")
+  end
+
+  it "should accept the alert if the text matches a regexp" do
+    @session.accept_alert /op.{2}ed/ do
+      @session.click_link('Open alert')
+    end
+    expect(@session).to have_xpath("//a[@id='open-alert' and @opened='true']")
+  end
+
   it "should not accept the alert if the text doesnt match" do
     expect do
       @session.accept_alert 'Incorrect Text' do
@@ -30,7 +44,7 @@ Capybara::SpecHelper.spec '#accept_alert', requires: [:modals] do
     message = @session.accept_alert do
       @session.click_link('Open alert')
     end
-    expect(message).to eq('Alert opened')
+    expect(message).to eq('Alert opened [*Yay?*]')
   end
 
   context "with an asynchronous alert" do

data/lib/capybara/version.rb

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

data/spec/result_spec.rb

@@ -73,6 +73,7 @@ RSpec.describe Capybara::Result do
 
   #Not a great test but it indirectly tests what is needed
   it "should evaluate filters lazily" do
+    skip 'JRuby has an issue with lazy enumerator next evaluation' if RUBY_PLATFORM == 'java'
     #Not processed until accessed
     expect(result.instance_variable_get('@result_cache').size).to be 0
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -442,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,