capybara 3.30.0 → 3.33.0

data/lib/capybara/spec/session/window/window_spec.rb

@@ -141,12 +141,12 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#maximize' do
-    before do
-      @initial_size = @session.current_window.size
+    let! :initial_size do
+      @session.current_window.size
     end
 
     after do
-      @session.current_window.resize_to(*@initial_size)
+      @session.current_window.resize_to(*initial_size)
       sleep 0.5
     end
 
@@ -176,7 +176,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
 
       expect(@session.current_window).to eq(orig_window)
       # Maximizing the browser affects all tabs so this may not be valid in real browsers
-      # expect(@session.current_window.size).to eq(@initial_size)
+      # expect(@session.current_window.size).to eq(initial_size)
 
       ow_width, ow_height = other_window.size
       expect(ow_width).to be > 400
@@ -185,12 +185,12 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#fullscreen' do
-    before do
-      @initial_size = @session.current_window.size
+    let! :initial_size do
+      @session.current_window.size
     end
 
     after do
-      @session.current_window.resize_to(*@initial_size)
+      @session.current_window.resize_to(*initial_size)
       sleep 1
     end
 

data/lib/capybara/spec/spec_helper.rb

@@ -30,6 +30,7 @@ module Capybara
         Capybara.visible_text_only = false
         Capybara.match = :smart
         Capybara.enable_aria_label = false
+        Capybara.enable_aria_role = false
         Capybara.default_set_options = {}
         Capybara.disable_animation = false
         Capybara.test_id = nil
@@ -60,7 +61,7 @@ module Capybara
         RSpec.describe Capybara::Session, name, options do # rubocop:disable RSpec/EmptyExampleGroup
           include Capybara::SpecHelper
           include Capybara::RSpecMatchers
-          # rubocop:disable RSpec/ScatteredSetup
+
           before do |example|
             @session = session
             instance_exec(example, &filter_block) if filter_block
@@ -81,7 +82,6 @@ module Capybara
           before :each, :exact_false do
             Capybara.exact = false
           end
-          # rubocop:enable RSpec/ScatteredSetup
 
           specs.each do |spec_name, spec_options, block|
             describe spec_name, *spec_options do # rubocop:disable RSpec/EmptyExampleGroup

data/lib/capybara/spec/test_app.rb

@@ -188,28 +188,24 @@ class TestApp < Sinatra::Base
   end
 
   post '/upload' do
-    begin
-      buffer = []
-      buffer << "Content-type: #{params.dig(:form, :document, :type)}"
-      buffer << "File content: #{params.dig(:form, :document, :tempfile).read}"
-      buffer.join(' | ')
-    rescue StandardError
-      'No file uploaded'
-    end
+    buffer = []
+    buffer << "Content-type: #{params.dig(:form, :document, :type)}"
+    buffer << "File content: #{params.dig(:form, :document, :tempfile).read}"
+    buffer.join(' | ')
+  rescue StandardError
+    'No file uploaded'
   end
 
   post '/upload_multiple' do
-    begin
-      docs = params.dig(:form, :multiple_documents)
-      buffer = [docs.size.to_s]
-      docs.each do |doc|
-        buffer << "Content-type: #{doc[:type]}"
-        buffer << "File content: #{doc[:tempfile].read}"
-      end
-      buffer.join(' | ')
-    rescue StandardError
-      'No files uploaded'
+    docs = params.dig(:form, :multiple_documents)
+    buffer = [docs.size.to_s]
+    docs.each do |doc|
+      buffer << "Content-type: #{doc[:type]}"
+      buffer << "File content: #{doc[:tempfile].read}"
     end
+    buffer.join(' | ')
+  rescue StandardError
+    'No files uploaded'
   end
 
   get '/apple-touch-icon-precomposed.png' do

data/lib/capybara/spec/views/form.erb

@@ -11,7 +11,7 @@
       <option>Miss</option>
       <option disabled="disabled">Other</option>
     </select>
-    </p>
+  </p>
 
   <p>
     <label for="customer_name">Customer Name
@@ -62,6 +62,11 @@
     <input type="text" name="form[name]" value="John Smith" id="form_name"/>
   </p>
 
