RubyGems - capybara - Versions diffs - 3.23.0 → 3.35.3 - Mend

capybara 3.23.0 → 3.35.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (183) hide show

checksums.yaml +4 -4
data/History.md +264 -11
data/README.md +10 -6
data/lib/capybara.rb +20 -8
data/lib/capybara/config.rb +10 -8
data/lib/capybara/cucumber.rb +1 -1
data/lib/capybara/driver/base.rb +4 -0
data/lib/capybara/driver/node.rb +4 -0
data/lib/capybara/dsl.rb +10 -2
data/lib/capybara/helpers.rb +28 -2
data/lib/capybara/minitest.rb +232 -144
data/lib/capybara/minitest/spec.rb +156 -97
data/lib/capybara/node/actions.rb +36 -36
data/lib/capybara/node/base.rb +6 -6
data/lib/capybara/node/document.rb +2 -2
data/lib/capybara/node/document_matchers.rb +3 -3
data/lib/capybara/node/element.rb +77 -33
data/lib/capybara/node/finders.rb +24 -17
data/lib/capybara/node/matchers.rb +79 -64
data/lib/capybara/node/simple.rb +11 -4
data/lib/capybara/queries/ancestor_query.rb +6 -10
data/lib/capybara/queries/base_query.rb +2 -1
data/lib/capybara/queries/current_path_query.rb +14 -4
data/lib/capybara/queries/selector_query.rb +259 -23
data/lib/capybara/queries/sibling_query.rb +5 -11
data/lib/capybara/queries/style_query.rb +1 -1
data/lib/capybara/queries/text_query.rb +13 -1
data/lib/capybara/rack_test/browser.rb +13 -4
data/lib/capybara/rack_test/driver.rb +2 -1
data/lib/capybara/rack_test/form.rb +2 -2
data/lib/capybara/rack_test/node.rb +42 -6
data/lib/capybara/registration_container.rb +44 -0
data/lib/capybara/registrations/drivers.rb +18 -12
data/lib/capybara/registrations/patches/puma_ssl.rb +29 -0
data/lib/capybara/registrations/servers.rb +9 -2
data/lib/capybara/result.rb +39 -19
data/lib/capybara/rspec.rb +2 -0
data/lib/capybara/rspec/matcher_proxies.rb +5 -5
data/lib/capybara/rspec/matchers.rb +97 -74
data/lib/capybara/rspec/matchers/base.rb +19 -6
data/lib/capybara/rspec/matchers/count_sugar.rb +2 -1
data/lib/capybara/rspec/matchers/have_ancestor.rb +5 -7
data/lib/capybara/rspec/matchers/have_current_path.rb +2 -2
data/lib/capybara/rspec/matchers/have_selector.rb +15 -10
data/lib/capybara/rspec/matchers/have_sibling.rb +4 -7
data/lib/capybara/rspec/matchers/have_text.rb +4 -7
data/lib/capybara/rspec/matchers/have_title.rb +2 -2
data/lib/capybara/rspec/matchers/match_selector.rb +3 -3
data/lib/capybara/rspec/matchers/match_style.rb +7 -2
data/lib/capybara/rspec/matchers/spatial_sugar.rb +39 -0
data/lib/capybara/selector.rb +46 -19
data/lib/capybara/selector/builders/css_builder.rb +10 -6
data/lib/capybara/selector/builders/xpath_builder.rb +4 -2
data/lib/capybara/selector/css.rb +1 -1
data/lib/capybara/selector/definition.rb +13 -11
data/lib/capybara/selector/definition/button.rb +32 -15
data/lib/capybara/selector/definition/checkbox.rb +2 -2
data/lib/capybara/selector/definition/css.rb +3 -1
data/lib/capybara/selector/definition/datalist_input.rb +2 -2
data/lib/capybara/selector/definition/datalist_option.rb +1 -1
data/lib/capybara/selector/definition/element.rb +3 -2
data/lib/capybara/selector/definition/field.rb +1 -1
data/lib/capybara/selector/definition/file_field.rb +1 -1
data/lib/capybara/selector/definition/fillable_field.rb +2 -2
data/lib/capybara/selector/definition/label.rb +5 -3
data/lib/capybara/selector/definition/link.rb +8 -0
data/lib/capybara/selector/definition/option.rb +1 -1
data/lib/capybara/selector/definition/radio_button.rb +2 -2
data/lib/capybara/selector/definition/select.rb +33 -14
data/lib/capybara/selector/definition/table.rb +6 -3
data/lib/capybara/selector/definition/table_row.rb +2 -2
data/lib/capybara/selector/filter_set.rb +13 -11
data/lib/capybara/selector/filters/base.rb +6 -1
data/lib/capybara/selector/filters/locator_filter.rb +1 -1
data/lib/capybara/selector/regexp_disassembler.rb +7 -0
data/lib/capybara/selector/selector.rb +13 -3
data/lib/capybara/selenium/atoms/getAttribute.min.js +1 -1
data/lib/capybara/selenium/atoms/isDisplayed.min.js +1 -1
data/lib/capybara/selenium/atoms/src/getAttribute.js +1 -1
data/lib/capybara/selenium/atoms/src/isDisplayed.js +10 -10
data/lib/capybara/selenium/driver.rb +86 -24
data/lib/capybara/selenium/driver_specializations/chrome_driver.rb +24 -21
data/lib/capybara/selenium/driver_specializations/edge_driver.rb +21 -19
data/lib/capybara/selenium/driver_specializations/firefox_driver.rb +17 -1
data/lib/capybara/selenium/driver_specializations/safari_driver.rb +0 -4
data/lib/capybara/selenium/extensions/file_input_click_emulation.rb +34 -0
data/lib/capybara/selenium/extensions/find.rb +37 -26
data/lib/capybara/selenium/extensions/html5_drag.rb +55 -11
data/lib/capybara/selenium/extensions/modifier_keys_stack.rb +28 -0
data/lib/capybara/selenium/extensions/scroll.rb +8 -10
data/lib/capybara/selenium/logger_suppressor.rb +8 -2
data/lib/capybara/selenium/node.rb +160 -40
data/lib/capybara/selenium/nodes/chrome_node.rb +72 -12
data/lib/capybara/selenium/nodes/edge_node.rb +32 -14
data/lib/capybara/selenium/nodes/firefox_node.rb +28 -32
data/lib/capybara/selenium/nodes/safari_node.rb +5 -29
data/lib/capybara/selenium/patches/action_pauser.rb +26 -0
data/lib/capybara/selenium/patches/atoms.rb +4 -4
data/lib/capybara/selenium/patches/is_displayed.rb +16 -0
data/lib/capybara/selenium/patches/logs.rb +32 -7
data/lib/capybara/server.rb +19 -3
data/lib/capybara/server/animation_disabler.rb +8 -3
data/lib/capybara/server/checker.rb +1 -1
data/lib/capybara/server/middleware.rb +22 -10
data/lib/capybara/session.rb +66 -40
data/lib/capybara/session/config.rb +11 -3
data/lib/capybara/session/matchers.rb +11 -11
data/lib/capybara/spec/public/offset.js +6 -0
data/lib/capybara/spec/public/test.js +75 -7
data/lib/capybara/spec/session/accept_alert_spec.rb +1 -1
data/lib/capybara/spec/session/all_spec.rb +60 -5
data/lib/capybara/spec/session/ancestor_spec.rb +5 -0
data/lib/capybara/spec/session/assert_text_spec.rb +9 -5
data/lib/capybara/spec/session/check_spec.rb +6 -0
data/lib/capybara/spec/session/click_button_spec.rb +16 -0
data/lib/capybara/spec/session/click_link_or_button_spec.rb +9 -0
data/lib/capybara/spec/session/current_url_spec.rb +11 -1
data/lib/capybara/spec/session/fill_in_spec.rb +29 -0
data/lib/capybara/spec/session/find_spec.rb +55 -0
data/lib/capybara/spec/session/has_ancestor_spec.rb +2 -0
data/lib/capybara/spec/session/has_button_spec.rb +51 -0
data/lib/capybara/spec/session/has_css_spec.rb +26 -4
data/lib/capybara/spec/session/has_current_path_spec.rb +15 -2
data/lib/capybara/spec/session/has_field_spec.rb +34 -0
data/lib/capybara/spec/session/has_select_spec.rb +32 -4
data/lib/capybara/spec/session/has_selector_spec.rb +4 -4
data/lib/capybara/spec/session/has_table_spec.rb +51 -5
data/lib/capybara/spec/session/has_text_spec.rb +30 -0
data/lib/capybara/spec/session/html_spec.rb +1 -1
data/lib/capybara/spec/session/matches_style_spec.rb +2 -2
data/lib/capybara/spec/session/node_spec.rb +394 -9
data/lib/capybara/spec/session/refresh_spec.rb +2 -1
data/lib/capybara/spec/session/save_and_open_screenshot_spec.rb +2 -2
data/lib/capybara/spec/session/save_page_spec.rb +4 -4
data/lib/capybara/spec/session/save_screenshot_spec.rb +4 -15
data/lib/capybara/spec/session/selectors_spec.rb +16 -3
data/lib/capybara/spec/session/window/switch_to_window_spec.rb +1 -1
data/lib/capybara/spec/session/window/window_opened_by_spec.rb +1 -1
data/lib/capybara/spec/session/window/window_spec.rb +8 -8
data/lib/capybara/spec/session/window/windows_spec.rb +1 -1
data/lib/capybara/spec/spec_helper.rb +14 -14
data/lib/capybara/spec/test_app.rb +27 -21
data/lib/capybara/spec/views/form.erb +47 -4
data/lib/capybara/spec/views/offset.erb +32 -0
data/lib/capybara/spec/views/spatial.erb +31 -0
data/lib/capybara/spec/views/with_animation.erb +37 -1
data/lib/capybara/spec/views/with_dragula.erb +24 -0
data/lib/capybara/spec/views/with_html.erb +24 -2
data/lib/capybara/spec/views/with_jquery_animation.erb +24 -0
data/lib/capybara/spec/views/with_js.erb +4 -1
data/lib/capybara/spec/views/with_jstree.erb +26 -0
data/lib/capybara/spec/views/with_sortable_js.erb +1 -1
data/lib/capybara/version.rb +1 -1
data/lib/capybara/window.rb +3 -7
data/spec/basic_node_spec.rb +15 -14
data/spec/capybara_spec.rb +28 -28
data/spec/dsl_spec.rb +16 -3
data/spec/filter_set_spec.rb +5 -5
data/spec/fixtures/selenium_driver_rspec_failure.rb +1 -1
data/spec/fixtures/selenium_driver_rspec_success.rb +1 -1
data/spec/minitest_spec.rb +3 -2
data/spec/minitest_spec_spec.rb +46 -46
data/spec/rack_test_spec.rb +38 -15
data/spec/regexp_dissassembler_spec.rb +52 -38
data/spec/result_spec.rb +43 -32
data/spec/rspec/features_spec.rb +4 -1
data/spec/rspec/scenarios_spec.rb +4 -0
data/spec/rspec/shared_spec_matchers.rb +68 -56
data/spec/rspec_spec.rb +9 -5
data/spec/selector_spec.rb +32 -17
data/spec/selenium_spec_chrome.rb +78 -11
data/spec/selenium_spec_chrome_remote.rb +23 -6
data/spec/selenium_spec_edge.rb +15 -12
data/spec/selenium_spec_firefox.rb +24 -19
data/spec/selenium_spec_firefox_remote.rb +0 -8
data/spec/selenium_spec_ie.rb +1 -6
data/spec/server_spec.rb +106 -44
data/spec/session_spec.rb +5 -5
data/spec/shared_selenium_node.rb +56 -2
data/spec/shared_selenium_session.rb +122 -15
data/spec/spec_helper.rb +2 -2
metadata +63 -17
data/lib/capybara/spec/session/source_spec.rb +0 -0

