capybara 2.6.0 → 2.7.0

data/spec/server_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe Capybara::Server do
@@ -71,23 +72,102 @@ RSpec.describe Capybara::Server do
     expect(@res2.body).to include('Hello Second Server')
   end
 
-  it "should use the server if it already running" do
-    @app1 = proc { |env| [200, {}, ["Hello Server!"]]}
-    @app2 = proc { |env| [200, {}, ["Hello Second Server!"]]}
+  context "When Capybara.reuse_server is true" do
+    before do
+      @old_reuse_server = Capybara.reuse_server
+      Capybara.reuse_server = true
+    end
 
-    @server1a = Capybara::Server.new(@app1).boot
-    @server1b = Capybara::Server.new(@app1).boot
-    @server2a = Capybara::Server.new(@app2).boot
-    @server2b = Capybara::Server.new(@app2).boot
+    after do
+      Capybara.reuse_server = @old_reuse_server
+    end
 
-    @res1 = Net::HTTP.start(@server1b.host, @server1b.port) { |http| http.get('/') }
-    expect(@res1.body).to include('Hello Server')
+    it "should use the existing server if it already running" do
+      @app = proc { |env| [200, {}, ["Hello Server!"]]}
 
-    @res2 = Net::HTTP.start(@server2b.host, @server2b.port) { |http| http.get('/') }
-    expect(@res2.body).to include('Hello Second Server')
+      @server1 = Capybara::Server.new(@app).boot
+      @server2 = Capybara::Server.new(@app).boot
+
+      res = Net::HTTP.start(@server1.host, @server1.port) { |http| http.get('/') }
+      expect(res.body).to include('Hello Server')
+
+      res = Net::HTTP.start(@server2.host, @server2.port) { |http| http.get('/') }
+      expect(res.body).to include('Hello Server')
+
+      expect(@server1.port).to eq(@server2.port)
+    end
+
+    it "detects and waits for all reused server sessions pending requests" do
+      done = false
+
+      app = proc do |env|
+        request = Rack::Request.new(env)
+        sleep request.params['wait_time'].to_f
+        done = true
+        [200, {}, ["Hello Server!"]]
+      end
+
+      server1 = Capybara::Server.new(app).boot
+      server2 = Capybara::Server.new(app).boot
+
+      start_request(server1, 0.5)
+      start_request(server2, 1.0)
+
+      expect {
+        server1.wait_for_pending_requests
+      }.to change{done}.from(false).to(true)
+      expect(server2.instance_variable_get('@middleware').pending_requests?).to eq(false)
+    end
+
+  end
+
+  context "When Capybara.reuse_server is false" do
+    before do
+      @old_reuse_server = Capybara.reuse_server
+      Capybara.reuse_server = false
+    end
+
+    after do
+      Capybara.reuse_server = @old_reuse_server
+    end
+
+    it "should not reuse an already running server" do
+      @app = proc { |env| [200, {}, ["Hello Server!"]]}
+
+      @server1 = Capybara::Server.new(@app).boot
+      @server2 = Capybara::Server.new(@app).boot
+
+      res = Net::HTTP.start(@server1.host, @server1.port) { |http| http.get('/') }
+      expect(res.body).to include('Hello Server')
+
+      res = Net::HTTP.start(@server2.host, @server2.port) { |http| http.get('/') }
+      expect(res.body).to include('Hello Server')
+
+      expect(@server1.port).not_to eq(@server2.port)
+    end
+
+    it "detects and waits for only one sessions pending requests" do
+      done = false
+
+      app = proc do |env|
+        request = Rack::Request.new(env)
+        sleep request.params['wait_time'].to_f
+        done = true
+        [200, {}, ["Hello Server!"]]
+      end
+
+      server1 = Capybara::Server.new(app).boot
+      server2 = Capybara::Server.new(app).boot
+
+      start_request(server1, 0.5)
+      start_request(server2, 1.0)
+
+      expect {
+        server1.wait_for_pending_requests
+      }.to change{done}.from(false).to(true)
+      expect(server2.instance_variable_get('@middleware').pending_requests?).to eq(true)
+    end
 
-    expect(@server1a.port).to eq(@server1b.port)
-    expect(@server2a.port).to eq(@server2b.port)
   end
 
   it "should raise server errors when the server errors before the timeout" do
@@ -113,4 +193,12 @@ RSpec.describe Capybara::Server do
     expect(Net::HTTP).to receive(:start).and_raise(SystemCallError.allocate)
     expect(server.responsive?).to eq false
   end
+
+  def start_request(server, wait_time)
+    # Start request, but don't wait for it to finish
+    socket = TCPSocket.new(server.host, server.port)
+    socket.write "GET /?wait_time=#{wait_time.to_s} HTTP/1.0\r\n\r\n"
+    socket.close
+    sleep 0.1
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rspec/expectations'
 require "capybara/spec/spec_helper"
 require "pry"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -198,16 +198,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +250,8 @@ files:
 - lib/capybara/node/simple.rb
 - lib/capybara/queries/base_query.rb
 - lib/capybara/queries/current_path_query.rb
+- lib/capybara/queries/match_query.rb
+- lib/capybara/queries/selector_query.rb
 - lib/capybara/queries/text_query.rb
 - lib/capybara/queries/title_query.rb
 - lib/capybara/query.rb
@@ -264,6 +266,7 @@ files:
 - lib/capybara/rspec/features.rb
 - lib/capybara/rspec/matchers.rb
 - lib/capybara/selector.rb
+- lib/capybara/selector/filter.rb
 - lib/capybara/selenium/driver.rb
 - lib/capybara/selenium/node.rb
 - lib/capybara/server.rb
@@ -294,6 +297,10 @@ files:
 - lib/capybara/spec/session/current_url_spec.rb
 - lib/capybara/spec/session/dismiss_confirm_spec.rb
 - lib/capybara/spec/session/dismiss_prompt_spec.rb
+- lib/capybara/spec/session/element/assert_match_selector.rb
+- lib/capybara/spec/session/element/match_css_spec.rb
+- lib/capybara/spec/session/element/match_xpath_spec.rb
+- lib/capybara/spec/session/element/matches_selector_spec.rb
 - lib/capybara/spec/session/evaluate_script_spec.rb
 - lib/capybara/spec/session/execute_script_spec.rb
 - lib/capybara/spec/session/fill_in_spec.rb
@@ -327,6 +334,7 @@ files:
 - lib/capybara/spec/session/save_screenshot_spec.rb
 - lib/capybara/spec/session/screenshot_spec.rb
 - lib/capybara/spec/session/select_spec.rb
+- lib/capybara/spec/session/selectors_spec.rb
 - lib/capybara/spec/session/source_spec.rb
 - lib/capybara/spec/session/text_spec.rb
 - lib/capybara/spec/session/title_spec.rb
@@ -367,7 +375,9 @@ files:
 - lib/capybara/spec/views/with_js.erb
 - lib/capybara/spec/views/with_scope.erb
 - lib/capybara/spec/views/with_simple_html.erb
+- lib/capybara/spec/views/with_slow_unload.erb
 - lib/capybara/spec/views/with_title.erb
+- lib/capybara/spec/views/with_unload_alert.erb
 - lib/capybara/spec/views/with_windows.erb
 - lib/capybara/spec/views/within_frames.erb
 - lib/capybara/version.rb