capybara 3.35.3 → 3.38.0

data/lib/capybara/server/middleware.rb

@@ -14,7 +14,7 @@ module Capybara
         end
 
         def decrement(uri)
-          @mutex.synchronize { @value.delete_at(@value.index(uri) || @value.length) }
+          @mutex.synchronize { @value.delete_at(@value.index(uri) || - 1) }
         end
 
         def positive?

data/lib/capybara/session/config.rb

@@ -8,7 +8,7 @@ module Capybara
                  automatic_reload match exact exact_text raise_server_errors visible_text_only
                  automatic_label_click enable_aria_label save_path asset_host default_host app_host
                  server_host server_port server_errors default_set_options disable_animation test_id
-                 predicates_wait default_normalize_ws w3c_click_offset enable_aria_role].freeze
+                 predicates_wait default_normalize_ws w3c_click_offset enable_aria_role default_retry_interval].freeze
 
     attr_accessor(*OPTIONS)
 
@@ -21,6 +21,8 @@ module Capybara
     #   See {Capybara.configure}
     # @!method default_max_wait_time
     #   See {Capybara.configure}
+    # @!method default_retry_interval
+    #   See {Capybara.configure}
     # @!method ignore_hidden_elements
     #   See {Capybara.configure}
     # @!method automatic_reload
@@ -100,7 +102,7 @@ module Capybara
     remove_method :test_id=
     ##
     #
-    # Set an attribue to be optionally matched against the locator for builtin selector types.
+    # Set an attribute to be optionally matched against the locator for builtin selector types.
     # This attribute will be checked by builtin selector types whenever id would normally be checked.
     # If `nil` then it will be ignored.
     #

data/lib/capybara/session.rb

