capybara 3.8.1 → 3.33.0

data/lib/capybara/spec/session/click_link_or_button_spec.rb

@@ -110,4 +110,20 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
     link = @session.find(:link, 'Blank Anchor')
     expect(@session.click_link_or_button('Blank Anchor')).to eq link
   end
+
+  context 'with enable_aria_label' do
+    it 'should click on link' do
+      @session.visit('/with_html')
+      expect do
+        @session.click_link_or_button('Go to simple', enable_aria_label: true)
+      end.not_to raise_error
+    end
+
+    it 'should click on button' do
+      @session.visit('/form')
+      expect do
+        @session.click_link_or_button('Aria button', enable_aria_label: true)
+      end.not_to raise_error
+    end
+  end
 end

data/lib/capybara/spec/session/click_link_spec.rb

@@ -83,7 +83,7 @@ Capybara::SpecHelper.spec '#click_link' do
     end
 
     it "should raise error if link wasn't found" do
-      expect { @session.click_link('labore', href: 'invalid_href') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.click_link('labore', href: 'invalid_href') }.to raise_error(Capybara::ElementNotFound, /with href "invalid_href/)
     end
   end
 
@@ -104,8 +104,8 @@ Capybara::SpecHelper.spec '#click_link' do
     end
 
     it "should raise an error if no link's href matched the pattern" do
-      expect { @session.click_link('labore', href: /invalid_pattern/) }.to raise_error(Capybara::ElementNotFound)
-      expect { @session.click_link('labore', href: /.+d+/) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.click_link('labore', href: /invalid_pattern/) }.to raise_error(Capybara::ElementNotFound, %r{with href matching /invalid_pattern/})
+      expect { @session.click_link('labore', href: /.+d+/) }.to raise_error(Capybara::ElementNotFound, /#{Regexp.quote "with href matching /.+d+/"}/)
     end
 
     context 'href: nil' do
@@ -114,8 +114,19 @@ Capybara::SpecHelper.spec '#click_link' do
       end
 
       it 'should raise an error if href attribute exists' do
-        expect { @session.click_link('Blank Href', href: nil) }.to raise_error(Capybara::ElementNotFound)
-        expect { @session.click_link('Normal Anchor', href: nil) }.to raise_error(Capybara::ElementNotFound)
+        expect { @session.click_link('Blank Href', href: nil) }.to raise_error(Capybara::ElementNotFound, /with no href attribute/)
+        expect { @session.click_link('Normal Anchor', href: nil) }.to raise_error(Capybara::ElementNotFound, /with no href attribute/)
+      end
+    end
+
+    context 'href: false' do
+      it 'should not raise an error on links with no href attribute' do
+        expect { @session.click_link('No Href', href: false) }.not_to raise_error
+      end
+
+      it 'should not raise an error if href attribute exists' do
+        expect { @session.click_link('Blank Href', href: false) }.not_to raise_error
+        expect { @session.click_link('Normal Anchor', href: false) }.not_to raise_error
       end
     end
   end
@@ -211,7 +222,7 @@ Capybara::SpecHelper.spec '#click_link' do
     download_file = File.join(Capybara.save_path, 'download.csv')
     expect(File).not_to exist(download_file)
     @session.click_link('Download Me')
-    sleep 2
+    sleep 2 # allow time for file to download
     expect(File).to exist(download_file)
     FileUtils.rm_rf download_file
   end

data/lib/capybara/spec/session/element/matches_selector_spec.rb

@@ -1,31 +1,32 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#match_selector?' do
+  let(:element) { @session.find(:xpath, '//span', text: '42') }
+
   before do
     @session.visit('/with_html')
-    @element = @session.find('//span', text: '42')
   end
 
   it 'should be true if the element matches the given selector' do
-    expect(@element).to match_selector(:xpath, '//span')
-    expect(@element).to match_selector(:css, 'span.number')
-    expect(@element.matches_selector?(:css, 'span.number')).to be true
+    expect(element).to match_selector(:xpath, '//span')
+    expect(element).to match_selector(:css, 'span.number')
+    expect(element.matches_selector?(:css, 'span.number')).to be true
   end
 
   it 'should be false if the element does not match the given selector' do
-    expect(@element).not_to match_selector(:xpath, '//div')
-    expect(@element).not_to match_selector(:css, 'span.not_a_number')
-    expect(@element.matches_selector?(:css, 'span.not_a_number')).to be false
+    expect(element).not_to match_selector(:xpath, '//div')
+    expect(element).not_to match_selector(:css, 'span.not_a_number')
+    expect(element.matches_selector?(:css, 'span.not_a_number')).to be false
   end
 
   it 'should use default selector' do
     Capybara.default_selector = :css
-    expect(@element).not_to match_selector('span.not_a_number')
-    expect(@element).to match_selector('span.number')
+    expect(element).not_to match_selector('span.not_a_number')
+    expect(element).to match_selector('span.number')
   end
 
   it 'should work with elements located via a sibling selector' do
-    sibling = @element.sibling(:css, 'span', text: 'Other span')
+    sibling = element.sibling(:css, 'span', text: 'Other span')
     expect(sibling).to match_selector(:xpath, '//span')
     expect(sibling).to match_selector(:css, 'span')
   end
@@ -37,23 +38,23 @@ Capybara::SpecHelper.spec '#match_selector?' do
 
   context 'with text' do
     it 'should discard all matches where the given string is not contained' do
-      expect(@element).to match_selector('//span', text: '42')
-      expect(@element).not_to match_selector('//span', text: 'Doesnotexist')
+      expect(element).to match_selector('//span', text: '42')
+      expect(element).not_to match_selector('//span', text: 'Doesnotexist')
     end
   end
 
   it 'should have css sugar' do
-    expect(@element.matches_css?('span.number')).to be true
-    expect(@element.matches_css?('span.not_a_number')).to be false
-    expect(@element.matches_css?('span.number', text: '42')).to be true
-    expect(@element.matches_css?('span.number', text: 'Nope')).to be false
+    expect(element.matches_css?('span.number')).to be true
+    expect(element.matches_css?('span.not_a_number')).to be false
+    expect(element.matches_css?('span.number', text: '42')).to be true
+    expect(element.matches_css?('span.number', text: 'Nope')).to be false
   end
 
   it 'should have xpath sugar' do
-    expect(@element.matches_xpath?('//span')).to be true
-    expect(@element.matches_xpath?('//div')).to be false
-    expect(@element.matches_xpath?('//span', text: '42')).to be true
-    expect(@element.matches_xpath?('//span', text: 'Nope')).to be false
+    expect(element.matches_xpath?('//span')).to be true
+    expect(element.matches_xpath?('//div')).to be false
+    expect(element.matches_xpath?('//span', text: '42')).to be true
+    expect(element.matches_xpath?('//span', text: 'Nope')).to be false
   end
 
   it 'should accept selector filters' do
@@ -73,47 +74,47 @@ Capybara::SpecHelper.spec '#match_selector?' do
 end
 
 Capybara::SpecHelper.spec '#not_matches_selector?' do
+  let(:element) { @session.find(:css, 'span', text: 42) }
   before do
     @session.visit('/with_html')
-    @element = @session.find(:css, 'span', text: 42)
   end
 
   it 'should be false if the given selector matches the element' do
-    expect(@element).not_to not_match_selector(:xpath, '//span')
-    expect(@element).not_to not_match_selector(:css, 'span.number')
-    expect(@element.not_matches_selector?(:css, 'span.number')).to be false
+    expect(element).not_to not_match_selector(:xpath, '//span')
+    expect(element).not_to not_match_selector(:css, 'span.number')
+    expect(element.not_matches_selector?(:css, 'span.number')).to be false
   end
 
   it 'should be true if the given selector does not match the element' do
-    expect(@element).to not_match_selector(:xpath, '//abbr')
-    expect(@element).to not_match_selector(:css, 'p a#doesnotexist')
-    expect(@element.not_matches_selector?(:css, 'p a#doesnotexist')).to be true
+    expect(element).to not_match_selector(:xpath, '//abbr')
+    expect(element).to not_match_selector(:css, 'p a#doesnotexist')
+    expect(element.not_matches_selector?(:css, 'p a#doesnotexist')).to be true
   end
 
   it 'should use default selector' do
     Capybara.default_selector = :css
-    expect(@element).to not_match_selector('p a#doesnotexist')
-    expect(@element).not_to not_match_selector('span.number')
+    expect(element).to not_match_selector('p a#doesnotexist')
+    expect(element).not_to not_match_selector('span.number')
   end
 
   context 'with text' do
     it 'should discard all matches where the given string is contained' do
-      expect(@element).not_to not_match_selector(:css, 'span.number', text: '42')
-      expect(@element).to not_match_selector(:css, 'span.number', text: 'Doesnotexist')
+      expect(element).not_to not_match_selector(:css, 'span.number', text: '42')
+      expect(element).to not_match_selector(:css, 'span.number', text: 'Doesnotexist')
     end
   end
 
   it 'should have CSS sugar' do
-    expect(@element.not_matches_css?('span.number')).to be false
-    expect(@element.not_matches_css?('p a#doesnotexist')).to be true
-    expect(@element.not_matches_css?('span.number', text: '42')).to be false
-    expect(@element.not_matches_css?('span.number', text: 'Doesnotexist')).to be true
+    expect(element.not_matches_css?('span.number')).to be false
+    expect(element.not_matches_css?('p a#doesnotexist')).to be true
+    expect(element.not_matches_css?('span.number', text: '42')).to be false
+    expect(element.not_matches_css?('span.number', text: 'Doesnotexist')).to be true
   end
 
   it 'should have xpath sugar' do
-    expect(@element.not_matches_xpath?('//span')).to be false
-    expect(@element.not_matches_xpath?('//div')).to be true
-    expect(@element.not_matches_xpath?('//span', text: '42')).to be false
-    expect(@element.not_matches_xpath?('//span', text: 'Doesnotexist')).to be true
+    expect(element.not_matches_xpath?('//span')).to be false
+    expect(element.not_matches_xpath?('//div')).to be true
+    expect(element.not_matches_xpath?('//span', text: '42')).to be false
+    expect(element.not_matches_xpath?('//span', text: 'Doesnotexist')).to be true
   end
 end

data/lib/capybara/spec/session/evaluate_script_spec.rb

@@ -15,6 +15,7 @@ Capybara::SpecHelper.spec '#evaluate_script', requires: [:js] do
 
   it 'should pass arguments to the script', requires: %i[js es_args] do
     @session.visit('/with_js')
+    expect(@session).to have_css('#change')
     @session.evaluate_script("document.getElementById('change').textContent = arguments[0]", 'Doodle Funk')
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end
@@ -33,4 +34,16 @@ Capybara::SpecHelper.spec '#evaluate_script', requires: [:js] do
     expect(el).to be_instance_of(Capybara::Node::Element)
     expect(el).to eq(@session.find(:css, '#change'))
   end
+
+  it 'should support multi statement via IIFE' do
+    @session.visit('/with_js')
+    @session.find(:css, '#change')
+    el = @session.evaluate_script(<<~JS)
+      (function(){
+        var el = document.getElementById('change');
+        return el;
+      })()
+    JS
+    expect(el).to eq(@session.find(:css, '#change'))
+  end
 end

data/lib/capybara/spec/session/execute_script_spec.rb

@@ -14,6 +14,7 @@ Capybara::SpecHelper.spec '#execute_script', requires: [:js] do
 
   it 'should pass arguments to the script', requires: %i[js es_args] do
     @session.visit('/with_js')
+    expect(@session).to have_css('#change')
     @session.execute_script("document.getElementById('change').textContent = arguments[0]", 'Doodle Funk')
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end

data/lib/capybara/spec/session/fill_in_spec.rb

@@ -47,6 +47,15 @@ Capybara::SpecHelper.spec '#fill_in' do
     expect(extract_results(@session)['description']).to eq('Texty text')
   end
 
+  it 'should fill in a textarea in a reasonable time by default' do
+    textarea = @session.find(:fillable_field, 'form[description]')
+    value = 'a' * 4000
+    start = Time.now
+    textarea.fill_in(with: value)
+    expect(Time.now.to_f).to be_within(0.25).of start.to_f
+    expect(textarea.value).to eq value
+  end
+
   it 'should fill in a password field by id' do
     @session.fill_in('form_password', with: 'supasikrit')
     @session.click_button('awesome')
@@ -89,6 +98,32 @@ Capybara::SpecHelper.spec '#fill_in' do
     expect(extract_results(@session)['description']).to eq("\r\nSome text\r\n")
   end
 
+  it 'should fill in a color field' do
+    @session.fill_in('Html5 Color', with: '#112233')
+    @session.click_button('html5_submit')
+    expect(extract_results(@session)['html5_color']).to eq('#112233')
+  end
+
+  describe 'with input[type="range"]' do
+    it 'should set the range slider correctly' do
+      @session.fill_in('form_age', with: 51)
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 51
+    end
+
+    it 'should set the range slider to valid values' do
+      @session.fill_in('form_age', with: '37.6')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 37.5
+    end
+
+    it 'should respect the range slider limits' do
+      @session.fill_in('form_age', with: '3')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 13
+    end
+  end
+
   it 'should fill in a field with a custom type' do
     @session.fill_in('Schmooo', with: 'Schmooo is the game')
     @session.click_button('awesome')
@@ -126,7 +161,7 @@ Capybara::SpecHelper.spec '#fill_in' do
   end
 
   it 'should fill in a field based on current value' do
-    @session.fill_in(currently_with: 'John', with: 'Thomas')
+    @session.fill_in(id: /form.*name/, currently_with: 'John', with: 'Thomas')
     @session.click_button('awesome')
     expect(extract_results(@session)['first_name']).to eq('Thomas')
   end
@@ -178,10 +213,10 @@ Capybara::SpecHelper.spec '#fill_in' do
     it 'should only trigger onchange once' do
       @session.visit('/with_js')
       # Click somewhere on the page to ensure focus is acquired. Without this FF won't generate change events for some reason???
-      @session.find(:css, 'body').click
+      @session.find(:css, 'h1', text: 'FooBar').click
       @session.fill_in('with_change_event', with: 'some value')
       # click outside the field to trigger the change event
-      @session.find(:css, 'body').click
+      @session.find(:css, 'h1', text: 'FooBar').click
       expect(@session.find(:css, '.change_event_triggered', match: :one)).to have_text 'some value'
     end
 
@@ -189,7 +224,7 @@ Capybara::SpecHelper.spec '#fill_in' do
       @session.visit('/with_js')
       @session.fill_in('with_change_event', with: '')
       # click outside the field to trigger the change event
-      @session.find(:css, 'body').click
+      @session.find(:css, 'h1', text: 'FooBar').click
       expect(@session).to have_selector(:css, '.change_event_triggered', match: :one)
     end
   end
@@ -200,7 +235,7 @@ Capybara::SpecHelper.spec '#fill_in' do
     after  { Capybara.ignore_hidden_elements = false }
 
     it 'should not find a hidden field' do
-      msg = 'Unable to find visible field "Super Secret"'
+      msg = /Unable to find visible field "Super Secret"/
       expect do
         @session.fill_in('Super Secret', with: '777')
       end.to raise_error(Capybara::ElementNotFound, msg)
@@ -209,7 +244,7 @@ Capybara::SpecHelper.spec '#fill_in' do
 
   context "with a locator that doesn't exist" do
     it 'should raise an error' do
-      msg = 'Unable to find field "does not exist"'
+      msg = /Unable to find field "does not exist"/
       expect do
         @session.fill_in('does not exist', with: 'Blah blah')
       end.to raise_error(Capybara::ElementNotFound, msg)
@@ -242,4 +277,10 @@ Capybara::SpecHelper.spec '#fill_in' do
     el = @session.find(:fillable_field, 'form_first_name')
     expect(@session.fill_in('form_first_name', with: 'Harry')).to eq el
   end
+
+  it 'should warn if passed what looks like a CSS id selector' do
+    expect do
+      @session.fill_in('#form_first_name', with: 'Harry')
+    end.to raise_error(/you may be passing a CSS selector or XPath expression rather than a locator/)
+  end
 end

data/lib/capybara/spec/session/find_field_spec.rb

@@ -102,7 +102,7 @@ Capybara::SpecHelper.spec '#find_field' do
 
   context 'with no locator' do
     it 'should use options to find the field' do
-      expect(@session.find_field(with: 'dog')['id']).to eq 'form_pets_dog'
+      expect(@session.find_field(type: 'checkbox', with: 'dog')['id']).to eq 'form_pets_dog'
     end
   end
 

data/lib/capybara/spec/session/find_spec.rb

@@ -92,6 +92,12 @@ Capybara::SpecHelper.spec '#find' do
       expect(@session.find(:css, '#\31 escape\.me').text).to eq('needs escaping')
       expect(@session.find(:css, '.\32 escape').text).to eq('needs escaping')
     end
+
+    it 'should not warn about locator' do
+      expect { @session.find(:css, '#not_on_page') }.to raise_error Capybara::ElementNotFound do |e|
+        expect(e.message).not_to match(/you may be passing a CSS selector or XPath expression/)
+      end
+    end
   end
 
   context 'with xpath selectors' do
@@ -99,6 +105,11 @@ Capybara::SpecHelper.spec '#find' do
       expect(@session.find(:xpath, '//h1').text).to eq('This is a test')
       expect(@session.find(:xpath, "//input[@id='test_field']").value).to eq('monkey')
     end
+
+    it 'should warn if passed a non-valid locator type' do
+      expect { @session.find(:xpath, 123) }.to raise_error(Exception) # The exact error is not yet well defined
+        .and output(/must respond to to_xpath or be an instance of String/).to_stderr
+    end
   end
 
   context 'with custom selector' do
@@ -224,7 +235,7 @@ Capybara::SpecHelper.spec '#find' do
 
   it 'should accept an XPath instance' do
     @session.visit('/form')
-    @xpath = Capybara::Selector.all[:fillable_field].call('First Name')
+    @xpath = Capybara::Selector.new(:fillable_field, config: {}, format: :xpath).call('First Name')
     expect(@xpath).to be_a(::XPath::Union)
     expect(@session.find(@xpath).value).to eq('John')
   end
@@ -252,9 +263,8 @@ Capybara::SpecHelper.spec '#find' do
     end
 
     it 'warns when the option has no effect' do
-      expect_any_instance_of(Kernel).to receive(:warn)
-        .with('The :exact option only has an effect on queries using the XPath#is method. Using it with the query "#test_field" has no effect.')
-      @session.find(:css, '#test_field', exact: true)
+      expect { @session.find(:css, '#test_field', exact: true) }.to \
+        output(/^The :exact option only has an effect on queries using the XPath#is method. Using it with the query "#test_field" has no effect/).to_stderr
     end
   end
 
@@ -265,14 +275,17 @@ Capybara::SpecHelper.spec '#find' do
           @session.find(:css, '.multiple', match: :one)
         end.to raise_error(Capybara::Ambiguous)
       end
+
       it 'raises an error even if there the match is exact and the others are inexact' do
         expect do
           @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular')], exact: false, match: :one)
         end.to raise_error(Capybara::Ambiguous)
       end
+
       it 'returns the element if there is only one' do
         expect(@session.find(:css, '.singular', match: :one).text).to eq('singular')
       end
+
       it 'raises an error if there is no match' do
         expect do
           @session.find(:css, '.does-not-exist', match: :one)
@@ -284,6 +297,7 @@ Capybara::SpecHelper.spec '#find' do
       it 'returns the first matched element' do
         expect(@session.find(:css, '.multiple', match: :first).text).to eq('multiple one')
       end
+
       it 'raises an error if there is no match' do
         expect do
           @session.find(:css, '.does-not-exist', match: :first)
@@ -298,19 +312,23 @@ Capybara::SpecHelper.spec '#find' do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('multiple')], match: :smart, exact: false)
           end.to raise_error(Capybara::Ambiguous)
         end
+
         it 'finds a single exact match when there also are inexact matches' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular')], match: :smart, exact: false)
           expect(result.text).to eq('almost singular')
         end
+
         it 'raises an error when there are multiple inexact matches' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singul')], match: :smart, exact: false)
           end.to raise_error(Capybara::Ambiguous)
         end
+
         it 'finds a single inexact match' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular but')], match: :smart, exact: false)
           expect(result.text).to eq('almost singular but not quite')
         end
+
         it 'raises an error if there is no match' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('does-not-exist')], match: :smart, exact: false)
