RubyGems - capybara - Versions diffs - 3.16.1 → 3.33.0 - Mend

capybara 3.16.1 → 3.33.0

Files changed (197) hide show

checksums.yaml +4 -4
data/.yardopts +1 -0
data/History.md +321 -0
data/README.md +51 -60
data/lib/capybara.rb +71 -114
data/lib/capybara/config.rb +8 -5
data/lib/capybara/cucumber.rb +1 -1
data/lib/capybara/driver/node.rb +15 -3
data/lib/capybara/dsl.rb +10 -2
data/lib/capybara/helpers.rb +5 -3
data/lib/capybara/minitest.rb +242 -141
data/lib/capybara/minitest/spec.rb +159 -90
data/lib/capybara/node/actions.rb +85 -74
data/lib/capybara/node/base.rb +4 -4
data/lib/capybara/node/document.rb +2 -2
data/lib/capybara/node/document_matchers.rb +3 -3
data/lib/capybara/node/element.rb +216 -117
data/lib/capybara/node/finders.rb +65 -65
data/lib/capybara/node/matchers.rb +228 -126
data/lib/capybara/node/simple.rb +9 -4
data/lib/capybara/queries/ancestor_query.rb +5 -7
data/lib/capybara/queries/base_query.rb +2 -1
data/lib/capybara/queries/current_path_query.rb +1 -1
data/lib/capybara/queries/selector_query.rb +296 -30
data/lib/capybara/queries/sibling_query.rb +5 -4
data/lib/capybara/queries/style_query.rb +2 -2
data/lib/capybara/queries/text_query.rb +13 -1
data/lib/capybara/queries/title_query.rb +1 -1
data/lib/capybara/rack_test/browser.rb +7 -2
data/lib/capybara/rack_test/driver.rb +1 -1
data/lib/capybara/rack_test/form.rb +1 -1
data/lib/capybara/rack_test/node.rb +43 -7
data/lib/capybara/registration_container.rb +44 -0
data/lib/capybara/registrations/drivers.rb +36 -0
data/lib/capybara/registrations/patches/puma_ssl.rb +27 -0
data/lib/capybara/registrations/servers.rb +44 -0
data/lib/capybara/result.rb +36 -8
data/lib/capybara/rspec/matcher_proxies.rb +6 -4
data/lib/capybara/rspec/matchers.rb +100 -63
data/lib/capybara/rspec/matchers/base.rb +23 -10
data/lib/capybara/rspec/matchers/count_sugar.rb +37 -0
data/lib/capybara/rspec/matchers/have_ancestor.rb +28 -0
data/lib/capybara/rspec/matchers/have_current_path.rb +2 -2
data/lib/capybara/rspec/matchers/have_selector.rb +16 -8
data/lib/capybara/rspec/matchers/have_sibling.rb +27 -0
data/lib/capybara/rspec/matchers/have_text.rb +4 -4
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 +2 -2
data/lib/capybara/rspec/matchers/spatial_sugar.rb +39 -0
data/lib/capybara/selector.rb +219 -588
data/lib/capybara/selector/builders/css_builder.rb +10 -6
data/lib/capybara/selector/builders/xpath_builder.rb +1 -1
data/lib/capybara/selector/css.rb +4 -2
data/lib/capybara/selector/definition.rb +277 -0
data/lib/capybara/selector/definition/button.rb +52 -0
data/lib/capybara/selector/definition/checkbox.rb +26 -0
data/lib/capybara/selector/definition/css.rb +10 -0
data/lib/capybara/selector/definition/datalist_input.rb +35 -0
data/lib/capybara/selector/definition/datalist_option.rb +25 -0
data/lib/capybara/selector/definition/element.rb +27 -0
data/lib/capybara/selector/definition/field.rb +40 -0
data/lib/capybara/selector/definition/fieldset.rb +14 -0
data/lib/capybara/selector/definition/file_field.rb +13 -0
data/lib/capybara/selector/definition/fillable_field.rb +33 -0
data/lib/capybara/selector/definition/frame.rb +17 -0
data/lib/capybara/selector/definition/id.rb +6 -0
data/lib/capybara/selector/definition/label.rb +62 -0
data/lib/capybara/selector/definition/link.rb +54 -0
data/lib/capybara/selector/definition/link_or_button.rb +16 -0
data/lib/capybara/selector/definition/option.rb +27 -0
data/lib/capybara/selector/definition/radio_button.rb +27 -0
data/lib/capybara/selector/definition/select.rb +81 -0
data/lib/capybara/selector/definition/table.rb +109 -0
data/lib/capybara/selector/definition/table_row.rb +21 -0
data/lib/capybara/selector/definition/xpath.rb +5 -0
data/lib/capybara/selector/filter_set.rb +13 -9
data/lib/capybara/selector/filters/base.rb +11 -2
data/lib/capybara/selector/filters/locator_filter.rb +13 -3
data/lib/capybara/selector/regexp_disassembler.rb +9 -2
data/lib/capybara/selector/selector.rb +43 -448
data/lib/capybara/selenium/atoms/getAttribute.min.js +1 -0
data/lib/capybara/selenium/atoms/isDisplayed.min.js +1 -0
data/lib/capybara/selenium/atoms/src/getAttribute.js +161 -0
data/lib/capybara/selenium/atoms/src/isDisplayed.js +454 -0
data/lib/capybara/selenium/driver.rb +125 -56
data/lib/capybara/selenium/driver_specializations/chrome_driver.rb +73 -17
data/lib/capybara/selenium/driver_specializations/edge_driver.rb +124 -0
data/lib/capybara/selenium/driver_specializations/firefox_driver.rb +41 -2
data/lib/capybara/selenium/driver_specializations/internet_explorer_driver.rb +14 -1
data/lib/capybara/selenium/driver_specializations/safari_driver.rb +14 -5
data/lib/capybara/selenium/extensions/file_input_click_emulation.rb +34 -0
data/lib/capybara/selenium/extensions/find.rb +67 -45
data/lib/capybara/selenium/extensions/html5_drag.rb +152 -36
data/lib/capybara/selenium/extensions/modifier_keys_stack.rb +28 -0
data/lib/capybara/selenium/logger_suppressor.rb +34 -0
data/lib/capybara/selenium/node.rb +227 -56
data/lib/capybara/selenium/nodes/chrome_node.rb +93 -8
data/lib/capybara/selenium/nodes/edge_node.rb +104 -0
data/lib/capybara/selenium/nodes/firefox_node.rb +37 -59
data/lib/capybara/selenium/nodes/ie_node.rb +22 -0
data/lib/capybara/selenium/nodes/safari_node.rb +27 -54
data/lib/capybara/selenium/patches/action_pauser.rb +26 -0
data/lib/capybara/selenium/patches/atoms.rb +18 -0
data/lib/capybara/selenium/patches/is_displayed.rb +16 -0
data/lib/capybara/selenium/patches/logs.rb +45 -0
data/lib/capybara/server.rb +19 -3
data/lib/capybara/server/animation_disabler.rb +2 -2
data/lib/capybara/server/checker.rb +6 -2
data/lib/capybara/server/middleware.rb +23 -13
data/lib/capybara/session.rb +124 -106
data/lib/capybara/session/config.rb +12 -10
data/lib/capybara/session/matchers.rb +6 -6
data/lib/capybara/spec/public/offset.js +6 -0
data/lib/capybara/spec/public/test.js +94 -5
data/lib/capybara/spec/session/all_spec.rb +84 -6
data/lib/capybara/spec/session/ancestor_spec.rb +5 -0
data/lib/capybara/spec/session/assert_current_path_spec.rb +5 -2
data/lib/capybara/spec/session/assert_text_spec.rb +9 -5
data/lib/capybara/spec/session/attach_file_spec.rb +14 -6
data/lib/capybara/spec/session/check_spec.rb +10 -4
data/lib/capybara/spec/session/choose_spec.rb +8 -2
data/lib/capybara/spec/session/click_button_spec.rb +44 -1
data/lib/capybara/spec/session/click_link_spec.rb +11 -0
data/lib/capybara/spec/session/evaluate_script_spec.rb +12 -0
data/lib/capybara/spec/session/fill_in_spec.rb +37 -2
data/lib/capybara/spec/session/find_spec.rb +60 -6
data/lib/capybara/spec/session/first_spec.rb +1 -1
data/lib/capybara/spec/session/frame/switch_to_frame_spec.rb +14 -1
data/lib/capybara/spec/session/frame/within_frame_spec.rb +12 -1
data/lib/capybara/spec/session/has_ancestor_spec.rb +46 -0
data/lib/capybara/spec/session/has_button_spec.rb +16 -0
data/lib/capybara/spec/session/has_css_spec.rb +35 -6
data/lib/capybara/spec/session/has_current_path_spec.rb +6 -4
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_sibling_spec.rb +50 -0
data/lib/capybara/spec/session/has_table_spec.rb +51 -5
data/lib/capybara/spec/session/has_text_spec.rb +47 -0
data/lib/capybara/spec/session/matches_style_spec.rb +2 -2
data/lib/capybara/spec/session/node_spec.rb +574 -16
data/lib/capybara/spec/session/save_and_open_screenshot_spec.rb +2 -2
data/lib/capybara/spec/session/save_screenshot_spec.rb +4 -4
data/lib/capybara/spec/session/scroll_spec.rb +1 -1
data/lib/capybara/spec/session/select_spec.rb +5 -10
data/lib/capybara/spec/session/selectors_spec.rb +24 -3
data/lib/capybara/spec/session/uncheck_spec.rb +2 -2
data/lib/capybara/spec/session/unselect_spec.rb +1 -1
data/lib/capybara/spec/session/window/window_spec.rb +10 -9
data/lib/capybara/spec/spec_helper.rb +7 -2
data/lib/capybara/spec/test_app.rb +26 -21
data/lib/capybara/spec/views/animated.erb +49 -0
data/lib/capybara/spec/views/form.erb +25 -4
data/lib/capybara/spec/views/frame_child.erb +2 -1
data/lib/capybara/spec/views/frame_one.erb +1 -0
data/lib/capybara/spec/views/obscured.erb +9 -9
data/lib/capybara/spec/views/offset.erb +32 -0
data/lib/capybara/spec/views/react.erb +45 -0
data/lib/capybara/spec/views/spatial.erb +31 -0
data/lib/capybara/spec/views/with_animation.erb +29 -1
data/lib/capybara/spec/views/with_dragula.erb +24 -0
data/lib/capybara/spec/views/with_html.erb +28 -2
data/lib/capybara/spec/views/with_js.erb +2 -1
data/lib/capybara/spec/views/with_jstree.erb +26 -0
data/lib/capybara/spec/views/with_sortable_js.erb +21 -0
data/lib/capybara/version.rb +1 -1
data/lib/capybara/window.rb +10 -10
data/spec/basic_node_spec.rb +6 -6
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 +12 -2
data/spec/minitest_spec_spec.rb +56 -45
data/spec/rack_test_spec.rb +25 -12
data/spec/regexp_dissassembler_spec.rb +53 -39
data/spec/result_spec.rb +50 -54
data/spec/rspec/features_spec.rb +1 -0
data/spec/rspec/shared_spec_matchers.rb +78 -62
data/spec/rspec_spec.rb +5 -5
data/spec/sauce_spec_chrome.rb +1 -0
data/spec/selector_spec.rb +26 -16
data/spec/selenium_spec_chrome.rb +84 -5
data/spec/selenium_spec_chrome_remote.rb +23 -8
data/spec/selenium_spec_edge.rb +23 -8
data/spec/selenium_spec_firefox.rb +16 -21
data/spec/selenium_spec_firefox_remote.rb +4 -13
data/spec/selenium_spec_ie.rb +23 -15
data/spec/selenium_spec_safari.rb +17 -17
data/spec/server_spec.rb +87 -42
data/spec/session_spec.rb +11 -4
data/spec/shared_selenium_node.rb +83 -0
data/spec/shared_selenium_session.rb +62 -72
data/spec/spec_helper.rb +43 -5
metadata +114 -16

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

