RubyGems - capybara - Versions diffs - 2.6.2 → 2.7.0 - Mend

capybara 2.6.2 → 2.7.0

Files changed (163) hide show

checksums.yaml +4 -4
data/History.md +40 -15
data/README.md +45 -38
data/lib/capybara.rb +86 -10
data/lib/capybara/cucumber.rb +1 -0
data/lib/capybara/driver/base.rb +5 -2
data/lib/capybara/driver/node.rb +1 -0
data/lib/capybara/dsl.rb +1 -0
data/lib/capybara/helpers.rb +3 -2
data/lib/capybara/node/actions.rb +6 -0
data/lib/capybara/node/base.rb +1 -0
data/lib/capybara/node/document.rb +1 -0
data/lib/capybara/node/document_matchers.rb +1 -0
data/lib/capybara/node/element.rb +1 -0
data/lib/capybara/node/finders.rb +3 -2
data/lib/capybara/node/matchers.rb +72 -2
data/lib/capybara/node/simple.rb +6 -3
data/lib/capybara/queries/base_query.rb +1 -0
data/lib/capybara/queries/current_path_query.rb +1 -0
data/lib/capybara/queries/match_query.rb +21 -0
data/lib/capybara/queries/selector_query.rb +138 -0
data/lib/capybara/queries/text_query.rb +1 -0
data/lib/capybara/queries/title_query.rb +1 -0
data/lib/capybara/query.rb +3 -131
data/lib/capybara/rack_test/browser.rb +1 -0
data/lib/capybara/rack_test/css_handlers.rb +1 -0
data/lib/capybara/rack_test/driver.rb +6 -4
data/lib/capybara/rack_test/form.rb +1 -0
data/lib/capybara/rack_test/node.rb +1 -0
data/lib/capybara/rails.rb +2 -1
data/lib/capybara/result.rb +1 -0
data/lib/capybara/rspec.rb +1 -0
data/lib/capybara/rspec/features.rb +1 -0
data/lib/capybara/rspec/matchers.rb +54 -3
data/lib/capybara/selector.rb +175 -75
data/lib/capybara/selector/filter.rb +48 -0
data/lib/capybara/selenium/driver.rb +24 -7
data/lib/capybara/selenium/node.rb +1 -0
data/lib/capybara/server.rb +38 -6
data/lib/capybara/session.rb +30 -14
data/lib/capybara/session/matchers.rb +2 -1
data/lib/capybara/spec/public/test.js +6 -0
data/lib/capybara/spec/session/accept_alert_spec.rb +2 -1
data/lib/capybara/spec/session/accept_confirm_spec.rb +2 -1
data/lib/capybara/spec/session/accept_prompt_spec.rb +2 -1
data/lib/capybara/spec/session/all_spec.rb +1 -0
data/lib/capybara/spec/session/assert_current_path.rb +1 -0
data/lib/capybara/spec/session/assert_selector.rb +1 -0
data/lib/capybara/spec/session/assert_text.rb +1 -0
data/lib/capybara/spec/session/assert_title.rb +1 -0
data/lib/capybara/spec/session/attach_file_spec.rb +1 -0
data/lib/capybara/spec/session/body_spec.rb +1 -0
data/lib/capybara/spec/session/check_spec.rb +1 -0
data/lib/capybara/spec/session/choose_spec.rb +1 -0
data/lib/capybara/spec/session/click_button_spec.rb +1 -0
data/lib/capybara/spec/session/click_link_or_button_spec.rb +1 -0
data/lib/capybara/spec/session/click_link_spec.rb +1 -0
data/lib/capybara/spec/session/current_scope_spec.rb +2 -1
data/lib/capybara/spec/session/current_url_spec.rb +1 -0
data/lib/capybara/spec/session/dismiss_confirm_spec.rb +2 -1
data/lib/capybara/spec/session/dismiss_prompt_spec.rb +2 -1
data/lib/capybara/spec/session/element/assert_match_selector.rb +31 -0
data/lib/capybara/spec/session/element/match_css_spec.rb +17 -0
data/lib/capybara/spec/session/element/match_xpath_spec.rb +23 -0
data/lib/capybara/spec/session/element/matches_selector_spec.rb +63 -0
data/lib/capybara/spec/session/evaluate_script_spec.rb +1 -0
data/lib/capybara/spec/session/execute_script_spec.rb +1 -0
data/lib/capybara/spec/session/fill_in_spec.rb +1 -0
data/lib/capybara/spec/session/find_button_spec.rb +1 -0
data/lib/capybara/spec/session/find_by_id_spec.rb +1 -0
data/lib/capybara/spec/session/find_field_spec.rb +1 -0
data/lib/capybara/spec/session/find_link_spec.rb +1 -0
data/lib/capybara/spec/session/find_spec.rb +1 -0
data/lib/capybara/spec/session/first_spec.rb +1 -0
data/lib/capybara/spec/session/go_back_spec.rb +1 -0
data/lib/capybara/spec/session/go_forward_spec.rb +1 -0
data/lib/capybara/spec/session/has_button_spec.rb +1 -0
data/lib/capybara/spec/session/has_css_spec.rb +1 -0
data/lib/capybara/spec/session/has_current_path_spec.rb +1 -0
data/lib/capybara/spec/session/has_field_spec.rb +13 -0
data/lib/capybara/spec/session/has_link_spec.rb +1 -0
data/lib/capybara/spec/session/has_select_spec.rb +19 -0
data/lib/capybara/spec/session/has_selector_spec.rb +6 -0
data/lib/capybara/spec/session/has_table_spec.rb +1 -0
data/lib/capybara/spec/session/has_text_spec.rb +1 -0
data/lib/capybara/spec/session/has_title_spec.rb +1 -0
data/lib/capybara/spec/session/has_xpath_spec.rb +1 -0
data/lib/capybara/spec/session/headers.rb +1 -0
data/lib/capybara/spec/session/html_spec.rb +1 -0
data/lib/capybara/spec/session/node_spec.rb +29 -0
data/lib/capybara/spec/session/reset_session_spec.rb +35 -1
data/lib/capybara/spec/session/response_code.rb +1 -0
data/lib/capybara/spec/session/save_and_open_page_spec.rb +1 -0
data/lib/capybara/spec/session/save_and_open_screenshot_spec.rb +3 -2
data/lib/capybara/spec/session/save_page_spec.rb +34 -2
data/lib/capybara/spec/session/save_screenshot_spec.rb +31 -1
data/lib/capybara/spec/session/screenshot_spec.rb +3 -1
data/lib/capybara/spec/session/select_spec.rb +1 -0
data/lib/capybara/spec/session/selectors_spec.rb +35 -0
data/lib/capybara/spec/session/text_spec.rb +1 -0
data/lib/capybara/spec/session/title_spec.rb +2 -1
data/lib/capybara/spec/session/uncheck_spec.rb +1 -0
data/lib/capybara/spec/session/unselect_spec.rb +1 -0
data/lib/capybara/spec/session/visit_spec.rb +1 -0
data/lib/capybara/spec/session/window/become_closed_spec.rb +1 -0
data/lib/capybara/spec/session/window/current_window_spec.rb +1 -0
data/lib/capybara/spec/session/window/open_new_window_spec.rb +1 -0
data/lib/capybara/spec/session/window/switch_to_window_spec.rb +1 -0
data/lib/capybara/spec/session/window/window_opened_by_spec.rb +1 -0
data/lib/capybara/spec/session/window/window_spec.rb +1 -8
data/lib/capybara/spec/session/window/windows_spec.rb +1 -0
data/lib/capybara/spec/session/window/within_window_spec.rb +2 -3
data/lib/capybara/spec/session/within_frame_spec.rb +1 -0
data/lib/capybara/spec/session/within_spec.rb +1 -0
data/lib/capybara/spec/spec_helper.rb +2 -0
data/lib/capybara/spec/test_app.rb +1 -0
data/lib/capybara/spec/views/buttons.erb +1 -0
data/lib/capybara/spec/views/fieldsets.erb +2 -1
data/lib/capybara/spec/views/form.erb +24 -0
data/lib/capybara/spec/views/frame_child.erb +2 -1
data/lib/capybara/spec/views/frame_one.erb +2 -1
data/lib/capybara/spec/views/frame_parent.erb +2 -1
data/lib/capybara/spec/views/frame_two.erb +2 -1
data/lib/capybara/spec/views/header_links.erb +1 -0
data/lib/capybara/spec/views/host_links.erb +1 -0
data/lib/capybara/spec/views/path.erb +1 -0
data/lib/capybara/spec/views/popup_one.erb +1 -0
data/lib/capybara/spec/views/popup_two.erb +1 -0
data/lib/capybara/spec/views/postback.erb +2 -1
data/lib/capybara/spec/views/tables.erb +1 -0
data/lib/capybara/spec/views/with_base_tag.erb +1 -0
data/lib/capybara/spec/views/with_count.erb +2 -1
data/lib/capybara/spec/views/with_hover.erb +2 -1
data/lib/capybara/spec/views/with_html.erb +3 -0
data/lib/capybara/spec/views/with_html_entities.erb +1 -0
data/lib/capybara/spec/views/with_js.erb +5 -0
data/lib/capybara/spec/views/with_scope.erb +1 -0
data/lib/capybara/spec/views/with_simple_html.erb +2 -1
data/lib/capybara/spec/views/with_slow_unload.erb +17 -0
data/lib/capybara/spec/views/with_title.erb +2 -1
data/lib/capybara/spec/views/with_unload_alert.erb +12 -0
data/lib/capybara/spec/views/with_windows.erb +1 -0
data/lib/capybara/spec/views/within_frames.erb +2 -1
data/lib/capybara/version.rb +2 -1
data/lib/capybara/window.rb +1 -0
data/spec/basic_node_spec.rb +1 -0
data/spec/capybara_spec.rb +28 -1
data/spec/dsl_spec.rb +1 -0
data/spec/fixtures/selenium_driver_rspec_failure.rb +1 -0
data/spec/fixtures/selenium_driver_rspec_success.rb +1 -0
data/spec/rack_test_spec.rb +1 -0
data/spec/result_spec.rb +1 -0
data/spec/rspec/features_spec.rb +1 -0
data/spec/rspec/matchers_spec.rb +1 -0
data/spec/rspec/scenarios_spec.rb +1 -0
data/spec/rspec/views_spec.rb +1 -0
data/spec/rspec_spec.rb +1 -0
data/spec/selector_spec.rb +55 -1
data/spec/selenium_spec.rb +6 -2
data/spec/selenium_spec_chrome.rb +1 -0
data/spec/server_spec.rb +101 -13
data/spec/spec_helper.rb +1 -0
metadata +16 -6