@@ -324,20 +342,24 @@ Capybara::SpecHelper.spec '#find' do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('multiple')], match: :smart, exact: true)
           end.to raise_error(Capybara::Ambiguous)
         end
+
         it 'finds a single exact match when there also are inexact matches' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular')], match: :smart, exact: true)
           expect(result.text).to eq('almost singular')
         end
+
         it 'raises an error when there are multiple inexact matches' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singul')], match: :smart, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
+
         it 'raises an error when there is a single inexact matches' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular but')], match: :smart, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
+
         it 'raises an error if there is no match' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('does-not-exist')], match: :smart, exact: true)
@@ -352,18 +374,22 @@ Capybara::SpecHelper.spec '#find' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('multiple')], match: :prefer_exact, exact: false)
           expect(result.text).to eq('multiple one')
         end
+
         it 'finds a single exact match when there also are inexact matches' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular')], match: :prefer_exact, exact: false)
           expect(result.text).to eq('almost singular')
         end
+
         it 'picks the first one when there are multiple inexact matches' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singul')], match: :prefer_exact, exact: false)
           expect(result.text).to eq('almost singular but not quite')
         end
+
         it 'finds a single inexact match' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular but')], match: :prefer_exact, exact: false)
           expect(result.text).to eq('almost singular but not quite')
         end