+  <p>
+    <label for="form_age">Age</label>
+    <input type="range" name="form[age]" value="18" min="13" max="100" step="0.5" id="form_age"/>
+  </p>
+
   <p>
     <label for="form_schmooo">Schmooo</label>
     <input type="schmooo" name="form[schmooo]" value="This is Schmooo!" id="form_schmooo"/>
@@ -135,7 +140,11 @@
 
   <p>
     <label for="form_zipcode">Zipcode</label>
-    <input type="text" maxlength="5" name="form[zipcode]" id="form_zipcode" />
+    <input type="text" maxlength="5" name="form[zipcode]" id="form_zipcode" pattern="[0-9]{5,9}" />
+  </p>
+
+  <p>
+    <input maxlength="35" id="long_length" />
   </p>
 
   <p>
@@ -448,6 +457,7 @@ New line after and before textarea tag
     <button id="no_type">No Type!</button>
     <button><img alt="A horse eating hay"/></button>
     <input type="button" disabled="disabled" value="Disabled button"/>
+    <span role="button">ARIA button</span>
   </p>
 
   <p>
@@ -512,6 +522,7 @@ New line after and before textarea tag
 
   <p>
     <input type="submit" name="form[mediocre]" id="mediocre" value="med" aria-label="Mediocre Button"/>
+    <input type="submit" formaction="/form/get?bar=foo" id="mediocre2" value="med2"/>
   <p>
 </form>
 

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

@@ -15,7 +15,9 @@
     </div>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/dragula/3.7.2/dragula.js" type="text/javascript"></script>
     <script>
-      dragula([document.getElementById("sortable")]);
+      let container = document.getElementById("sortable");
+      dragula([container]);
+      container.className = "ready"
     </script>
   </body>
 </html>

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

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

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

@@ -35,6 +35,7 @@
 
     <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/version.rb

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

data/spec/capybara_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Capybara do
         # do nothing
       end
 
-      expect(described_class.servers).to have_key(:blob)
+      expect(described_class.servers[:blob]).to be_truthy
     end
   end
 

data/spec/dsl_spec.rb

@@ -8,7 +8,7 @@ class TestClass
 end
 
 Capybara::SpecHelper.run_specs TestClass.new, 'DSL', capybara_skip: %i[
-  js modals screenshot frames windows send_keys server hover about_scheme psc download css driver scroll spatial
+  js modals screenshot frames windows send_keys server hover about_scheme psc download css driver scroll spatial html_validation
 ] do |example|
   case example.metadata[:full_description]
   when /has_css\? should support case insensitive :class and :id options/