data/lib/capybara/spec/views/frame_two.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html>
     <head>
         <title>This is the title of frame two</title>
@@ -5,4 +6,4 @@
     <body>
         <div id="divInFrameTwo">This is the text of divInFrameTwo</div>
     </body>
-</html>
+</html>

data/lib/capybara/spec/views/header_links.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <p>
   <a href="/get_header">Link</a>
 </p>

data/lib/capybara/spec/views/host_links.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <p>
   <a href="/host">Relative Host</a>
   <a href="<%= params[:absolute_host] %>/host">Absolute Host</a>

data/lib/capybara/spec/views/path.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <body>
     <div>

data/lib/capybara/spec/views/popup_one.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html>
     <head>
         <title>Title of the first popup</title>

data/lib/capybara/spec/views/popup_two.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html>
     <head>
         <title>Title of popup two</title>

data/lib/capybara/spec/views/postback.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <h1>Postback</h1>
 <form method="get">
@@ -10,4 +11,4 @@
   <p>
     <input type="submit" value="With blank action">
   </p>
-</form>
+</form>

data/lib/capybara/spec/views/tables.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <form action="/form" method="post">
   <table id="agent_table">
     <caption>Agent</caption>

data/lib/capybara/spec/views/with_base_tag.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>

data/lib/capybara/spec/views/with_count.erb CHANGED