+
         it 'raises an error if there is no match' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('does-not-exist')], match: :prefer_exact, exact: false)
@@ -376,20 +402,24 @@ Capybara::SpecHelper.spec '#find' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('multiple')], match: :prefer_exact, exact: true)
           expect(result.text).to eq('multiple one')
         end
+
         it 'finds a single exact match when there also are inexact matches' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular')], match: :prefer_exact, exact: true)
           expect(result.text).to eq('almost singular')
         end
+
         it 'raises an error if there are multiple inexact matches' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singul')], match: :prefer_exact, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
+
         it 'raises an error if there is a single inexact match' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular but')], match: :prefer_exact, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
+
         it 'raises an error if there is no match' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('does-not-exist')], match: :prefer_exact, exact: true)
@@ -418,6 +448,41 @@ Capybara::SpecHelper.spec '#find' do
     expect(@session.find(:css, 'input', &:disabled?)[:name]).to eq('disabled_text')
   end
 
+  context 'with spatial filters', requires: [:spatial] do
+    before do
+      @session.visit('/spatial')
+    end
+
+    let :center do
+      @session.find(:css, 'div.center')
+    end
+
+    it 'should find an element above another element' do
+      expect(@session.find(:css, 'div:not(.corner)', above: center).text).to eq('2')
+    end
+
+    it 'should find an element below another element' do
+      expect(@session.find(:css, 'div:not(.corner):not(.footer)', below: center).text).to eq('8')
+    end
+
+    it 'should find an element left of another element' do
+      expect(@session.find(:css, 'div:not(.corner)', left_of: center).text).to eq('4')
+    end
+
+    it 'should find an element right of another element' do
+      expect(@session.find(:css, 'div:not(.corner)', right_of: center).text).to eq('6')
+    end
+
+    it 'should combine spatial filters' do
+      expect(@session.find(:css, 'div', left_of: center, above: center).text).to eq('1')
+      expect(@session.find(:css, 'div', right_of: center, below: center).text).to eq('9')
+    end
+
+    it 'should find an element "near" another element' do
+      expect(@session.find(:css, 'div.distance', near: center).text).to eq('2')
+    end
+  end
+
   context 'within a scope' do
     before do
       @session.visit('/with_scope')