@@ -10,7 +10,8 @@
         </script>
     </head>
     <body id="childBody">
-      <a href="javascript:void(0)" onClick="closeWin()">Close Window</a>
+      <a href="javascript:void(0)" onClick="closeWin()">Close Window Now</a>
+      <a href="javascript:void(0)" onClick="setTimeout(function(){closeWin()}, 10)">Close Window Soon</a>
       <iframe src="/frame_one" id="grandchildFrame1"></iframe>
       <iframe src="/frame_two" id="grandchildFrame2"></iframe>
     </body>

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

@@ -5,5 +5,6 @@
     </head>
     <body>
         <div id="divInFrameOne">This is the text of divInFrameOne</div>
+        <div id="otherDivInFrameOne">Some other text</div>
     </body>
 </html>

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

@@ -1,15 +1,13 @@
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-    <title>with_animation</title>
-    <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
-    <script>
-      $(document).on('contextmenu', function(e){ e.preventDefault(); });
-    </script>
+    <title>Obscured</title>
     <style>
       div {
-        width: 400px;
-        height: 400px;
+        width: 200px;
+        height: 200px;
+      }
+      #cover, #offscreen, #offscreen_wrapper {
         position: absolute;
       }
       #obscured {
@@ -17,6 +15,7 @@
         background-color: red;
       }
       #cover {