@@ -19,6 +19,10 @@ Capybara::SpecHelper.run_specs TestClass.new, 'DSL', capybara_skip: %i[
 end
 
 RSpec.describe Capybara::DSL do
+  before do
+    Capybara.use_default_driver
+  end
+
   after do
     Capybara.session_name = nil
     Capybara.default_driver = nil
@@ -238,6 +242,15 @@ RSpec.describe Capybara::DSL do
       end
       expect(Capybara.current_session).to eq(original_session)
     end
+
+    it 'should pass the new session if block accepts' do
+      original_session = Capybara.current_session
+      Capybara.using_session(:administrator) do |admin_session, prev_session|
+        expect(admin_session).to be(Capybara.current_session)
+        expect(prev_session).to be(original_session)
+        expect(prev_session).not_to be(admin_session)
+      end
+    end
   end
 
   describe '#session_name' do

data/spec/minitest_spec.rb

@@ -16,7 +16,7 @@ class MinitestTest < Minitest::Test
   end
 
   def test_assert_text
-    assert_text('Form')
+    assert_text('Form', normalize_ws: false)
     assert_no_text('Not on the page')
     refute_text('Also Not on the page')
   end

data/spec/rack_test_spec.rb

@@ -26,6 +26,7 @@ skipped_tests = %i[
   css
   scroll
   spatial
+  html_validation
 ]
 Capybara::SpecHelper.run_specs TestSessions::RackTest, 'RackTest', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
@@ -82,7 +83,6 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
     describe '#fill_in' do
       it 'should warn that :fill_options are not supported' do
         session.visit '/with_html'
-
         expect { session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true } }.to \
           output(/^Options passed to Node#set but the RackTest driver doesn't support any - ignoring/).to_stderr
         expect(session).to have_field('test_field', with: 'not_monkey')
@@ -128,6 +128,18 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
           session.find(:label, 'Female').click
           expect(session).to have_unchecked_field('gender_male')
         end
+
+        it 'should rewrite the forms action query for get submission' do
+          session.visit('/form')
+          session.click_button('mediocre')
+          expect(session).not_to have_current_path(/foo|bar/)
+        end
+
+        it 'should rewrite the submit buttons formaction query for get submission' do
+          session.visit('/form')
+          session.click_button('mediocre2')
+          expect(session).not_to have_current_path(/foo|bar/)
+        end
       end
     end
 

data/spec/regexp_dissassembler_spec.rb

@@ -49,7 +49,6 @@ RSpec.describe Capybara::Selector::RegexpDisassembler, :aggregate_failures do
   end
 
   it 'handles optional characters for #alternated_substrings' do
-    # rubocop:disable Style/BracesAroundHashParameters
     verify_alternated_strings(
       {
         /abc*def/ => [%w[ab def]],
@@ -62,7 +61,6 @@ RSpec.describe Capybara::Selector::RegexpDisassembler, :aggregate_failures do
         /d?/ => []
       }
     )
-    # rubocop:enable Style/BracesAroundHashParameters
   end
 
   it 'handles character classes' do
@@ -140,7 +138,6 @@ RSpec.describe Capybara::Selector::RegexpDisassembler, :aggregate_failures do
   end
 
   it 'handles alternation for #alternated_substrings' do
-    # rubocop:disable Style/BracesAroundHashParameters
     verify_alternated_strings(
       {
         /abc|def/ => [%w[abc], %w[def]],
@@ -173,7 +170,6 @@ RSpec.describe Capybara::Selector::RegexpDisassembler, :aggregate_failures do
         /ab\\?cd/ => [%w[abcd], %w[ab\cd]]
       }
     )
-    # rubocop:enable Style/BracesAroundHashParameters
   end
 
   it 'handles grouping' do

data/spec/result_spec.rb

@@ -65,20 +65,47 @@ RSpec.describe Capybara::Result do
     end).to eq(2)
   end
 
+  def recalc_result
+    string.all '//li', minimum: 0 # pass minimum: 0 so lazy evaluation doesn't get triggered yet
+  end
+
   it 'supports all modes of []' do
-    expect(result[1].text).to eq 'Beta'
-    expect(result[0, 2].map(&:text)).to eq %w[Alpha Beta]
-    expect(result[1..3].map(&:text)).to eq %w[Beta Gamma Delta]
-    expect(result[-1].text).to eq 'Delta'
-    expect(result[-2, 3].map(&:text)).to eq %w[Gamma Delta]
-    expect(result[1..7].map(&:text)).to eq %w[Beta Gamma Delta]
-    expect(result[1...3].map(&:text)).to eq %w[Beta Gamma]
-    expect(result[2..-1].map(&:text)).to eq %w[Gamma Delta]
-    expect(result[2...-1].map(&:text)).to eq %w[Gamma]
-    eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.5
+    expect(recalc_result[1].text).to eq 'Beta'
+    expect(recalc_result[0, 2].map(&:text)).to eq %w[Alpha Beta]
+    expect(recalc_result[1..3].map(&:text)).to eq %w[Beta Gamma Delta]
+    expect(recalc_result[-1].text).to eq 'Delta'
+    expect(recalc_result[-2, 3].map(&:text)).to eq %w[Gamma Delta]
+    expect(recalc_result[1...3].map(&:text)).to eq %w[Beta Gamma]
+    expect(recalc_result[1..7].map(&:text)).to eq %w[Beta Gamma Delta]
+    expect(recalc_result[2...-1].map(&:text)).to eq %w[Gamma]
+    expect(recalc_result[2..-1].map(&:text)).to eq %w[Gamma Delta]
+  end
+
+  eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.5
+    it 'supports endless ranges' do
       expect(result[2..].map(&:text)).to eq %w[Gamma Delta]