data/lib/capybara/spec/views/offset.erb ADDED Viewed

@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>Offset</title>
+    <style>
+      body {
+        margin: 0px;
+      }
+      #wrapper {
+        width: 300px;
+        height: 300px;
+        margin: 0px;
+      }
+      #clicker {
+        position: relative;
+        width: 100px;
+        height: 100px;
+        top: 100px;
+        left: 100px;
+        background-color: red;
+        margin: 0px;
+      }
+    </style>
+    <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/offset.js" type="text/javascript" charset="utf-8"></script>
+  </head>
+  <body>
+    <div id="wrapper">
+      <div id="clicker"></div>
+    </div>
+  </body>
+  </html>

data/lib/capybara/spec/views/spatial.erb ADDED Viewed

@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>spatial</title>
+    <style>
+      #spatial {
+        display: grid;
+        grid-template-columns: repeat(3, 1fr);
+        grid-gap: 10px;
+        grid-auto-rows: minmax(100px, auto);
+      }
+      .footer {
+        grid-column: 1 / 4;
+      }
+    </style>
+  </head>
+  <body id="spatial">
+    <div class="corner">1</div>
+    <div class="distance">2</div>
+    <div class="corner">3</div>
+    <div>4</div>
+    <div class="center">5</div>
+    <div>6</div>
+    <div class="corner">7</div>
+    <div>8</div>
+    <div class="corner">9</div>
+    <div class="footer distance">10</div>
+  </body>
+</html>