+        top: 0px;
         z-index: 2;
         background-color: blue;
       }
@@ -33,12 +32,13 @@
       }
     </style>
   </head>
-  <body id="with_animation">
+  <body>
     <div id="obscured">
       <input id="obscured_input"/>
     </div>
     <div id="cover"></div>
+    <iframe id="frameOne" height="10px" src="/frame_one"></iframe>
+    <iframe id="nestedFrames" src="/frame_parent"></iframe>
     <div id="offscreen_wrapper">
       <div id="offscreen"></div>
     </div>

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

@@ -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/react.erb ADDED

@@ -0,0 +1,45 @@
+<!doctype html>
+<html>
+  <head>
+    <script src="https://unpkg.com/react/umd/react.development.js"></script>
+    <script src="https://unpkg.com/react-dom/umd/react-dom.development.js"></script>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script>
+      // https://codepen.io/gaearon/pen/VmmPgp?editors=0010
+      class NameForm extends React.Component {
+        constructor(props) {
+          super(props);
+          this.state = { value: '' };
+          this.handleChange = this.handleChange.bind(this);
+          this.handleSubmit = this.handleSubmit.bind(this);
+        }
+        handleChange(event) {
+          this.setState({ value: event.target.value });
+        }
+        handleSubmit(event) {
+          alert('A name was submitted: ' + this.state.value);
+          event.preventDefault();
+        }
+        render() {
+          return (
+            React.createElement("form", { onSubmit: this.handleSubmit },
+            React.createElement("label", null, "Name:",
+            React.createElement("input", { type: "text", value: this.state.value, onChange: this.handleChange })),
+            React.createElement("input", { type: "submit", value: "Submit" })));
+        }}
+        ReactDOM.render(
+        React.createElement(NameForm, null),
+        document.getElementById('root'));
+    </script>
+  </body>
+</html>

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

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

