capybara 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07946b3e00d76327b735257b253d81a77f0bfd00
-  data.tar.gz: d374024318381ec84383a452871be665f7645168
+  metadata.gz: 21fdd89225cd5ecf58f6e1eb72da29832f70ba9a
+  data.tar.gz: edada38839bc4b98461a27b02f196ec2e2e58ac7
 SHA512:
-  metadata.gz: 0d5d700c0b6473d31e6196ff3def9f259a72038c4bfc4082e2b2351bda87ecbe20d25843d59eaba8f6b50de19f0314e708d9e340149cf0385eb2e8c0874f2bfc
-  data.tar.gz: 5ce06798a097f56b478b3d1d9345aa50bc21977db980832747dba6429edd9506ea20aecbaebd320aae9e17675c46201f168bbdbc34ddf9cc3923e3458eef6184
+  metadata.gz: 4f2ed74c7e278e93c5dcf3f92ab35b51a2b31578bff67e25c83076f65ab8e7edd50a2b63afd41ddd65e0a7bc438e6d27adcaae17fcafad6f0e4cd52b241e5797
+  data.tar.gz: a97567024d5a9d18858e8b4b1b9920819a6655708f87206ad5c281de9bb39cb5e2185dd1f710618e745483c925ba6e09bbba143d17f7ded222c80acab7be9ce2

data/History.md

@@ -1,3 +1,10 @@
+#2.10.2
+Release date: 2016-11-30
+
+### Fixed
+* App exceptions with multiple parameter initializers now re-raised correctly - Issue #1785 [Michael Lutsiuk]
+* Use Addressable::URI when parsing current_path since it's more lenient of technically invalid URLs - Issue #1801 [Marcos Duque, Thomas Walpole]
+
 #2.10.1
 Release date: 2016-10-08
 

data/lib/capybara/session.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'capybara/session/matchers'
+require 'addressable/uri'
 
 module Capybara
 
@@ -125,7 +126,8 @@ 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.class, @server.error.message, @server.error.backtrace
+          #needed to get the cause set correctly in JRuby -- otherwise we could just do raise @server.error
+          raise @server.error, @server.error.message, @server.error.backtrace
         end
       end
     ensure
@@ -167,7 +169,11 @@ module Capybara
     # @return [String] Path of the current page, without any domain information
     #
     def current_path
-      path = URI.parse(current_url).path
+      # Addressable parsing is more lenient than URI
+      uri = Addressable::URI.parse(current_url)
+      # Addressable doesn't support opaque URIs - we want nil here
+      return nil if uri.scheme == "about"
+      path = uri.path
       path if path and not path.empty?
     end
 

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

@@ -428,6 +428,17 @@ Capybara::SpecHelper.spec "node" do
         expect(e.cause.message).to match /Your application server raised an error/
       end
     end
+
+    it "sets an explanatory exception as the cause of server exceptions with errors with initializers", requires: [:server, :js], twtw: true do
+      skip "This version of ruby doesn't support exception causes" unless Exception.instance_methods.include? :cause
+      quietly { @session.visit("/other_error") }
+      expect do
+        @session.find(:css, 'span')
+      end.to raise_error(TestApp::TestAppOtherError) do |e|
+        expect(e.cause).to be_a Capybara::CapybaraError
+        expect(e.cause.message).to match /Your application server raised an error/
+      end
+    end
   end
 
   def be_an_invalid_element_error(session)

data/lib/capybara/spec/test_app.rb

@@ -6,7 +6,12 @@ require 'yaml'
 
 class TestApp < Sinatra::Base
   class TestAppError < StandardError; end
-
+  class TestAppOtherError < StandardError
+    def initialize(string1, msg)
+      @something = string1
+      @message = msg
+    end
+  end
   set :root, File.dirname(__FILE__)
   set :static, true
   set :raise_errors, true
@@ -125,6 +130,10 @@ class TestApp < Sinatra::Base
     raise TestAppError, "some error"
   end
 
+  get '/other_error' do
+    raise TestAppOtherError.new("something", "other error")
+  end
+
   get '/load_error' do
     raise LoadError
   end

data/lib/capybara/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -422,7 +422,7 @@ files:
 - spec/server_spec.rb
 - spec/shared_selenium_session.rb
 - spec/spec_helper.rb
-homepage: https://github.com/jnicklas/capybara
+homepage: https://github.com/teamcapybara/capybara
 licenses:
 - MIT
 metadata: {}
@@ -442,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,