data/lib/capybara/spec/views/with_animation.erb CHANGED Viewed

@@ -6,7 +6,26 @@
     <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
     <script src="/jquery-ui.js" type="text/javascript" charset="utf-8"></script>
     <script src="/test.js" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript">
+      $(document).on('transitionend', function(){
+        $(document.body).append('<div>Transition Ended</div>')
+      });
+      $(document).on('animationend', function(){
+        $(document.body).append('<div>Animation Ended</div>')
+      });
+      $(document).on('contextmenu', function(e){
+        e.preventDefault();
+      });
+    </script>
     <style>
+      html {
+        scroll-behavior: smooth;
+      }
+      body {
+        min-height: 2000px;
+      }
       .transition.away {
           width: 0%;
       }
@@ -17,6 +36,13 @@
           overflow: hidden;
       }
+      a::after {
+        content: "";
+        width: 0px;
+        height: 0px;
+        background-color: blue;
+      }
       a:not(.away) {
         height: 20px;
       }
@@ -35,12 +61,22 @@
         animation-duration: 3s;
         animation-fill-mode: forwards;
       }
+      @keyframes pseudo_grow {
+        100% { height: 100px, width: 100px };
+      }
+      a.animation.pseudo::after {
+        animation: pseudo_grow 3s forwards;
+      }
     </style>
   </head>
   <body id="with_animation">
     <a href='#' class='transition' onclick='this.classList.add("away")'>transition me away</a>
