capybara 3.16.1 → 3.33.0

data/spec/rack_test_spec.rb

@@ -25,6 +25,8 @@ skipped_tests = %i[
   download
   css
   scroll
+  spatial
+  html_validation
 ]
 Capybara::SpecHelper.run_specs TestSessions::RackTest, 'RackTest', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
@@ -80,11 +82,10 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
 
     describe '#fill_in' do
       it 'should warn that :fill_options are not supported' do
-        allow_any_instance_of(Capybara::RackTest::Node).to receive(:warn)
         session.visit '/with_html'
-        field = session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true }
+        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')
-        expect(field.base).to have_received(:warn).with("Options passed to Node#set but the RackTest driver doesn't support any - ignoring")
       end
     end
 
@@ -127,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
 
@@ -155,27 +168,27 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':headers option' do
     it 'should always set headers' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/get_header')
       expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on link clicks' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/header_links')
       driver.find_xpath('.//a').first.click
       expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on form submit' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/header_links')
       driver.find_xpath('.//input').first.click
       expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on redirects' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/get_header_via_redirect')
       expect(driver.html).to include('foobar')
     end
@@ -183,7 +196,7 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':follow_redirects option' do
     it 'defaults to following redirects' do
-      driver = Capybara::RackTest::Driver.new(TestApp)
+      driver = described_class.new(TestApp)
 
       driver.visit('/redirect')
       expect(driver.response.header['Location']).to be_nil
@@ -191,7 +204,7 @@ RSpec.describe Capybara::RackTest::Driver do
     end
 
     it 'is possible to not follow redirects' do
-      driver = Capybara::RackTest::Driver.new(TestApp, follow_redirects: false)
+      driver = described_class.new(TestApp, follow_redirects: false)
 
       driver.visit('/redirect')
       expect(driver.response.header['Location']).to match %r{/redirect_again$}
@@ -201,7 +214,7 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':redirect_limit option' do
     context 'with default redirect limit' do
-      let(:driver) { Capybara::RackTest::Driver.new(TestApp) }
+      let(:driver) { described_class.new(TestApp) }
 
       it 'should follow 5 redirects' do
         driver.visit('/redirect/5/times')
@@ -216,7 +229,7 @@ RSpec.describe Capybara::RackTest::Driver do
     end
 
     context 'with 21 redirect limit' do
-      let(:driver) { Capybara::RackTest::Driver.new(TestApp, redirect_limit: 21) }
+      let(:driver) { described_class.new(TestApp, redirect_limit: 21) }
 
       it 'should follow 21 redirects' do
         driver.visit('/redirect/21/times')
@@ -251,6 +264,6 @@ RSpec.describe Capybara::RackTest::CSSHandlers do
   include CSSHandlerIncludeTester
 
   it 'should not be extended by global includes' do
-    expect(Capybara::RackTest::CSSHandlers.new).not_to respond_to(:dont_extend_css_handler)
+    expect(described_class.new).not_to respond_to(:dont_extend_css_handler)
   end
 end

data/spec/regexp_dissassembler_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Capybara::Selector::RegexpDisassembler do
+RSpec.describe Capybara::Selector::RegexpDisassembler, :aggregate_failures do
   it 'handles strings' do
     verify_strings(
       /abcdef/ => %w[abcdef],
@@ -44,20 +44,22 @@ RSpec.describe Capybara::Selector::RegexpDisassembler do
       /abc?def?g/ => %w[ab de g],
       /d?/ => []
     }.each do |regexp, expected|