@@ -40,6 +40,7 @@ module Capybara
 
     NODE_METHODS = %i[
       all first attach_file text check choose scroll_to scroll_by
+      click double_click right_click
       click_link_or_button click_button click_link
       fill_in find find_all find_button find_by_id find_field find_link
       has_content? has_text? has_css? has_no_content? has_no_text?
@@ -58,7 +59,7 @@ module Capybara
     ].freeze
     SESSION_METHODS = %i[
       body html source current_url current_host current_path
-      execute_script evaluate_script visit refresh go_back go_forward send_keys
+      execute_script evaluate_script evaluate_async_script visit refresh go_back go_forward send_keys
       within within_element within_fieldset within_table within_frame switch_to_frame
       current_window windows open_new_window switch_to_window within_window window_opened_by
       save_page save_and_open_page save_screenshot
@@ -129,6 +130,8 @@ module Capybara
       if @touched
         driver.reset!
         @touched = false
+        switch_to_frame(:top) rescue nil # rubocop:disable Style/RescueModifier
+        @scopes = [nil]
       end
       @server&.wait_for_pending_requests
       raise_server_error!
@@ -159,9 +162,8 @@ module Capybara
         if config.raise_server_errors
           raise CapybaraError, 'Your application server raised an error - It has been raised in your test code because Capybara.raise_server_errors == true'
         end
-      rescue CapybaraError
-        # needed to get the cause set correctly in JRuby -- otherwise we could just do raise @server.error
-        raise @server.error, @server.error.message, @server.error.backtrace
+      rescue CapybaraError => capy_error # rubocop:disable Naming/RescuedExceptionsVariableName
+        raise @server.error, cause: capy_error
       ensure
         @server.reset_error!
       end
@@ -311,6 +313,16 @@ module Capybara
       driver.send_keys(*args, **kw_args)
     end
 
+    ##
+    #
+    # Returns the element with focus.
+    #
+    # Not supported by Rack Test
+    #
+    def active_element
+      Capybara::Queries::ActiveElementQuery.new.resolve_for(self)[0].tap(&:allow_reload!)
+    end
+
     ##
     #
     # Executes the given block within the context of a node. {#within} takes the
@@ -350,7 +362,7 @@ module Capybara
       new_scope = args.first.respond_to?(:to_capybara_node) ? args.first.to_capybara_node : find(*args, **kw_args)
       begin
         scopes.push(new_scope)
-        yield if block_given?
+        yield new_scope if block_given?
       ensure
         scopes.pop
       end
@@ -399,7 +411,7 @@ module Capybara
         scopes.push(:frame)
       when :parent
         if scopes.last != :frame
-          raise Capybara::ScopeError, "`switch_to_frame(:parent)` cannot be called from inside a descendant frame's "\
+          raise Capybara::ScopeError, "`switch_to_frame(:parent)` cannot be called from inside a descendant frame's " \
                                       '`within` block.'
         end
         scopes.pop
@@ -408,11 +420,11 @@ module Capybara
         idx = scopes.index(:frame)
         top_level_scopes = [:frame, nil]
         if idx
-          if scopes.slice(idx..-1).any? { |scope| !top_level_scopes.include?(scope) }
-            raise Capybara::ScopeError, "`switch_to_frame(:top)` cannot be called from inside a descendant frame's "\
+          if scopes.slice(idx..).any? { |scope| !top_level_scopes.include?(scope) }
+            raise Capybara::ScopeError, "`switch_to_frame(:top)` cannot be called from inside a descendant frame's " \
                                         '`within` block.'
           end
-          scopes.slice!(idx..-1)
+          scopes.slice!(idx..)
           driver.switch_to_frame(:top)
         end
       else
@@ -501,7 +513,7 @@ module Capybara
       raise ArgumentError, '`switch_to_window`: either window or block should be provided' if !window && !window_locator
 
       unless scopes.last.nil?
-        raise Capybara::ScopeError, '`switch_to_window` is not supposed to be invoked from '\
+        raise Capybara::ScopeError, '`switch_to_window` is not supposed to be invoked from ' \
                                     '`within` or `within_frame` blocks.'
       end
 
@@ -572,7 +584,7 @@ module Capybara
       synchronize_windows(options) do
         opened_handles = (driver.window_handles - old_handles)
         if opened_handles.size != 1
-          raise Capybara::WindowError, 'block passed to #window_opened_by '\
+          raise Capybara::WindowError, 'block passed to #window_opened_by ' \
                                        "opened #{opened_handles.size} windows instead of 1"
         end
         Window.new(self, opened_handles.first)
@@ -755,33 +767,20 @@ module Capybara
     end
 
     NODE_METHODS.each do |method|
-      if RUBY_VERSION >= '2.7'
-        class_eval <<~METHOD, __FILE__, __LINE__ + 1
-          def #{method}(...)
-            @touched = true
-            current_scope.#{method}(...)
-          end
-        METHOD
-      else
-        define_method method do |*args, &block|
+      class_eval <<~METHOD, __FILE__, __LINE__ + 1
+        def #{method}(...)
           @touched = true
-          current_scope.send(method, *args, &block)
+          current_scope.#{method}(...)
         end
-      end
+      METHOD
     end
 
     DOCUMENT_METHODS.each do |method|
-      if RUBY_VERSION >= '2.7'
-        class_eval <<~METHOD, __FILE__, __LINE__ + 1
-          def #{method}(...)
-            document.#{method}(...)
-          end
-        METHOD
-      else
-        define_method method do |*args, &block|
-          document.send(method, *args, &block)
+      class_eval <<~METHOD, __FILE__, __LINE__ + 1
+        def #{method}(...)
+          document.#{method}(...)
         end
-      end
+      METHOD
     end
 
     def inspect

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+Capybara::SpecHelper.spec '#active_element', requires: [:active_element] do
+  it 'should return the active element' do
+    @session.visit('/form')
+    @session.send_keys(:tab)
+
+    expect(@session.active_element).to match_selector(:css, '[tabindex="1"]')
+
+    @session.send_keys(:tab)
+
+    expect(@session.active_element).to match_selector(:css, '[tabindex="2"]')
+  end
+
+  it 'should support reloading' do
+    @session.visit('/form')
+    expect(@session.active_element).to match_selector(:css, 'body')
+    @session.execute_script <<-JS
+      window.setTimeout(() => {
+        document.querySelector('#form_title').focus();
+      }, 1000)
+    JS
+    expect(@session.active_element).to match_selector(:css, 'body', wait: false)
+    expect(@session.active_element).to match_selector(:css, '#form_title', wait: 2)
+  end
+
+  it 'should return a Capybara::Element' do
+    @session.visit('/form')
+    expect(@session.active_element).to be_a Capybara::Node::Element
+  end
+end

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

@@ -132,7 +132,7 @@ Capybara::SpecHelper.spec '#all' do
       it 'should use the sessions ignore_hidden_elements', psc: true do
         Capybara.ignore_hidden_elements = true
         @session.config.ignore_hidden_elements = false
-        expect(Capybara.ignore_hidden_elements).to eq(true)
+        expect(Capybara.ignore_hidden_elements).to be(true)
         expect(@session.all(:css, 'a.simple').size).to eq(2)
         @session.config.ignore_hidden_elements = true
         expect(@session.all(:css, 'a.simple').size).to eq(1)
@@ -203,19 +203,15 @@ Capybara::SpecHelper.spec '#all' do
         expect { @session.all(:css, 'h1, p', between: 0..3) }.to raise_error(Capybara::ExpectationNotMet)
       end
 
-      eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.5
-        it'treats an endless range as minimum' do
-          expect { @session.all(:css, 'h1, p', between: 2..) }.not_to raise_error
-          expect { @session.all(:css, 'h1, p', between: 5..) }.to raise_error(Capybara::ExpectationNotMet)
-        end
-      TEST
+      it 'treats an endless range as minimum' do
+        expect { @session.all(:css, 'h1, p', between: 2..) }.not_to raise_error
+        expect { @session.all(:css, 'h1, p', between: 5..) }.to raise_error(Capybara::ExpectationNotMet)
+      end
 
-      eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.6
-        it'treats a beginless range as maximum' do
-          expect { @session.all(:css, 'h1, p', between: ..7) }.not_to raise_error
-          expect { @session.all(:css, 'h1, p', between: ..3) }.to raise_error(Capybara::ExpectationNotMet)
-        end
-      TEST
+      it 'treats a beginless range as maximum' do
+        expect { @session.all(:css, 'h1, p', between: ..7) }.not_to raise_error
+        expect { @session.all(:css, 'h1, p', between: ..3) }.to raise_error(Capybara::ExpectationNotMet)
+      end
     end
 
     context 'with multiple count filters' do

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

@@ -3,16 +3,16 @@
 Capybara::SpecHelper.spec '#assert_text' do
   it 'should be true if the given text is on the page' do
     @session.visit('/with_html')
-    expect(@session.assert_text('est')).to eq(true)
-    expect(@session.assert_text('Lorem')).to eq(true)
-    expect(@session.assert_text('Redirect')).to eq(true)
-    expect(@session.assert_text(:Redirect)).to eq(true)
-    expect(@session.assert_text('text with   whitespace')).to eq(true)
+    expect(@session.assert_text('est')).to be(true)
+    expect(@session.assert_text('Lorem')).to be(true)
+    expect(@session.assert_text('Redirect')).to be(true)
+    expect(@session.assert_text(:Redirect)).to be(true)
+    expect(@session.assert_text('text with   whitespace')).to be(true)
   end
 
   it 'should support collapsing whitespace' do
     @session.visit('/with_html')
-    expect(@session.assert_text('text with whitespace', normalize_ws: true)).to eq(true)
+    expect(@session.assert_text('text with whitespace', normalize_ws: true)).to be(true)
   end
 
   context 'with enabled default collapsing whitespace' do
@@ -20,19 +20,19 @@ Capybara::SpecHelper.spec '#assert_text' do
 
     it 'should be true if the given unnormalized text is on the page' do
       @session.visit('/with_html')
-      expect(@session.assert_text('text with   whitespace', normalize_ws: false)).to eq(true)
+      expect(@session.assert_text('text with   whitespace', normalize_ws: false)).to be(true)
     end
 
     it 'should support collapsing whitespace' do
       @session.visit('/with_html')
-      expect(@session.assert_text('text with whitespace')).to eq(true)
+      expect(@session.assert_text('text with whitespace')).to be(true)
     end
   end
 
   it 'should take scopes into account' do
     @session.visit('/with_html')
     @session.within("//a[@title='awesome title']") do
-      expect(@session.assert_text('labore')).to eq(true)
+      expect(@session.assert_text('labore')).to be(true)
     end
   end
 
@@ -47,13 +47,13 @@ Capybara::SpecHelper.spec '#assert_text' do
 
   it 'should be true if :all given and text is invisible.' do
     @session.visit('/with_html')
-    expect(@session.assert_text(:all, 'Some of this text is hidden!')).to eq(true)
+    expect(@session.assert_text(:all, 'Some of this text is hidden!')).to be(true)
   end
 
   it 'should be true if `Capybara.ignore_hidden_elements = true` and text is invisible.' do
     Capybara.ignore_hidden_elements = false
     @session.visit('/with_html')
-    expect(@session.assert_text('Some of this text is hidden!')).to eq(true)
+    expect(@session.assert_text('Some of this text is hidden!')).to be(true)
   end
 
   it 'should raise error with a helpful message if the requested text is present but invisible' do
@@ -88,7 +88,7 @@ Capybara::SpecHelper.spec '#assert_text' do
 
   it 'should be true if the text in the page matches given regexp' do
     @session.visit('/with_html')
-    expect(@session.assert_text(/Lorem/)).to eq(true)
+    expect(@session.assert_text(/Lorem/)).to be(true)
   end
 
   it "should raise error if the text in the page doesn't match given regexp" do
@@ -109,13 +109,13 @@ Capybara::SpecHelper.spec '#assert_text' do
     Capybara.default_max_wait_time = 2
     @session.visit('/with_js')
     @session.click_link('Click me')
-    expect(@session.assert_text('Has been clicked')).to eq(true)
+    expect(@session.assert_text('Has been clicked')).to be(true)
   end
 
   context 'with between' do
     it 'should be true if the text occurs within the range given' do
       @session.visit('/with_count')
-      expect(@session.assert_text('count', between: 1..3)).to eq(true)
+      expect(@session.assert_text('count', between: 1..3)).to be(true)
     end
 
     it 'should be false if the text occurs more or fewer times than range' do
@@ -203,13 +203,13 @@ Capybara::SpecHelper.spec '#assert_no_text' do
   it 'should be true if scoped to an element which does not have the text' do
     @session.visit('/with_html')
     @session.within("//a[@title='awesome title']") do
-      expect(@session.assert_no_text('monkey')).to eq(true)
+      expect(@session.assert_no_text('monkey')).to be(true)
     end
   end
 
   it 'should be true if the given text is on the page but not visible' do
     @session.visit('/with_html')
-    expect(@session.assert_no_text('Inside element with hidden ancestor')).to eq(true)
+    expect(@session.assert_no_text('Inside element with hidden ancestor')).to be(true)
   end
 
   it 'should raise error if :all given and text is invisible.' do
@@ -236,7 +236,7 @@ Capybara::SpecHelper.spec '#assert_no_text' do
   context 'with count' do
     it 'should be true if the text occurs within the range given' do
       @session.visit('/with_count')
-      expect(@session.assert_text('count', count: 2)).to eq(true)
+      expect(@session.assert_text('count', count: 2)).to be(true)
     end
 
     it 'should be false if the text occurs more or fewer times than range' do

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

@@ -55,6 +55,12 @@ Capybara::SpecHelper.spec '#attach_file' do
       expect(@session).to have_content('No file uploaded')
     end
 
+    it 'should send prior hidden field if no file submitted' do
+      @session.click_button('Upload Empty With Hidden')
+      expect(extract_results(@session)['document2']).to eq('hidden_field')
+      expect(extract_content_type(@session)).to start_with('multipart/form-data;')
+    end
+
     it 'should send content type text/plain when uploading a text file' do
       @session.attach_file 'Single Document', with_os_path_separators(test_file_path)
       @session.click_button 'Upload Single'

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

@@ -236,6 +236,16 @@ Capybara::SpecHelper.spec '#check' do
           expect(@session).to have_field('multi_label_checkbox', checked: true, visible: :hidden)
         end
       end
+
+      context 'with allow_label_click options', requires: [:js] do
+        it 'should allow offsets to click location on label' do
+          Capybara.w3c_click_offset = false
+          expect(@session.find(:checkbox, 'form_cars_lotus', unchecked: true, visible: :hidden)).to be_truthy
+          @session.check('form_cars_lotus', allow_label_click: { x: 90, y: 10 })
+          @session.click_button('awesome')
+          expect(extract_results(@session)['cars']).to include('lotus')
+        end
+      end
     end
   end
 end

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

@@ -11,6 +11,12 @@ Capybara::SpecHelper.spec '#choose' do
     expect(extract_results(@session)['gender']).to eq('male')
   end
 
+  it 'ignores readonly attribute on radio buttons' do
+    @session.choose('gender_both')
+    @session.click_button('awesome')
+    expect(extract_results(@session)['gender']).to eq('both')
+  end
+
   it 'should choose a radio button by label' do
     @session.choose('Both')
     @session.click_button('awesome')

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

@@ -7,7 +7,7 @@ Capybara::SpecHelper.spec '#current_scope' do
 
   context 'when not in a #within block' do
     it 'should return the document' do
-      expect(@session.current_scope).to be_kind_of Capybara::Node::Document
+      expect(@session.current_scope).to be_a Capybara::Node::Document
     end
   end
 

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

@@ -98,6 +98,12 @@ Capybara::SpecHelper.spec '#fill_in' do
     expect(extract_results(@session)['description']).to eq("\r\nSome text\r\n")
   end
 
+  it 'should handle carriage returns with line feeds in a textarea correctly' do
+    @session.fill_in('form_description', with: "\r\nSome text\r\n")
+    @session.click_button('awesome')
+    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')

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

@@ -528,4 +528,10 @@ Capybara::SpecHelper.spec '#find' do
       expect(@session.find(:link, 'test-foo')[:id]).to eq 'foo'
     end
   end
+
+  it 'should warn if passed count options' do
+    allow(Capybara::Helpers).to receive(:warn)
+    @session.find('//h1', count: 44)
+    expect(Capybara::Helpers).to have_received(:warn).with(/'find' does not support count options/)
+  end
 end

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

@@ -39,8 +39,8 @@ Capybara::SpecHelper.spec '#have_no_ancestor' do
   it 'should assert no matching ancestor' do
     el = @session.find(:css, '#ancestor1')
     expect(el).to have_no_ancestor(:css, '#child')
-    expect(el).to have_no_ancestor(:css, '#ancestor1_sibiling')
+    expect(el).to have_no_ancestor(:css, '#ancestor1_sibling')
     expect(el).not_to have_ancestor(:css, '#child')
-    expect(el).not_to have_ancestor(:css, '#ancestor1_sibiling')
+    expect(el).not_to have_ancestor(:css, '#ancestor1_sibling')
   end
 end

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

@@ -22,4 +22,8 @@ Capybara::SpecHelper.spec '#have_any_of_selectors' do
       expect(@session).to have_any_of_selectors('p a#blah', 'h2#h2three')
     end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
   end
+
+  it 'should be negateable' do
+    expect(@session).not_to have_any_of_selectors(:css, 'span a#foo', 'h2#h2nope', 'h2#h2one_no')
+  end
 end

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

@@ -65,6 +65,24 @@ Capybara::SpecHelper.spec '#has_button?' do
   it 'should not affect other selectors when enable_aria_role: false' do
     expect(@session).to have_button('Click me!', enable_aria_role: false)
   end
+
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if a field has focus when focused: true' do
+      @session.send_keys(:tab)
+
+      expect(@session).to have_button('A Button', focused: true)
+    end
+
+    it 'should be true if a field does not have focus when focused: false' do
+      expect(@session).to have_button('A Button', focused: false)
+    end
+  end
+
+  it 'should raise an error if an invalid option is passed' do
+    expect do
+      expect(@session).to have_button('A Button', invalid: true)
+    end.to raise_error(ArgumentError, 'Invalid option(s) :invalid, should be one of :above, :below, :left_of, :right_of, :near, :count, :minimum, :maximum, :between, :text, :id, :class, :style, :visible, :obscured, :exact, :exact_text, :normalize_ws, :match, :wait, :filter_set, :focused, :disabled, :name, :value, :title, :type')
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_button?' do
@@ -117,4 +135,16 @@ Capybara::SpecHelper.spec '#has_no_button?' do
   it 'should not affect other selectors when enable_aria_role: false' do
     expect(@session).to have_no_button('Junk button that does not exist', enable_aria_role: false)
   end
+
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if a button does not have focus when focused: true' do
+      expect(@session).to have_no_button('A Button', focused: true)
+    end
+
+    it 'should be false if a button has focus when focused: false' do
+      @session.send_keys(:tab)
+
+      expect(@session).to have_no_button('A Button', focused: false)
+    end
+  end
 end

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

@@ -16,8 +16,8 @@ Capybara::SpecHelper.spec '#has_current_path?' do
 
   it 'should not raise an error when non-http' do
     @session.reset_session!
-    expect(@session.has_current_path?(/monkey/)).to eq false
-    expect(@session.has_current_path?('/with_js')).to eq false
+    expect(@session.has_current_path?(/monkey/)).to be false
+    expect(@session.has_current_path?('/with_js')).to be false
   end
 
   it 'should handle non-escaped query options' do

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

@@ -110,6 +110,18 @@ Capybara::SpecHelper.spec '#has_field' do
     end
   end
 
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if a field has focus' do
+      2.times { @session.send_keys(:tab) }
+
+      expect(@session).to have_field('An Input', focused: true)
+    end
+
+    it 'should be false if a field does not have focus' do
+      expect(@session).to have_field('An Input', focused: false)
+    end
+  end
+
   context 'with valid', requires: [:js] do
     it 'should be true if field is valid' do
       @session.fill_in 'required', with: 'something'
@@ -184,6 +196,18 @@ Capybara::SpecHelper.spec '#has_no_field' do
       expect(@session).to have_no_field('Languages', type: 'textarea')
     end
   end
+
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if a field does not have focus when focused: true' do
+      expect(@session).to have_no_field('An Input', focused: true)
+    end
+
+    it 'should be false if a field has focus when focused: true' do
+      2.times { @session.send_keys(:tab) }
+
+      expect(@session).not_to have_no_field('An Input', focused: true)
+    end
+  end
 end
 
 Capybara::SpecHelper.spec '#has_checked_field?' do
@@ -359,7 +383,7 @@ Capybara::SpecHelper.spec '#has_no_unchecked_field?' do
   end
 
   it 'should support locator-less usage' do
-    expect(@session.has_no_unchecked_field?(disabled: false, id: 'form_disabled_unchecked_checkbox')).to eq true
+    expect(@session.has_no_unchecked_field?(disabled: false, id: 'form_disabled_unchecked_checkbox')).to be true
     expect(@session).to have_no_unchecked_field(disabled: false, id: 'form_disabled_unchecked_checkbox')
   end
 end

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

@@ -18,6 +18,30 @@ Capybara::SpecHelper.spec '#has_link?' do
     expect(@session).not_to have_link('A link', href: '/nonexistent-href')
     expect(@session).not_to have_link('A link', href: /nonexistent/)
   end
+
+  it 'should notify if an invalid locator is specified' do
+    allow(Capybara::Helpers).to receive(:warn).and_return(nil)
+    @session.has_link?(@session)
+    expect(Capybara::Helpers).to have_received(:warn).with(/Called from: .+/)
+  end
+
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if the given link is on the page and has focus' do
+      @session.send_keys(:tab)
+
+      expect(@session).to have_link('labore', focused: true)
+    end
+
+    it 'should be false if the given link is on the page and does not have focus' do
+      expect(@session).to have_link('labore', focused: false)
+    end
+  end
+
+  it 'should raise an error if an invalid option is passed' do
+    expect do
+      expect(@session).to have_link('labore', invalid: true)
+    end.to raise_error(ArgumentError, 'Invalid option(s) :invalid, should be one of :above, :below, :left_of, :right_of, :near, :count, :minimum, :maximum, :between, :text, :id, :class, :style, :visible, :obscured, :exact, :exact_text, :normalize_ws, :match, :wait, :filter_set, :focused, :href, :alt, :title, :download')
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_link?' do
@@ -36,4 +60,16 @@ Capybara::SpecHelper.spec '#has_no_link?' do
     expect(@session).to have_no_link('A link', href: '/nonexistent-href')
     expect(@session).to have_no_link('A link', href: %r{/nonexistent-href})
   end
+
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if the given link is on the page and has focus' do
+      expect(@session).to have_no_link('labore', focused: true)
+    end
+
+    it 'should be false if the given link is on the page and does not have focus' do
+      @session.send_keys(:tab)
+
+      expect(@session).to have_no_link('labore', focused: false)
+    end
+  end
 end

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

@@ -179,10 +179,16 @@ Capybara::SpecHelper.spec '#has_select?' do
     end
   end
 
+  it 'should raise an error if an invalid option is passed' do
+    expect do
+      expect(@session).to have_select('form_languages', invalid: true)
+    end.to raise_error(ArgumentError, 'Invalid option(s) :invalid, should be one of :above, :below, :left_of, :right_of, :near, :count, :minimum, :maximum, :between, :text, :id, :class, :style, :visible, :obscured, :exact, :exact_text, :normalize_ws, :match, :wait, :filter_set, :focused, :disabled, :name, :placeholder, :options, :enabled_options, :disabled_options, :selected, :with_selected, :multiple, :with_options')
+  end
+
   it 'should support locator-less usage' do
-    expect(@session.has_select?(with_options: %w[Norway Sweden])).to eq true
+    expect(@session.has_select?(with_options: %w[Norway Sweden])).to be true
     expect(@session).to have_select(with_options: ['London'])
-    expect(@session.has_select?(with_selected: %w[Commando Boxerbriefs])).to eq true
+    expect(@session.has_select?(with_selected: %w[Commando Boxerbriefs])).to be true
     expect(@session).to have_select(with_selected: ['Briefs'])
   end
 end
@@ -302,9 +308,9 @@ Capybara::SpecHelper.spec '#has_no_select?' do
   end
 
   it 'should support locator-less usage' do
-    expect(@session.has_no_select?(with_options: %w[Norway Sweden Finland Latvia])).to eq true
+    expect(@session.has_no_select?(with_options: %w[Norway Sweden Finland Latvia])).to be true
     expect(@session).to have_no_select(with_options: ['New London'])
-    expect(@session.has_no_select?(id: 'form_underwear', with_selected: ['Boxers'])).to eq true
+    expect(@session.has_no_select?(id: 'form_underwear', with_selected: ['Boxers'])).to be true
     expect(@session).to have_no_select(id: 'form_underwear', with_selected: %w[Commando Boxers])
   end
 end