-    <a href='#' class='animation' onclick='this.classList.add("away")'>animate me away</a>
+    <a href='#' class='animation' onclick='this.classList.add("away")' oncontextmenu='this.classList.add("pseudo")'>
+      animate me away
+    </a>
   </body>
 </html>

data/lib/capybara/spec/views/with_dragula.erb ADDED Viewed

@@ -0,0 +1,24 @@
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>with_dragula</title>
+  </head>
+  <body id="with_dragula">
+    <div id="sortable">
+      <div class="item1">Item 1</div>
+      <div class="item2">Item 2</div>
+      <div class="item3">Item 3</div>
+      <div class="item4">Item 4</div>
+      <div class="item5">Item 5</div>
+    </div>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/dragula/3.7.2/dragula.js" type="text/javascript"></script>
+    <script>
+      let container = document.getElementById("sortable");
+      dragula([container]);
+      container.className = "ready"
+    </script>
+  </body>
+</html>

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

@@ -36,8 +36,8 @@
 </p>
 <p>
-  <input type="text" id="test_field" data-test-id="test_id" value="monkey"/>
-  <input type="text" readonly="readonly" value="should not change" />
+  <input type="text" id="test_field" spellcheck="TRUE" data-test-id="test_id" value="monkey"/>
+  <input type="text" readonly="readonly" spellcheck="FALSE" value="should not change" />
   <textarea id="normal" data-other-test-id="test_id">
 banana</textarea>
   <textarea id="additional_newline">
@@ -138,6 +138,9 @@ banana</textarea>
       Ancestor
       <div id="child">Child</div>
     </div>
+    <div id="ancestor1_sibiling">
+      ASibling
+    </div>
   </div>
   <button id="ancestor_button" type="submit" disabled>
     <img id="button_img" width="20" height="20" alt="button img"/>
