capybara 2.15.2 → 2.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eb9fd96f4bd71cd4b6f610b7dae3d0b6da6fe21
-  data.tar.gz: 615cf0e0fb68f9d6792338470bdd9dd277c4c673
+  metadata.gz: 900f8b3c6c40c11e73ea6b87c66f457f5dc31ba4
+  data.tar.gz: cc898006a411581c3496edf13da7beedca981972
 SHA512:
-  metadata.gz: 48a0d0f5c133fbfd57a424410943830b1ce28cfe21784b4e085f9a2cfcf0f6bf207dca0cda824875a140aaf103d54c6e76ed3f821fe3700e33348bf1aaca9e22
-  data.tar.gz: a9b0cbed365316d646d66cce8c11912631bd9c2214e90eea6d81ebec289cec5e5a66428a57a6e85d68ee936e1a9570193fc7982b85e5bb89ac5461812523d631
+  metadata.gz: 6a67ce2f18bd4995585b190df6483210f47782282df576d3e46655942f0ec23b962b52027a03fd97f4de48eefa73f931c3675a78388c6341b30c8394961771c0
+  data.tar.gz: '01017609801364f823592cf2a318264613d73e1b6b901e29ab78dbb88612e9694952f5172fa947b8ffc8cb48b9b0f2487768357b2ea81f939276bf53512ac043'

data/History.md

@@ -1,3 +1,9 @@
+# Version 2.15.3
+Release date: Unreleased
+
+### Fixed
+*  Visiting '/' when Capybara.app_host has a trailing '/' - Issue #1918 [Thomas Walpole]
+
 # Version 2.15.2
 Release date: 2017-10-02
 

data/lib/capybara/session.rb

@@ -257,18 +257,19 @@ module Capybara
 
       uri_base.port ||= @server.port if @server && config.always_include_port
 
-      # TODO - this is only for compatability with previous 2.x behavior that concatenated
-      # Capybara.app_host and a "relative" path - Consider removing in 3.0
-      # @abotalov brought up a good point about this behavior potentially being useful to people
-      # deploying to a subdirectory and/or single page apps where only the url fragment changes
-      if visit_uri.scheme.nil? && uri_base
-        visit_uri.path = uri_base.path + visit_uri.path
-      end
-
       if uri_base && [nil, 'http', 'https'].include?(visit_uri.scheme)
-        visit_uri = uri_base.merge(visit_uri.to_hash.delete_if { |k,v| v.nil? })
-      end
+        visit_uri_parts = visit_uri.to_hash.delete_if { |k,v| v.nil? }
+
+        if visit_uri.scheme.nil?
+          # TODO - this is only for compatability with previous 2.x behavior that concatenated
+          # Capybara.app_host and a "relative" path - Consider removing in 3.0
+          # @abotalov brought up a good point about this behavior potentially being useful to people
+          # deploying to a subdirectory and/or single page apps where only the url fragment changes
+          visit_uri_parts[:path] = uri_base.path + visit_uri.path
+        end
 
+        visit_uri = uri_base.merge(visit_uri_parts)
+      end
       driver.visit(visit_uri.to_s)
     end
 

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

@@ -113,8 +113,13 @@ Capybara::SpecHelper.spec '#visit' do
       @session.visit('/times')
       expect(@session).to have_content('redirection complete')
     end
-  end
 
+    it "should work if `app_host` has a trailing /", requires: [:server] do
+      Capybara.app_host = "http://#{@session.server.host}:#{@session.server.port}/"
+      @session.visit('/')
+      expect(@session).to have_content('Hello world!')
+    end
+  end
 
   it "should send no referer when visiting a page" do
     @session.visit '/get_referer'

data/lib/capybara/version.rb

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

metadata

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