-    TEST
-  end
+    end
+  TEST
+
+  eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.6
+    it 'supports inclusive positive beginless ranges' do
+      expect(result[..2].map(&:text)).to eq %w[Alpha Beta Gamma]
+    end
+
+    it 'supports inclusive negative beginless ranges' do
+      expect(result[..-2].map(&:text)).to eq %w[Alpha Beta Gamma]
+      expect(result[..-1].map(&:text)).to eq %w[Alpha Beta Gamma Delta]
+    end
+
+    it 'supports exclusive positive beginless ranges' do
+      expect(result[...2].map(&:text)).to eq %w[Alpha Beta]
+    end
+
+    it 'supports exclusive negative beginless ranges' do
+      expect(result[...-2].map(&:text)).to eq %w[Alpha Beta]
+      expect(result[...-1].map(&:text)).to eq %w[Alpha Beta Gamma]
+    end
+  TEST
 
   it 'works with filter blocks' do
     result = string.all('//li') { |node| node.text == 'Alpha' }
@@ -163,23 +190,7 @@ RSpec.describe Capybara::Result do
     end
   end
 
-  context 'lazy select' do
-    it 'is compatible' do
-      # This test will let us know when JRuby fixes lazy select so we can re-enable it in Result
-      pending 'JRuby < 9.2.8.0 has an issue with lazy enumberator evaluation' if jruby_lazy_enumerator_workaround?
-      eval_count = 0
-      enum = %w[Text1 Text2 Text3].lazy.select do
-        eval_count += 1
-        true
-      end
-      expect(eval_count).to eq 0
-      enum.next
-      sleep 1
-      expect(eval_count).to eq 1
-    end
-  end
-
   def jruby_lazy_enumerator_workaround?
-    (RUBY_PLATFORM == 'java') && (Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('9.2.8.0'))
+    RUBY_PLATFORM == 'java'
   end
 end

data/spec/rspec/shared_spec_matchers.rb

@@ -89,29 +89,29 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_css? returns true' do
-          expect(page).to have_css('h1')
+          expect(session).to have_css('h1')
         end
 
         it 'fails if has_css? returns false' do
           expect do
-            expect(page).to have_css('h1#doesnotexist')
+            expect(session).to have_css('h1#doesnotexist')
           end.to raise_error(/expected to find css "h1#doesnotexist" but there were no matches/)
         end
       end
 
       context 'with should_not' do
         it 'passes if has_no_css? returns true' do
-          expect(page).not_to have_css('h1#doesnotexist')
+          expect(session).not_to have_css('h1#doesnotexist')
         end
 
         it 'fails if has_no_css? returns false' do
           expect do
-            expect(page).not_to have_css('h1')
+            expect(session).not_to have_css('h1')
           end.to raise_error(/expected not to find visible css "h1"/)
         end
       end
@@ -158,29 +158,29 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_xpath? returns true' do
-          expect(page).to have_xpath('//h1')
+          expect(session).to have_xpath('//h1')
         end
 
         it 'fails if has_xpath? returns false' do
           expect do
-            expect(page).to have_xpath("//h1[@id='doesnotexist']")
+            expect(session).to have_xpath("//h1[@id='doesnotexist']")
           end.to raise_error(%r{expected to find xpath "//h1\[@id='doesnotexist'\]" but there were no matches})
         end
       end
 
       context 'with should_not' do
         it 'passes if has_no_xpath? returns true' do
-          expect(page).not_to have_xpath('//h1[@id="doesnotexist"]')
+          expect(session).not_to have_xpath('//h1[@id="doesnotexist"]')
         end
 
         it 'fails if has_no_xpath? returns false' do
           expect do
-            expect(page).not_to have_xpath('//h1')
+            expect(session).not_to have_xpath('//h1')
           end.to raise_error(%r{expected not to find visible xpath "//h1"})
         end
       end
@@ -222,35 +222,35 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_selector? returns true' do
-          expect(page).to have_selector('//h1', text: 'test')
+          expect(session).to have_selector('//h1', text: 'test')
         end
 
         it 'fails if has_selector? returns false' do
           expect do
-            expect(page).to have_selector("//h1[@id='doesnotexist']")
+            expect(session).to have_selector("//h1[@id='doesnotexist']")
           end.to raise_error(%r{expected to find xpath "//h1\[@id='doesnotexist'\]" but there were no matches})
         end
 
         it 'includes text in error message' do
           expect do