@@ -178,6 +181,25 @@ banana</textarea>
 &#x20;&#x1680;&#x2000;&#x2001;&#x2002; &#x2003;&#x2004;&nbsp;&#x2005; &#x2006;&#x2007;&#x2008;&#x2009;&#x200A;&#x202F;&#x205F;&#x3000;
 </div>
+<details id="closed_details">
+  <summary>
+    <h6>Something</h6>
+  </summary>
+  <ul>
+    <li>Random</li>
+    <li>Things</li>
+  </ul>
+</details>
+<details id="open_details" open>
+  <summary>
+    <h6>Summary</h6>
+  </summary>
+  <div>
+    Contents
+  </div>
+</details>
 <template id="template">
   <input />
 </template>

data/lib/capybara/spec/views/with_jquery_animation.erb ADDED Viewed

@@ -0,0 +1,24 @@
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>with_jquery_animation</title>
+    <style>
+      body {
+        height: 2000px;
+      }
+    </style>
+  </head>
+  <body id="with_animation">
+    <a href="#" id='scroll'>scroll top 500</a>
+    <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
+    <script type='text/javascript'>
+      $('#scroll').click(function(e){
+        e.preventDefault();
+        $('html, body').animate({ scrollTop: 500 }, 'slow');
+      });
+    </script>
+  </body>
+</html>

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

@@ -28,13 +28,15 @@
     <div id="drag_html5" draggable="true">
       <p>This is an HTML5 draggable element.</p>
     </div>
-    <a id="drag_link_html5" href="#">This is an HTML5 draggable link</a>
+    <a id="drag_link_html5" href="#"><p>This is an HTML5 draggable link</p></a>
     <div id="drop_html5" class="drop">
       <p>It should be dropped here.</p>
     </div>
     <p><a href="#" id="clickable">Click me</a></p>
     <p><a href="#" id="slow-click">Slowly</a></p>
+    <p><span id="aria-button" role="button">ARIA button</span></p>
+    <p><span role="button">ARIA button2</span></p>
     <p>
       <select id="waiter">
@@ -151,6 +153,7 @@
       <p>This is an HTML5 draggable element.</p>
     </div>
+    <div id="shadow"></div>
     <script type="text/javascript">
       // a javascript comment
       var aVar = 123;

data/lib/capybara/spec/views/with_jstree.erb ADDED Viewed

@@ -0,0 +1,26 @@
+<!doctype html>
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>with_jstree</title>
+  </head>
+  <body id="with_jstree">
+    <div id="container">
+      <ul>
+        <li>Child node A</li>
+        <li>Child node B</li>
+        <li>Child node C</li>
+      </ul>
+    </div>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.8/jstree.min.js"></script>
+    <script>
+      $(function () {
+        $('#container').jstree({
+          "core" : { "check_callback" : true }, // so that operations work
+          "plugins" : ["dnd"]
+        });
+      });
+    </script>
+  </body>
+</html>

data/lib/capybara/spec/views/with_sortable_js.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_sortable_js</title>
-    <script src="https://sortablejs.github.io/Sortable/Sortable.js" type="text/javascript"></script>
+    <script src="https://cdn.jsdelivr.net/npm/sortablejs@1.12.0/dist/sortable.umd.min.js" type="text/javascript"></script>
   </head>
   <body id="with_sortable_js">

data/lib/capybara/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '3.23.0'
+  VERSION = '3.35.3'
 end

data/lib/capybara/window.rb CHANGED Viewed

@@ -4,7 +4,7 @@ module Capybara
   ##
   # The {Window} class represents a browser window.
   #
-  # You can get an instance of the class by calling either of:
+  # You can get an instance of the class by calling any of:
   #
   # * {Capybara::Session#windows}
   # * {Capybara::Session#current_window}
@@ -82,8 +82,8 @@ module Capybara
     # Resize window.
     #
     # @macro about_current
-    # @param width [String]  the new window width in pixels
-    # @param height [String]  the new window height in pixels
+    # @param width [Integer]  the new window width in pixels
+    # @param height [Integer]  the new window height in pixels
     #
     def resize_to(width, height)
       wait_for_stable_size { @driver.resize_window_to(handle, width, height) }