@@ -457,5 +522,10 @@ Capybara::SpecHelper.spec '#find' do
       Capybara.test_id = 'data-other-test-id'
       expect(@session.find(:field, 'test_id')[:id]).to eq 'normal'
     end
+
+    it 'should find a link with the test_id' do
+      Capybara.test_id = 'data-test-id'
+      expect(@session.find(:link, 'test-foo')[:id]).to eq 'foo'
+    end
   end
 end

data/lib/capybara/spec/session/first_spec.rb

@@ -24,7 +24,7 @@ Capybara::SpecHelper.spec '#first' do
 
   it 'should accept an XPath instance' do
     @session.visit('/form')
-    @xpath = Capybara::Selector.all[:fillable_field].call('First Name')
+    @xpath = Capybara::Selector.new(:fillable_field, config: {}, format: :xpath).call('First Name')
     expect(@xpath).to be_a(::XPath::Union)
     expect(@session.first(@xpath).value).to eq('John')
   end

data/lib/capybara/spec/session/frame/switch_to_frame_spec.rb

@@ -53,8 +53,20 @@ Capybara::SpecHelper.spec '#switch_to_frame', requires: [:frames] do
     @session.switch_to_frame frame
     frame = @session.find(:frame, 'childFrame')
     @session.switch_to_frame frame
