capybara 2.15.3 → 2.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 900f8b3c6c40c11e73ea6b87c66f457f5dc31ba4
-  data.tar.gz: cc898006a411581c3496edf13da7beedca981972
+  metadata.gz: b58346a93d1b784ad960451eea0e16c2cdb5264a
+  data.tar.gz: 6386e073e35c61290e7fdf77353d06f1b887af08
 SHA512:
-  metadata.gz: 6a67ce2f18bd4995585b190df6483210f47782282df576d3e46655942f0ec23b962b52027a03fd97f4de48eefa73f931c3675a78388c6341b30c8394961771c0
-  data.tar.gz: '01017609801364f823592cf2a318264613d73e1b6b901e29ab78dbb88612e9694952f5172fa947b8ffc8cb48b9b0f2487768357b2ea81f939276bf53512ac043'
+  metadata.gz: 5bf103e7ee612aa2ba02f530d77c7cd01430d43df2ac4221a40b8b415e1ccf7f41df84d3ea6795f6629f9d019521169a868dce350c26f4c65d764e92c743f13e
+  data.tar.gz: e94720fb414e4715748628717a13270372e3e1f1238fb8d36e8811d0060782f86a1ff851fdb1b1e78e8624cd4e3d5c6cb72b6de7af5a5b9276bf4098e15e0717

data/History.md

@@ -1,5 +1,11 @@
+# Version 2.15.4
+Release date: 2017-10-07
+
+### Fixed
+*  Visiting an absolute URL shouldn't overwrite the port when no server or always_include_port=false - Issue #1921
+
 # Version 2.15.3
-Release date: Unreleased
+Release date: 2017-10-03
 
 ### Fixed
 *  Visiting '/' when Capybara.app_host has a trailing '/' - Issue #1918 [Thomas Walpole]

data/lib/capybara.rb

@@ -69,7 +69,7 @@ module Capybara
     # === Configurable options
     #
     # [app_host = String/nil]             The default host to use when giving a relative URL to visit, must be a valid URL e.g. http://www.example.com
-    # [always_include_port = Boolean]     Whether the Rack server's port should automatically be inserted into every visited URL (Default: false)
+    # [always_include_port = Boolean]     Whether the Rack server's port should automatically be inserted into every visited URL unless another port is explicitly specified (Default: false)
     # [asset_host = String]               Where dynamic assets are hosted - will be prepended to relative asset locations if present (Default: nil)
     # [run_server = Boolean]              Whether to start a Rack server for the given Rack app (Default: true)
     # [raise_server_errors = Boolean]     Should errors raised in the server be raised in the tests? (Default: true)

data/lib/capybara/session.rb

@@ -255,21 +255,24 @@ module Capybara
         config.app_host && ::Addressable::URI.parse(config.app_host)
       end
 
-      uri_base.port ||= @server.port if @server && config.always_include_port
-
       if uri_base && [nil, 'http', 'https'].include?(visit_uri.scheme)
-        visit_uri_parts = visit_uri.to_hash.delete_if { |k,v| v.nil? }
+        if visit_uri.relative?
+          uri_base.port ||= @server.port if @server && config.always_include_port
+
+          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)
+          visit_uri = uri_base.merge(visit_uri_parts)
+        else
+          visit_uri.port ||= @server.port if @server && config.always_include_port
+        end
       end
+
       driver.visit(visit_uri.to_s)
     end
 

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

@@ -80,8 +80,41 @@ Capybara::SpecHelper.spec '#visit' do
       @session.visit('/random')
     end
 
+    it "shouldn't override port if no server", requires: [:server] do
+      session = Capybara::Session.new(@session.mode, nil)
+      expect(session.driver).to receive(:visit).with("http://www.google.com")
+      session.visit("http://www.google.com")
+    end
+
+    it "shouldn't override port if no server but app_host is set", requires: [:server] do
+      session = Capybara::Session.new(@session.mode, nil)
+      Capybara.app_host = "http://www.example.com:6666"
+      expect(session.driver).to receive(:visit).with("http://www.google.com")
+      session.visit("http://www.google.com")
+    end
+  end
+
+  context "when Capybara.always_include_port is false" do
+    before(:each) do
+      Capybara.always_include_port = false
+    end
+
+    it "shouldn't overwrite port if app_host is set", requires: [:server] do
+      session = Capybara::Session.new(@session.mode, nil)
+      Capybara.app_host = "http://www.example.com:6666"
+      expect(session.driver).to receive(:visit).with("http://www.google.com")
+      session.visit("http://www.google.com")
+    end
+
+    it "shouldn't overwrite port if port specfified", requires: [:server] do
+      session = Capybara::Session.new(@session.mode, nil)
+      Capybara.app_host = "http://www.example.com:6666"
+      expect(session.driver).to receive(:visit).with("http://www.google.com:99")
+      session.visit("http://www.google.com:99")
+    end
   end
 
+
   context "without a server", requires: [:server] do
     it "should respect `app_host`" do
       serverless_session = Capybara::Session.new(@session.mode, nil)

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

@@ -101,7 +101,7 @@ Capybara::SpecHelper.spec '#within' do
           expect do
             @session.within(".//div[@id='doesnotexist']") do
             end
-          end.to raise_error(Capybara::ElementNotFound, %Q{Unable to find visible xpath ".//div[@id='doesnotexist']" within #<Capybara::Node::Element tag="div" path="/html/body/div[1]">})
+          end.to raise_error(Capybara::ElementNotFound)
         end.to_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(false)
       end
     end.to_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(true)

data/lib/capybara/version.rb

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

metadata

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