@@ -138,9 +138,5 @@ module Capybara
       end
       raise Capybara::WindowError, "Window size not stable within #{seconds} seconds."
     end
-    def raise_unless_current(what)
-      raise Capybara::WindowError, "#{what} not current window is not possible." unless current?
-    end
   end
 end

data/spec/basic_node_spec.rb CHANGED Viewed

@@ -3,9 +3,10 @@
 require 'spec_helper'
 RSpec.describe Capybara do
+  include Capybara::RSpecMatchers
   describe '.string' do
     let :string do
-      Capybara.string <<-STRING
+      described_class.string <<-STRING
         <html>
           <head>
             <title>simple_node</title>
@@ -52,7 +53,7 @@ RSpec.describe Capybara do
     end
     it 'allows using custom matchers' do
-      Capybara.add_selector :lifeform do
+      described_class.add_selector :lifeform do
         xpath { |name| ".//option[contains(.,'#{name}')]" }
       end
       expect(string).to have_selector(:id, 'page')
@@ -62,7 +63,7 @@ RSpec.describe Capybara do
     end
     it 'allows custom matcher using css' do
-      Capybara.add_selector :section do
+      described_class.add_selector :section do
         css { |css_class| "section .#{css_class}" }
       end
       expect(string).to     have_selector(:section, 'subsection')
@@ -112,13 +113,13 @@ RSpec.describe Capybara do
     it 'drops illegal fragments when using gumbo' do
       skip 'libxml is less strict than Gumbo' unless Nokogiri.respond_to?(:HTML5)
-      expect(Capybara.string('<td>1</td>')).not_to have_css('td')
+      expect(described_class.string('<td>1</td>')).not_to have_css('td')
     end
     it 'can disable use of gumbo' do
       skip "Test doesn't make sense unlesss nokogumbo is loaded" unless Nokogiri.respond_to?(:HTML5)
-      Capybara.allow_gumbo = false
-      expect(Capybara.string('<td>1</td>')).to have_css('td')
+      described_class.allow_gumbo = false
+      expect(described_class.string('<td>1</td>')).to have_css('td')
     end
     describe '#title' do
@@ -129,25 +130,25 @@ RSpec.describe Capybara do
     describe '#has_title?' do
       it 'returns whether the page has the given title' do
-        expect(string.has_title?('simple_node')).to be_truthy
-        expect(string.has_title?('monkey')).to be_falsey
+        expect(string.has_title?('simple_node')).to be true
+        expect(string.has_title?('monkey')).to be false
       end
       it 'allows regexp matches' do
-        expect(string.has_title?(/s[a-z]+_node/)).to be_truthy
-        expect(string.has_title?(/monkey/)).to be_falsey
+        expect(string.has_title?(/s[a-z]+_node/)).to be true
+        expect(string.has_title?(/monkey/)).to be false
       end
     end
     describe '#has_no_title?' do
       it 'returns whether the page does not have the given title' do
-        expect(string.has_no_title?('simple_node')).to be_falsey
-        expect(string.has_no_title?('monkey')).to be_truthy
+        expect(string.has_no_title?('simple_node')).to be false
+        expect(string.has_no_title?('monkey')).to be true
       end
       it 'allows regexp matches' do
-        expect(string.has_no_title?(/s[a-z]+_node/)).to be_falsey
-        expect(string.has_no_title?(/monkey/)).to be_truthy
+        expect(string.has_no_title?(/s[a-z]+_node/)).to be false
+        expect(string.has_no_title?(/monkey/)).to be true
       end
     end
   end

data/spec/capybara_spec.rb CHANGED Viewed

@@ -4,20 +4,20 @@ require 'spec_helper'
 RSpec.describe Capybara do
   describe 'default_max_wait_time' do
-    before { @previous_default_time = Capybara.default_max_wait_time }
+    before { @previous_default_time = described_class.default_max_wait_time }
-    after { Capybara.default_max_wait_time = @previous_default_time } # rubocop:disable RSpec/InstanceVariable
+    after { described_class.default_max_wait_time = @previous_default_time } # rubocop:disable RSpec/InstanceVariable
     it 'should be changeable' do