@@ -1,7 +1,8 @@
+<%# frozen_string_literal: true %>
 <h1>This page is used for testing number options of has_text?</h1>
 <p>count1</p>
 <div>
   <p>2 count</p>
   <p>Count</p>
-</div>
+</div>

data/lib/capybara/spec/views/with_hover.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
@@ -14,4 +15,4 @@
       <div class="hidden_until_hover">Here I am</div>
     </div>
   </body>
-</html>
+</html>

data/lib/capybara/spec/views/with_html.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <div id="referrer"><%= referrer %></div>
 <h1>This is a test</h1>
@@ -10,6 +11,7 @@
 <h2 class="head">Header Class Test Five</h2>
 <span class="number">42</span>
+<span>Other span</span>
 <p class="para" id="first">
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
@@ -109,6 +111,7 @@ banana</textarea>
 </div>
 <input type="text" disabled="disabled" name="disabled_text" value="This is disabled"/>
+<input type="hidden" id="hidden_input" name="hidden_input" value="This is a hidden input"/>
 <div>
   <a id="link_placeholder">No href</a>

data/lib/capybara/spec/views/with_html_entities.erb CHANGED

	@@ -1 +1,2 @@
1	+ <%# frozen_string_literal: true %>
1 2	Encoding with — html entities »