-      expect(Capybara::Selector::RegexpDisassembler.new(regexp).substrings).to eq expected
+      expect(described_class.new(regexp).substrings).to eq expected
     end
   end
 
   it 'handles optional characters for #alternated_substrings' do
     verify_alternated_strings(
-      /abc*def/ => [%w[ab def]],
-      /abc*/ => [%w[ab]],
-      /c*/ => [],
-      /abc?def/ => [%w[abdef], %w[abcdef]],
-      /abc?/ => [%w[ab]],
-      /abc?def?/ => [%w[abde], %w[abcde]],
-      /abc?def?g/ => [%w[abdeg], %w[abdefg], %w[abcdeg], %w[abcdefg]],
-      /d?/ => []
+      {
+        /abc*def/ => [%w[ab def]],
+        /abc*/ => [%w[ab]],
+        /c*/ => [],
+        /abc?def/ => [%w[abdef], %w[abcdef]],
+        /abc?/ => [%w[ab]],
+        /abc?def?/ => [%w[abde], %w[abcde]],
+        /abc?def?g/ => [%w[abdeg], %w[abdefg], %w[abcdeg], %w[abcdefg]],
+        /d?/ => []
+      }
     )
   end
 
@@ -131,40 +133,42 @@ RSpec.describe Capybara::Selector::RegexpDisassembler do
       /ab(cd|cd)?ef/ => %w[ab ef],
       /ab\\?cd/ => %w[ab cd]
     }.each do |regexp, expected|
-      expect(Capybara::Selector::RegexpDisassembler.new(regexp).substrings).to eq expected
+      expect(described_class.new(regexp).substrings).to eq expected
     end
   end
 
   it 'handles alternation for #alternated_substrings' do
     verify_alternated_strings(
-      /abc|def/ => [%w[abc], %w[def]],
-      /ab(?:c|d)/ => [%w[abc], %w[abd]],
-      /ab(c|d|e)fg/ => [%w[abcfg], %w[abdfg], %w[abefg]],
-      /ab?(c|d)fg/ => [%w[acfg], %w[adfg], %w[abcfg], %w[abdfg]],
-      /ab(c|d)ef/ => [%w[abcef], %w[abdef]],
-      /ab(cd?|ef)g/ => [%w[abcg], %w[abcdg], %w[abefg]],
-      /ab(cd|ef*)g/ => [%w[abcdg], %w[abe g]],
-      /ab|cd*/ => [%w[ab], %w[c]],
-      /cd(?:ef|gh)|xyz/ => [%w[cdef], %w[cdgh], %w[xyz]],
-      /(cd(?:ef|gh)|xyz)/ => [%w[cdef], %w[cdgh], %w[xyz]],
-      /cd(ef|gh)+/ => [%w[cdef], %w[cdgh]],
-      /cd(ef|gh)?/ => [%w[cd]],
-      /cd(ef|gh)?ij/ => [%w[cdij], %w[cdefij], %w[cdghij]],
-      /cd(ef|gh)+ij/ => [%w[cdef ij], %w[cdgh ij]],
-      /cd(ef|gh){2}ij/ => [%w[cdefefij], %w[cdefghij], %w[cdghefij], %w[cdghghij]],
-      /(cd(ef|g*))/ => [%w[cd]],
-      /a|b*/ => [],
-      /ab(?:c|d?)/ => [%w[ab]],
-      /ab(c|d)|a*/ => [],
-      /(abc)?(d|e)/ => [%w[d], %w[e]],
-      /(abc*de)?(d|e)/ => [%w[d], %w[e]],
-      /(abc*de)?(d|e?)/ => [],
-      /(abc)?(d|e?)/ => [],
-      /ab(cd){0,2}ef/ => [%w[ab ef]],
-      /ab(cd){0,1}ef/ => [%w[abef], %w[abcdef]],
-      /ab(cd|cd)ef/ => [%w[abcdef]],
-      /ab(cd|cd)?ef/ => [%w[abef], %w[abcdef]],
-      /ab\\?cd/ => [%w[abcd], %w[ab\cd]]
+      {
+        /abc|def/ => [%w[abc], %w[def]],
+        /ab(?:c|d)/ => [%w[abc], %w[abd]],
+        /ab(c|d|e)fg/ => [%w[abcfg], %w[abdfg], %w[abefg]],
+        /ab?(c|d)fg/ => [%w[acfg], %w[adfg], %w[abcfg], %w[abdfg]],
+        /ab(c|d)ef/ => [%w[abcef], %w[abdef]],
+        /ab(cd?|ef)g/ => [%w[abcg], %w[abcdg], %w[abefg]],
+        /ab(cd|ef*)g/ => [%w[abcdg], %w[abe g]],
+        /ab|cd*/ => [%w[ab], %w[c]],
+        /cd(?:ef|gh)|xyz/ => [%w[cdef], %w[cdgh], %w[xyz]],
+        /(cd(?:ef|gh)|xyz)/ => [%w[cdef], %w[cdgh], %w[xyz]],
+        /cd(ef|gh)+/ => [%w[cdef], %w[cdgh]],
+        /cd(ef|gh)?/ => [%w[cd]],
+        /cd(ef|gh)?ij/ => [%w[cdij], %w[cdefij], %w[cdghij]],
+        /cd(ef|gh)+ij/ => [%w[cdef ij], %w[cdgh ij]],
+        /cd(ef|gh){2}ij/ => [%w[cdefefij], %w[cdefghij], %w[cdghefij], %w[cdghghij]],
+        /(cd(ef|g*))/ => [%w[cd]],
+        /a|b*/ => [],
+        /ab(?:c|d?)/ => [%w[ab]],
+        /ab(c|d)|a*/ => [],
+        /(abc)?(d|e)/ => [%w[d], %w[e]],
+        /(abc*de)?(d|e)/ => [%w[d], %w[e]],
+        /(abc*de)?(d|e?)/ => [],
+        /(abc)?(d|e?)/ => [],
+        /ab(cd){0,2}ef/ => [%w[ab ef]],
+        /ab(cd){0,1}ef/ => [%w[abef], %w[abcdef]],
+        /ab(cd|cd)ef/ => [%w[abcdef]],
+        /ab(cd|cd)?ef/ => [%w[abef], %w[abcdef]],
+        /ab\\?cd/ => [%w[abcd], %w[ab\cd]]
+      }
     )
   end
 