-      expect(Capybara.default_max_wait_time).not_to eq(5)
-      Capybara.default_max_wait_time = 5
-      expect(Capybara.default_max_wait_time).to eq(5)
+      expect(described_class.default_max_wait_time).not_to eq(5)
+      described_class.default_max_wait_time = 5
+      expect(described_class.default_max_wait_time).to eq(5)
     end
   end
   describe '.register_driver' do
     it 'should add a new driver' do
-      Capybara.register_driver :schmoo do |app|
+      described_class.register_driver :schmoo do |app|
         Capybara::RackTest::Driver.new(app)
       end
       session = Capybara::Session.new(:schmoo, TestApp)
@@ -28,85 +28,85 @@ RSpec.describe Capybara do
   describe '.register_server' do
     it 'should add a new server' do
-      Capybara.register_server :blob do |_app, _port, _host|
+      described_class.register_server :blob do |_app, _port, _host|
         # do nothing
       end
-      expect(Capybara.servers).to have_key(:blob)
+      expect(described_class.servers[:blob]).to be_truthy
     end
   end
   describe '.server' do
     after do
-      Capybara.server = :default
+      described_class.server = :default
     end
     it 'should default to a proc that calls run_default_server' do
       mock_app = Object.new
-      allow(Capybara).to receive(:run_default_server).and_return(true)
-      Capybara.server.call(mock_app, 8000)
-      expect(Capybara).to have_received(:run_default_server).with(mock_app, 8000)
+      allow(described_class).to receive(:run_default_server).and_return(true)
+      described_class.server.call(mock_app, 8000)
+      expect(described_class).to have_received(:run_default_server).with(mock_app, 8000)
     end
     it 'should return a custom server proc' do
       server = ->(_app, _port) {}
-      Capybara.register_server :custom, &server
-      Capybara.server = :custom
-      expect(Capybara.server).to eq(server)
+      described_class.register_server :custom, &server
+      described_class.server = :custom
+      expect(described_class.server).to eq(server)
     end
     it 'should have :webrick registered' do
-      expect(Capybara.servers[:webrick]).not_to be_nil
+      expect(described_class.servers[:webrick]).not_to be_nil
     end
     it 'should have :puma registered' do
-      expect(Capybara.servers[:puma]).not_to be_nil
+      expect(described_class.servers[:puma]).not_to be_nil
     end
   end
   describe 'server=' do
     after do
-      Capybara.server = :default
+      described_class.server = :default
     end
     it 'accepts a proc' do
       server = ->(_app, _port) {}
-      Capybara.server = server
-      expect(Capybara.server).to eq server
+      described_class.server = server
+      expect(described_class.server).to eq server
     end
   end
   describe 'app_host' do
     after do
-      Capybara.app_host = nil
+      described_class.app_host = nil
     end
     it 'should warn if not a valid URL' do
-      expect { Capybara.app_host = 'www.example.com' }.to raise_error(ArgumentError, /Capybara\.app_host should be set to a url/)
+      expect { described_class.app_host = 'www.example.com' }.to raise_error(ArgumentError, /Capybara\.app_host should be set to a url/)
     end
     it 'should not warn if a valid URL' do
-      expect { Capybara.app_host = 'http://www.example.com' }.not_to raise_error
+      expect { described_class.app_host = 'http://www.example.com' }.not_to raise_error
     end
     it 'should not warn if nil' do
-      expect { Capybara.app_host = nil }.not_to raise_error
+      expect { described_class.app_host = nil }.not_to raise_error
     end
   end
   describe 'default_host' do
     around do |test|
-      old_default = Capybara.default_host
+      old_default = described_class.default_host
       test.run
-      Capybara.default_host = old_default
+      described_class.default_host = old_default
     end
     it 'should raise if not a valid URL' do
-      expect { Capybara.default_host = 'www.example.com' }.to raise_error(ArgumentError, /Capybara\.default_host should be set to a url/)
+      expect { described_class.default_host = 'www.example.com' }.to raise_error(ArgumentError, /Capybara\.default_host should be set to a url/)
     end
     it 'should not warn if a valid URL' do
-      expect { Capybara.default_host = 'http://www.example.com' }.not_to raise_error
+      expect { described_class.default_host = 'http://www.example.com' }.not_to raise_error
     end
   end
 end