+    @session.click_link 'Close Window Now'
+    @session.switch_to_frame :parent # Go back to parentFrame
+    expect(@session).to have_selector(:css, 'body#parentBody')
+    expect(@session).not_to have_selector(:css, '#childFrame')
+    @session.switch_to_frame :parent # Go back to top
+  end
 
-    @session.click_link 'Close Window'
+  it 'works if the frame is closed with a slight delay', requires: %i[frames js] do
+    frame = @session.find(:frame, 'parentFrame')
+    @session.switch_to_frame frame
+    frame = @session.find(:frame, 'childFrame')
+    @session.switch_to_frame frame
+    @session.click_link 'Close Window Soon'
+    sleep 1
     @session.switch_to_frame :parent # Go back to parentFrame
     expect(@session).to have_selector(:css, 'body#parentBody')
     expect(@session).not_to have_selector(:css, '#childFrame')

data/lib/capybara/spec/session/frame/within_frame_spec.rb

@@ -92,7 +92,18 @@ Capybara::SpecHelper.spec '#within_frame', requires: [:frames] do
   it 'works if the frame is closed', requires: %i[frames js] do
     @session.within_frame 'parentFrame' do
       @session.within_frame 'childFrame' do
-        @session.click_link 'Close Window'
+        @session.click_link 'Close Window Now'
+      end
+      expect(@session).to have_selector(:css, 'body#parentBody')
+      expect(@session).not_to have_selector(:css, '#childFrame')
+    end
+  end
+
+  it 'works if the frame is closed with a slight delay', requires: %i[frames js] do
+    @session.within_frame 'parentFrame' do
+      @session.within_frame 'childFrame' do
+        @session.click_link 'Close Window Soon'
+        sleep 1
       end
       expect(@session).to have_selector(:css, 'body#parentBody')
       expect(@session).not_to have_selector(:css, '#childFrame')

data/lib/capybara/spec/session/has_all_selectors_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Capybara::SpecHelper.spec '#have_all_selectors' do
+Capybara::SpecHelper.spec '#have_all_of_selectors' do
   before do
     @session.visit('/with_html')
   end