data/lib/capybara/spec/views/with_js.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
@@ -93,6 +94,10 @@
       <a href="#" id="open-prompt">Open prompt</a>
     </p>
+    <p>
+      <input id="disable-on-click"/>
+    </p>
     <p>
       <a href="#" id="delayed-page-change">Change page</a>
       <a href="/with_html?options[]=things">Non-escaped query options</a>

data/lib/capybara/spec/views/with_scope.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <h1>This page is used for testing various scopes</h1>
 <p id="for_foo">

data/lib/capybara/spec/views/with_simple_html.erb CHANGED

@@ -1 +1,2 @@
-Bar
+<%# frozen_string_literal: true %>
+Bar

data/lib/capybara/spec/views/with_slow_unload.erb ADDED

@@ -0,0 +1,17 @@
+<html>
+<head>
+  <script>
+    function delay_unload() {
+      var start = new Date();
+      var i = 0;
+      while ((new Date()) - start < 1000){ i = i + 1; };
+      return null;
+    }
+    window.onbeforeunload = delay_unload;
+    window.onunload = delay_unload;
+  </script>
+</head>
+<body>
+  <div>This delays unload by 2 seconds</div>
+</body>
+</html>

data/lib/capybara/spec/views/with_title.erb CHANGED

@@ -1,4 +1,5 @@
+<%# frozen_string_literal: true %>
 <title>Test Title</title>
 <body>
   <svg><title>abcdefg</title></svg>
-</body>
+</body>

data/lib/capybara/spec/views/with_unload_alert.erb ADDED

@@ -0,0 +1,12 @@
+<html>
+<head>
+  <script>
+      window.onbeforeunload = function(e) {
+        return 'Unload?';
+      };
+  </script>
+</head>
+<body>
+  <div>This triggers an alert on unload</div>
+</body>
+</html>

data/lib/capybara/spec/views/with_windows.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html>
   <head>
     <title>With Windows</title>

data/lib/capybara/spec/views/within_frames.erb CHANGED

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html>
     <head>
         <title>With Frames</title>
@@ -8,4 +9,4 @@
     <iframe src="/frame_two" id="frameTwo"></iframe>
     <iframe src="/frame_parent" id="parentFrame"></iframe>
     </body>
-</html>
+</html>

data/lib/capybara/version.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
-  VERSION = '2.6.2'
+  VERSION = '2.7.0'
 end

data/lib/capybara/window.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   ##
   # The Window class represents a browser window.

data/spec/basic_node_spec.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 RSpec.describe Capybara do

data/spec/capybara_spec.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 RSpec.describe Capybara do
@@ -33,9 +34,35 @@ RSpec.describe Capybara do
     end
   end