@@ -212,6 +216,16 @@ RSpec.describe Capybara::Selector::RegexpDisassembler do
     )
   end
 
+  it 'ignores negative lookaheads' do
+    verify_strings(
+      /^(?!.*\bContributing Editor\b).*$/ => %w[],
+      /abc(?!.*def).*/ => %w[abc],
+      /(?!.*def)abc/ => %w[abc],
+      /abc(?!.*def.*).*ghi/ => %w[abc ghi],
+      /abc(?!.*bcd)def/ => %w[abcdef]
+    )
+  end
+
   it 'handles anchors' do
     verify_strings(
       /^abc/ => %w[abc],

data/spec/result_spec.rb

@@ -44,9 +44,9 @@ RSpec.describe Capybara::Result do
   end
 
   it 'can be selected' do
-    expect(result.select do |element|
+    expect(result.count do |element|
       element.text.include? 't'
-    end.length).to eq(2)
+    end).to eq(2)
   end
 
   it 'can be reduced' do
@@ -65,48 +65,56 @@ 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' }
     expect(result.size).to eq 1
   end
 
-  it 'should catch invalid element errors during filtering' do
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:text).and_raise(StandardError)
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(
-      instance_double('Capybara::Session', driver: instance_double('Capybara::Driver::Base', invalid_element_errors: [StandardError], wait?: false))
-    )
-    result = string.all('//li', text: 'Alpha')
-    expect(result.size).to eq 0
-  end
-
-  it 'should return non-invalid element errors during filtering' do
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:text).and_raise(StandardError)
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(
-      instance_double('Capybara::Session', driver: instance_double('Capybara::Driver::Base', invalid_element_errors: [ArgumentError], wait?: false))
-    )
-    expect do
-      string.all('//li', text: 'Alpha').to_a
-    end.to raise_error(StandardError)
-  end
-
   # Not a great test but it indirectly tests what is needed
   it 'should evaluate filters lazily for idx' do
-    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     # Not processed until accessed
     expect(result.instance_variable_get('@result_cache').size).to be 0
 
