capybara 3.35.3 → 3.37.1

data/lib/capybara/selenium/node.rb

@@ -14,7 +14,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def all_text
-    text = driver.evaluate_script('arguments[0].textContent', self)
+    text = driver.evaluate_script('arguments[0].textContent', self) || ''
     text.gsub(/[\u200b\u200e\u200f]/, '')
         .gsub(/[\ \n\f\t\v\u2028\u2029]+/, ' ')
         .gsub(/\A[[:space:]&&[^\u00a0]]+/, '')
@@ -53,6 +53,11 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   #   :none =>  append the new value to the existing value <br/>
   #   :backspace => send backspace keystrokes to clear the field <br/>
   #   Array => an array of keys to send before the value being set, e.g. [[:command, 'a'], :backspace]
+  # @option options [Boolean] :rapid (nil) Whether setting text inputs should use a faster &quot;rapid&quot; mode<br/>
+  #   nil => Text inputs with length greater than 30 characters will be set using a faster driver script mode<br/>
+  #   true => Rapid mode will be used regardless of input length<br/>
+  #   false => Sends keys via conventional mode. This may be required to avoid losing key-presses if you have certain
+  #            Javascript interactions on form inputs<br/>
   def set(value, **options)
     if value.is_a?(Array) && !multiple?
       raise ArgumentError, "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
@@ -199,10 +204,6 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     native.attribute('isContentEditable') == 'true'
   end
 
-  def ==(other)
-    native == other.native
-  end
-
   def path
     driver.evaluate_script GET_XPATH_SCRIPT, self
   end
@@ -218,6 +219,13 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     native.rect
   end
 
+  def shadow_root
+    raise_error 'You must be using Selenium 4.1+ for shadow_root support' unless native.respond_to? :shadow_root
+
+    root = native.shadow_root
+    root && build_node(native.shadow_root)
+  end
+
 protected
 
   def scroll_if_needed
@@ -274,7 +282,7 @@ private
     elsif clear == :backspace
       # Clear field by sending the correct number of backspace keys.
       backspaces = [:backspace] * self.value.to_s.length
-      send_keys(*([:end] + backspaces + [value]))
+      send_keys(:end, *backspaces, value)
     elsif clear.is_a? Array
       send_keys(*clear, value)
     else
@@ -282,7 +290,7 @@ private
       if rapid == true || ((value.length > auto_rapid_set_length) && rapid != false)
         send_keys(value[0..3])
         driver.execute_script RAPID_APPEND_TEXT, self, value[4...-3]
-        send_keys(value[-3..-1])
+        send_keys(value[-3..])
       else
         send_keys(value)
       end
@@ -298,7 +306,7 @@ private
 
     scroll_if_needed do
       action_with_modifiers(click_options) do |action|
-        if block_given?
+        if block
           yield action
         else
           click_options.coords? ? action.click : action.click(native)
@@ -488,6 +496,12 @@ private
     JS
   end
 