+  describe '.register_server' do
+    before do
+      Capybara.reuse_server = false
+      @old_server = Capybara.server
+    end
+    after do
+      Capybara.server(&@old_server)
+      Capybara.reuse_server = true
+    end
+    it "should add a new server" do
+      Capybara.register_server :blob do |app, port, host|
+        Rack::Handler::WEBrick.run(app, :Host => host, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+      end
+      Capybara.server = :blob
+      session = Capybara::Session.new(:selenium, TestApp.dup)
+      session.visit('/')
+      expect(session.body).to include("Hello world!")
+    end
+  end
   describe ".server" do
+    before do
+      @old_server = Capybara.server
+    end
     after do
-      Capybara.server {|app, port| Capybara.run_default_server(app, port)}
+      Capybara.server(&@old_server)
     end
     it "should default to a proc that calls run_default_server" do

data/spec/dsl_spec.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'capybara/dsl'

data/spec/fixtures/selenium_driver_rspec_failure.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 RSpec.describe Capybara::Selenium::Driver do

data/spec/fixtures/selenium_driver_rspec_success.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 RSpec.describe Capybara::Selenium::Driver do

data/spec/rack_test_spec.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 module TestSessions

data/spec/result_spec.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 RSpec.describe Capybara::Result do

data/spec/rspec/features_spec.rb CHANGED

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

data/spec/rspec/matchers_spec.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'capybara/dsl'
 require 'capybara/rspec/matchers'

data/spec/rspec/scenarios_spec.rb CHANGED

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

data/spec/rspec/views_spec.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 RSpec.describe "capybara/rspec", type: :view do

data/spec/rspec_spec.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 RSpec.describe 'capybara/rspec', :type => :feature do

data/spec/selector_spec.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 RSpec.describe Capybara do
@@ -17,6 +18,20 @@ RSpec.describe Capybara do
               <p class="b">Some Content</p>
               <p class="b"></p>
             </div>
+            <input type="checkbox"/>
+            <input type="radio"/>
+            <input type="text"/>
+            <input type="file"/>
+            <a href="#">link</a>
+            <fieldset></fieldset>
+            <select>
+              <option value="a">A</option>
+              <option value="b" disabled>B</option>
+              <option value="c" selected>C</option>
+            </select>
+            <table>
+              <tr><td></td></tr>
+            </table
           </body>
         </html>
       STRING
@@ -29,7 +44,7 @@ RSpec.describe Capybara do
       end
     end
-    describe "modfiy_selector" do
+    describe "modify_selector" do
       it "allows modifying a selector" do
         el = string.find(:custom_selector, 'a')
         expect(el.tag_name).to eq 'div'
@@ -49,5 +64,44 @@ RSpec.describe Capybara do
         expect(string).to have_selector(:custom_selector, 'b', not_empty: :all, count: 2)
       end
     end
+    describe "builtin selectors" do
+      context "when locator is nil" do
+        it "devolves to just finding element types" do
+          selectors = {
+            field: ".//*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]",
+            fieldset: ".//fieldset",
+            link: ".//a[./@href]",
+            link_or_button: ".//a[./@href] | .//input[./@type = 'submit' or ./@type = 'reset' or ./@type = 'image' or ./@type = 'button'] | .//button" ,
+            fillable_field: ".//*[self::input | self::textarea][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'radio' or ./@type = 'checkbox' or ./@type = 'hidden' or ./@type = 'file')]",
+            radio_button: ".//input[./@type = 'radio']",
+            checkbox: ".//input[./@type = 'checkbox']",
+            select: ".//select",
+            option: ".//option",
+            file_field: ".//input[./@type = 'file']",
+            table: ".//table"
+          }
+          selectors.each do |selector, xpath|
+            results = string.all(selector,nil).to_a.map &:native
+            expect(results.size).to be > 0
+            expect(results).to eq string.all(:xpath, xpath).to_a.map(&:native)
+          end
+        end
+      end
+      describe ":option selector" do
+        it "finds disabled options" do
+          expect(string.find(:option, disabled: true).value).to eq 'b'
+        end
+        it "finds selected options" do
+          expect(string.find(:option, selected: true).value).to eq 'c'
+        end
+        it "finds not selected and not disabled options" do
+          expect(string.find(:option, disabled: false, selected: false).value).to eq 'a'
+        end
+      end
+    end
   end
 end

data/spec/selenium_spec.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require "selenium-webdriver"
@@ -11,11 +12,14 @@ module TestSessions
   Selenium = Capybara::Session.new(:selenium_focus, TestApp)
 end
-Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :capybara_skip => [
+skipped_tests = [
   :response_headers,
   :status_code,
   :trigger
 ]
+skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
+Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :capybara_skip => skipped_tests
 RSpec.describe Capybara::Session do
   context 'with selenium driver' do
@@ -110,7 +114,7 @@ RSpec.describe Capybara::Session do
     end
     context "#fill_in with { clear: Array } fill_options" do
-      it 'should pass the array through to the element', tw: true do
+      it 'should pass the array through to the element' do
         #this is mainly for use with [[:ctrl, 'a'], :backspace] - however since that is platform dependant I'm testing with something less useful
         @session.visit('/form')
         @session.fill_in('form_first_name', :with => 'Harry',

data/spec/selenium_spec_chrome.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'selenium-webdriver'

data/spec/server_spec.rb CHANGED

@@ -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