@@ -127,7 +135,7 @@ RSpec.describe Capybara::Result do
   end
 
   it 'should evaluate filters lazily for range' do
-    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result[0..1]
     expect(result.instance_variable_get('@result_cache').size).to be 2
 
@@ -136,7 +144,7 @@ RSpec.describe Capybara::Result do
   end
 
   it 'should evaluate filters lazily for idx and length' do
-    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result[1, 2]
     expect(result.instance_variable_get('@result_cache').size).to be 3
 
@@ -145,7 +153,7 @@ RSpec.describe Capybara::Result do
   end
 
   it 'should only need to evaluate one result for any?' do
-    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result.any?
     expect(result.instance_variable_get('@result_cache').size).to be 1
   end
@@ -156,9 +164,9 @@ RSpec.describe Capybara::Result do
     expect(result.instance_variable_get('@result_cache').size).to eq 4
   end
 
-  context '#each' do
+  describe '#each' do
     it 'lazily evaluates' do
-      skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+      skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
       results = []
       result.each do |el|
         results << el
@@ -174,7 +182,7 @@ RSpec.describe Capybara::Result do
       end
 
       it 'lazily evaluates' do
-        skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+        skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
         result.each.with_index do |_el, idx|
           expect(result.instance_variable_get('@result_cache').size).to eq(idx + 1) # 0 indexing
         end
@@ -182,19 +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 has an issue with lazy enumberator evaluation' if RUBY_PLATFORM == 'java'
-      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
+  def jruby_lazy_enumerator_workaround?
+    RUBY_PLATFORM == 'java'
   end
 end

data/spec/rspec/features_spec.rb

@@ -81,6 +81,7 @@ xfeature 'if xfeature aliases to pending then' do
   scenario "this should be 'temporarily disabled with xfeature'" do
     # dummy
   end
+
   scenario "this also should be 'temporarily disabled with xfeature'" do
     # dummy
   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,16 +631,20 @@ 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
 
   describe 'have_button matcher' do
     let(:html) { '<button>A button</button><input type="submit" value="Another button"/>' }
 
-    it 'gives proper description' do
-      expect(have_button('A button').description).to eq('have visible button "A button"')
+    it 'gives proper description with no options' do
+      expect(have_button('A button').description).to eq('have visible button "A button" that is not disabled')
+    end
+
+    it 'gives proper description with disabled :any option' do
+      expect(have_button('A button', disabled: :all).description).to eq('have visible button "A button"')
     end
 
     it 'passes if there is such a button' do
@@ -678,12 +694,12 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'treats a given value as a string' do
-      class Foo
+      foo = Class.new do
         def to_s
           'some value'
         end
       end
-      expect(html).to have_field('Text field', with: Foo.new)
+      expect(html).to have_field('Text field', with: foo.new)
     end
 
     it 'supports compounding' do
@@ -698,7 +714,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'gives proper description' do
-      expect(have_checked_field('it is checked').description).to eq('have visible field "it is checked" that is checked and not disabled')
+      expect(have_checked_field('it is checked').description).to eq('have visible field "it is checked" that is not disabled that is checked')
     end
 
     context 'with should' do
@@ -747,7 +763,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'gives proper description' do
-      expect(have_unchecked_field('unchecked field').description).to eq('have visible field "unchecked field" that is not checked and not disabled')
+      expect(have_unchecked_field('unchecked field').description).to eq('have visible field "unchecked field" that is not disabled that is not checked')
     end
 
     context 'with should' do
@@ -824,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
@@ -853,9 +869,9 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
       session.visit('/with_js')
     end
 
-    context '#and' do
+    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
@@ -895,14 +911,14 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
       end
     end
 
-    context '#and_then' do
+    describe '#and_then' do
       it 'should run sequentially' do
         session.click_link('reload-link')
         expect(el).to have_text('waiting to be reloaded').and_then have_text('has been reloaded')
       end
     end
 
-    context '#or' do
+    describe '#or' do
       it "should run 'concurrently'" do
         session.using_wait_time(3) do
           expect(Benchmark.realtime do