+  def native_id
+    # Selenium 3 -> 4 changed the return of ref
+    type_or_id, id = native.ref
+    id || type_or_id
+  end
+
   GET_XPATH_SCRIPT = <<~'JS'
     (function(el, xml){
       var xpath = '';

data/lib/capybara/selenium/nodes/chrome_node.rb

@@ -65,7 +65,7 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
     return super unless native_displayed?
 
     begin
-      bridge.send(:execute, :is_element_displayed, id: native.ref)
+      bridge.send(:execute, :is_element_displayed, id: native_id)
     rescue Selenium::WebDriver::Error::UnknownCommandError
       # If the is_element_displayed command is unknown, no point in trying again
       driver.options[:native_displayed] = false

data/lib/capybara/selenium/nodes/edge_node.rb

@@ -69,7 +69,7 @@ class Capybara::Selenium::EdgeNode < Capybara::Selenium::Node
     return super unless chrome_edge? && native_displayed?
 
     begin
-      bridge.send(:execute, :is_element_displayed, id: native.ref)
+      bridge.send(:execute, :is_element_displayed, id: native_id)
     rescue Selenium::WebDriver::Error::UnknownCommandError
       # If the is_element_displayed command is unknown, no point in trying again
       driver.options[:native_displayed] = false

data/lib/capybara/selenium/nodes/firefox_node.rb

@@ -76,7 +76,7 @@ class Capybara::Selenium::FirefoxNode < Capybara::Selenium::Node
     return super unless native_displayed?
 
     begin
-      bridge.send(:execute, :is_element_displayed, id: native.ref)
+      bridge.send(:execute, :is_element_displayed, id: native_id)
     rescue Selenium::WebDriver::Error::UnknownCommandError
       # If the is_element_displayed command is unknown, no point in trying again
       driver.options[:native_displayed] = false

data/lib/capybara/selenium/nodes/safari_node.rb

@@ -14,7 +14,7 @@ class Capybara::Selenium::SafariNode < Capybara::Selenium::Node
       warn 'You are attempting to click a table row which has issues in safaridriver - '\
            'Your test should probably be clicking on a table cell like a user would. '\
            'Clicking the first cell in the row instead.'
-      return find_css('th:first-child,td:first-child')[0].click(keys, options)
+      return find_css('th:first-child,td:first-child')[0].click(keys, **options)
     end
     raise
   rescue ::Selenium::WebDriver::Error::WebDriverError => e
@@ -74,7 +74,7 @@ class Capybara::Selenium::SafariNode < Capybara::Selenium::Node
     if clear == :backspace
       # Clear field by sending the correct number of backspace keys.
       backspaces = [:backspace] * self.value.to_s.length
-      send_keys(*([[:control, 'e']] + backspaces + [value]))
+      send_keys([:control, 'e'], *backspaces, value)
     else
       super.tap do
         # React doesn't see the safaridriver element clear

data/lib/capybara/server/animation_disabler.rb

@@ -16,16 +16,20 @@ module Capybara
 
       def initialize(app)
         @app = app
-        @disable_markup = format(DISABLE_MARKUP_TEMPLATE, selector: self.class.selector_for(Capybara.disable_animation))
+        @disable_css_markup = format(DISABLE_CSS_MARKUP_TEMPLATE,
+                                     selector: self.class.selector_for(Capybara.disable_animation))
+        @disable_js_markup = format(DISABLE_JS_MARKUP_TEMPLATE,
+                                    selector: self.class.selector_for(Capybara.disable_animation))
       end
 
       def call(env)
         @status, @headers, @body = @app.call(env)
         return [@status, @headers, @body] unless html_content?
 
+        nonces = directive_nonces.transform_values { |nonce| "nonce=\"#{nonce}\"" if nonce && !nonce.empty? }
         response = Rack::Response.new([], @status, @headers)
 
-        @body.each { |html| response.write insert_disable(html) }
+        @body.each { |html| response.write insert_disable(html, nonces) }
         @body.close if @body.respond_to?(:close)
 
         response.finish
@@ -33,31 +37,45 @@ module Capybara
 
     private
 
-      attr_reader :disable_markup
+      attr_reader :disable_css_markup, :disable_js_markup
 
       def html_content?
         /html/.match?(@headers['Content-Type'])
       end
 
-      def insert_disable(html)
-        html.sub(%r{(</body>)}, "#{disable_markup}\\1")
+      def insert_disable(html, nonces)
+        html.sub(%r{(</head>)}, "<style #{nonces['style-src']}>#{disable_css_markup}</style>\\1")
+            .sub(%r{(</body>)}, "<script #{nonces['script-src']}>#{disable_js_markup}</script>\\1")
       end
 
-      DISABLE_MARKUP_TEMPLATE = <<~HTML
-        <script>
+      def directive_nonces
+        @headers.fetch('Content-Security-Policy', '')
+                .split(';')
+                .map(&:split)
+                .to_h do |s|
+                  [
+                    s[0], s[1..].filter_map do |value|
+                      /^'nonce-(?<nonce>.+)'/ =~ value
+                      nonce
+                    end[0]
+                  ]
+                end
+      end
+
+      DISABLE_CSS_MARKUP_TEMPLATE = <<~CSS
+        %<selector>s, %<selector>s::before, %<selector>s::after {
+           transition: none !important;
+           animation-duration: 0s !important;
+           animation-delay: 0s !important;
+           scroll-behavior: auto !important;
+        }
+      CSS
+
+      DISABLE_JS_MARKUP_TEMPLATE = <<~SCRIPT
         //<![CDATA[
           (typeof jQuery !== 'undefined') && (jQuery.fx.off = true);
         //]]>
-        </script>
-        <style>
-          %<selector>s, %<selector>s::before, %<selector>s::after {
-             transition: none !important;
-             animation-duration: 0s !important;
-             animation-delay: 0s !important;
-             scroll-behavior: auto !important;
-          }
-        </style>
-      HTML
+      SCRIPT
     end
   end
 end

data/lib/capybara/session/config.rb

@@ -100,7 +100,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

@@ -311,6 +311,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
@@ -408,11 +418,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) }
+          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
@@ -755,33 +765,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/check_spec.rb

@@ -236,6 +236,15 @@ 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
+          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/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_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,18 @@ 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
 end
 
 Capybara::SpecHelper.spec '#has_no_button?' do
@@ -117,4 +129,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