-            expect(page).to have_selector('//h1', text: 'wrong text')
+            expect(session).to have_selector('//h1', text: 'wrong text')
           end.to raise_error(%r{expected to find visible xpath "//h1" with text "wrong text" but there were no matches})
         end
       end
 
       context 'with should_not' do
         it 'passes if has_no_css? returns true' do
-          expect(page).not_to have_selector(:css, 'h1#doesnotexist')
+          expect(session).not_to have_selector(:css, 'h1#doesnotexist')
         end
 
         it 'fails if has_no_selector? returns false' do
           expect do
-            expect(page).not_to have_selector(:css, 'h1', text: 'test')
+            expect(session).not_to have_selector(:css, 'h1', text: 'test')
           end.to raise_error(/expected not to find visible css "h1" with text "test"/)
         end
       end
@@ -265,7 +265,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
   describe 'have_content matcher' do
     it 'gives proper description' do
-      expect(have_content('Text').description).to eq('text "Text"')
+      expect(have_content('Text').description).to eq('have text "Text"')
     end
 
     context 'on a string' do
@@ -304,21 +304,21 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_content? returns true' do
-          expect(page).to have_content('This is a test')
+          expect(session).to have_content('This is a test')
         end
 
         it 'passes if has_content? returns true using regexp' do
-          expect(page).to have_content(/test/)
+          expect(session).to have_content(/test/)
         end
 
         it 'fails if has_content? returns false' do
           expect do
-            expect(page).to have_content('No such Text')
+            expect(session).to have_content('No such Text')
           end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
         end
 
@@ -329,7 +329,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
           it 'fails if has_content? returns false' do
             expect do
-              expect(page).to have_content('No such Text')
+              expect(session).to have_content('No such Text')
             end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
         end
@@ -337,14 +337,26 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
       context 'with should_not' do
         it 'passes if has_no_content? returns true' do
-          expect(page).not_to have_content('No such Text')
+          expect(session).not_to have_content('No such Text')
         end
 
         it 'fails if has_no_content? returns false' do
           expect do
-            expect(page).not_to have_content('This is a test')
+            expect(session).not_to have_content('This is a test')
           end.to raise_error(/expected not to find text "This is a test"/)
         end
+
+        it 'not_to have_content behaves the same as to have_no_content' do
+          Capybara.using_wait_time(5) do
+            expect(session).to have_content('This is a test')
+            start = Time.now
+            expect(session).to have_no_content('No such Text')
+            to_time = Time.now
+            expect(session).not_to have_content('No such Text')
+            not_to_time = Time.now
+            expect(not_to_time - to_time).to be_within(0.5).of(to_time - start)
+          end
+        end
       end
     end
 
@@ -357,7 +369,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
   describe 'have_text matcher' do
     it 'gives proper description' do
-      expect(have_text('Text').description).to eq('text "Text"')
+      expect(have_text('Text').description).to eq('have text "Text"')
     end
 
     context 'on a string' do
@@ -432,30 +444,30 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_text? returns true' do
-          expect(page).to have_text('This is a test')
+          expect(session).to have_text('This is a test')
         end
 
         it 'passes if has_text? returns true using regexp' do
-          expect(page).to have_text(/test/)
+          expect(session).to have_text(/test/)
         end
 
         it 'can check for all text' do
-          expect(page).to have_text(:all, 'Some of this text is hidden!')
+          expect(session).to have_text(:all, 'Some of this text is hidden!')
         end
 
         it 'can check for visible text' do
-          expect(page).to have_text(:visible, 'Some of this text is')
-          expect(page).not_to have_text(:visible, 'Some of this text is hidden!')
+          expect(session).to have_text(:visible, 'Some of this text is')
+          expect(session).not_to have_text(:visible, 'Some of this text is hidden!')
         end
 
         it 'fails if has_text? returns false' do
           expect do
-            expect(page).to have_text('No such Text')
+            expect(session).to have_text('No such Text')
           end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
         end
 
@@ -466,7 +478,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
           it 'fails if has_text? returns false' do
             expect do