@@ -6,6 +6,17 @@
     <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>
       .transition.away {
           width: 0%;
@@ -17,6 +28,13 @@
           overflow: hidden;
       }
+      a::after {
+        content: "";
+        width: 0px;
+        height: 0px;
+        background-color: blue;
+      }
       a:not(.away) {
         height: 20px;
       }
@@ -35,12 +53,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

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

@@ -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,5 +181,28 @@ 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>
 <a href="/download.csv" download>Download Me</a>
 <a href="/download.csv" download="other.csv">Download Other</a>

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

@@ -28,13 +28,14 @@
     <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>
       <select id="waiter">

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

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

@@ -0,0 +1,21 @@
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+  <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>
+  </head>
+  <body id="with_sortable_js">
+    <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>
+      new Sortable(document.getElementById("sortable"));
+    </script>
+  </body>
+</html>

data/lib/capybara/version.rb CHANGED

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

data/lib/capybara/window.rb CHANGED

@@ -2,7 +2,7 @@
 module Capybara
   ##
-  # The Window class represents a browser window.
+  # The {Window} class represents a browser window.
   #
   # You can get an instance of the class by calling either of:
   #
@@ -12,12 +12,12 @@ module Capybara
   # * {Capybara::Session#switch_to_window}
   #
   # Note that some drivers (e.g. Selenium) support getting size of/resizing/closing only
-  #   current window. So if you invoke such method for:
+  # current window. So if you invoke such method for:
   #
-  #   * window that is current, Capybara will make 2 Selenium method invocations
-  #     (get handle of current window + get size/resize/close).
-  #   * window that is not current, Capybara will make 4 Selenium method invocations
-  #     (get handle of current window + switch to given handle + get size/resize/close + switch to original handle)
+  # * window that is current, Capybara will make 2 Selenium method invocations
+  #   (get handle of current window + get size/resize/close).
+  # * window that is not current, Capybara will make 4 Selenium method invocations
+  #   (get handle of current window + switch to given handle + get size/resize/close + switch to original handle)
   #
   class Window
     # @return [String]   a string that uniquely identifies window within session
@@ -57,12 +57,12 @@ module Capybara
     # Close window.
     #
     # If this method was called for window that is current, then after calling this method
-    #   future invocations of other Capybara methods should raise
-    #   `session.driver.no_such_window_error` until another window will be switched to.
+    # future invocations of other Capybara methods should raise
+    # {Capybara::Driver::Base#no_such_window_error session.driver.no_such_window_error} until another window will be switched to.
     #
     # @!macro about_current
     #   If this method was called for window that is not current, then after calling this method
-    #   current window shouldn remain the same as it was before calling this method.
+    #   current window should remain the same as it was before calling this method.
     #
     def close
       @driver.close_window(handle)
@@ -93,7 +93,7 @@ module Capybara
     # Maximize window.
     #
     # If a particular driver (e.g. headless driver) doesn't have concept of maximizing it
-    #   may not support this method.
+    # may not support this method.
     #
     # @macro about_current
     #

data/spec/basic_node_spec.rb CHANGED

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Capybara do
   describe '.string' do
     let :string do
-      Capybara.string <<-STRING
+      described_class.string <<-STRING
         <html>
           <head>
             <title>simple_node</title>
@@ -52,7 +52,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 +62,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 +112,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