-              expect(page).to have_text('No such Text')
+              expect(session).to have_text('No such Text')
             end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
         end
@@ -474,12 +486,12 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
       context 'with should_not' do
         it 'passes if has_no_text? returns true' do
-          expect(page).not_to have_text('No such Text')
+          expect(session).not_to have_text('No such Text')
         end
 
         it 'fails if has_no_text? returns false' do
           expect do
-            expect(page).not_to have_text('This is a test')
+            expect(session).not_to have_text('This is a test')
           end.to raise_error(/expected not to find text "This is a test"/)
         end
       end
@@ -542,15 +554,15 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       it 'passes if there is such a title' do
-        visit('/with_js')
-        expect(page).to have_title('with_js')
+        session.visit('/with_js')
+        expect(session).to have_title('with_js')
       end
 
       it 'fails if there is no such title' do
-        visit('/with_js')
+        session.visit('/with_js')
         expect do
-          expect(page).to have_title('No such title')
-        end.to raise_error('expected "with_js" to include "No such title"')
+          expect(session).to have_title('No such title')
+        end.to raise_error(/ to include "No such title"/)
       end
 
       context 'with wait' do
@@ -560,14 +572,14 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
         it 'waits if wait time is more than timeout' do
           session.click_link('Change title')
-          using_wait_time 0 do
+          session.using_wait_time 0 do
             expect(session).to have_title('changed title', wait: 2)
           end
         end
 
         it "doesn't wait if wait time is less than timeout" do
           session.click_link('Change title')
-          using_wait_time 3 do
+          session.using_wait_time 3 do
             expect(session).not_to have_title('changed title', wait: 0)
           end
         end
@@ -586,15 +598,15 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       it 'passes if there is such a current path' do
-        visit('/with_js')
-        expect(page).to have_current_path('/with_js')
+        session.visit('/with_js')
+        expect(session).to have_current_path('/with_js')
       end
 
       it 'fails if there is no such current_path' do
         visit('/with_js')
         expect do
-          expect(page).to have_current_path('/not_with_js')
-        end.to raise_error('expected "/with_js" to equal "/not_with_js"')
+          expect(session).to have_current_path('/not_with_js')
+        end.to raise_error(%r{to equal "/not_with_js"})
       end
 
       context 'with wait' do
@@ -604,14 +616,14 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
         it 'waits if wait time is more than timeout' do
           session.click_link('Change page')
-          using_wait_time 0 do
+          session.using_wait_time 0 do
             expect(session).to have_current_path('/with_html', wait: 2)
           end
         end
 
         it "doesn't wait if wait time is less than timeout" do
           session.click_link('Change page')
-          using_wait_time 0 do
+          session.using_wait_time 0 do
             expect(session).not_to have_current_path('/with_html')
           end
         end
@@ -619,8 +631,8 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'supports compounding' do
-      visit('/with_html')
-      expect(page).to have_current_path('/not_with_html').or have_current_path('/with_html')
+      session.visit('/with_html')
+      expect(session).to have_current_path('/not_with_html').or have_current_path('/with_html')
     end
   end
 
@@ -828,10 +840,10 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'gives proper description when :visible option passed' do
-      expect(have_table('Lovely table', visible: true).description).to eq('have visible table "Lovely table"')
+      expect(have_table('Lovely table', visible: true).description).to eq('have visible table "Lovely table"') # rubocop:disable Capybara/VisibilityMatcher
       expect(have_table('Lovely table', visible: :hidden).description).to eq('have non-visible table "Lovely table"')
       expect(have_table('Lovely table', visible: :all).description).to eq('have table "Lovely table"')
-      expect(have_table('Lovely table', visible: false).description).to eq('have table "Lovely table"')
+      expect(have_table('Lovely table', visible: false).description).to eq('have table "Lovely table"') # rubocop:disable Capybara/VisibilityMatcher
     end
 
     it 'passes if there is such a table' do
@@ -859,7 +871,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     describe '#and' do
       it "should run 'concurrently'" do
-        Capybara.using_wait_time(2) do
+        session.using_wait_time(2) do
           matcher = have_text('this is not there').and have_text('neither is this')
           expect(Benchmark.realtime do
             expect do