capybara 2.18.0 → 3.0.0

data/lib/capybara/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rspec"
 require "rspec/expectations"
 require "capybara"
@@ -6,15 +7,6 @@ require "capybara/rspec" # Required here instead of in rspec_spec to avoid RSpec
 require "capybara/spec/test_app"
 require "nokogiri"
 
-# Alias be_truthy/be_falsey if not already defined to be able to use in RSpec 2 and 3
-unless RSpec::Matchers.method_defined?(:be_truthy)
-  RSpec::Matchers.module_eval do
-    alias be_truthy be_true
-    alias be_falsey be_false
-    alias be_falsy be_false
-  end
-end
-
 module Capybara
   module SpecHelper
     class << self
@@ -33,13 +25,9 @@ module Capybara
         Capybara.default_max_wait_time = 1
         Capybara.ignore_hidden_elements = true
         Capybara.exact = false
-        # `exact_options` is deprecated - set instancce var directly so we
-        # don't generate message every reset
-        Capybara.send(:config).session_options.instance_variable_set('@exact_options', false)
         Capybara.raise_server_errors = true
         Capybara.visible_text_only = false
         Capybara.match = :smart
-        Capybara.wait_on_first_by_default = false
         Capybara.enable_aria_label = false
         reset_threadsafe
       end
@@ -59,7 +47,7 @@ module Capybara
         @specs << [name, options, block]
       end
 
-      def run_specs(session, name, options={})
+      def run_specs(session, name, **options)
         specs = @specs
         RSpec.describe Capybara::Session, name, options do
           include Capybara::SpecHelper
@@ -80,6 +68,10 @@ module Capybara
             SpecHelper.reset_threadsafe(false, @session)
           end
 
+          before :each, :exact_false do
+            Capybara.exact = false
+          end
+
           specs.each do |spec_name, spec_options, block|
             describe spec_name, *spec_options do
               class_eval(&block)
@@ -94,7 +86,7 @@ module Capybara
         session = session.current_session if session.respond_to?(:current_session)
         session.instance_variable_set(:@config, nil) if session
       end
-    end # class << self
+    end
 
     def silence_stream(stream)
       old_stream = stream.dup
@@ -119,11 +111,35 @@ module Capybara
     end
 
     def marionette?(session)
-      session.driver.respond_to?(:marionette?, true) && session.driver.send(:marionette?)
+      session.respond_to?(:driver) && session.driver.respond_to?(:marionette?, true) && session.driver.send(:marionette?)
+    end
+
+    def marionette_lt?(version, session)
+      marionette?(session) && (session.driver.browser.capabilities[:browser_version].to_f < version)
+    end
+
+    def marionette_gte?(version, session)
+      marionette?(session) && (session.driver.browser.capabilities[:browser_version].to_f >= version)
+    end
+
+    def chrome?(session)
+      session.respond_to?(:driver) && session.driver.respond_to?(:chrome?, true) && session.driver.send(:chrome?)
+    end
+
+    def chrome_lt?(version, session)
+      chrome?(session) && (session.driver.browser.capabilities[:version].to_f < version)
+    end
+
+    def chrome_gte?(version, session)
+      chrome?(session) && (session.driver.browser.capabilities[:version].to_f >= version)
+    end
+
+    def edge?(session)
+      session.respond_to?(:driver) && session.driver.respond_to?(:edge?, true) && session.driver.send(:edge?)
     end
 
-    def rspec2?
-      !defined?(::RSpec::Expectations::Version) || (Gem::Version.new(RSpec::Expectations::Version::STRING) < Gem::Version.new('3.0'))
+    def ie?(session)
+      session.respond_to?(:driver) && session.driver.respond_to?(:ie?, true) && session.driver.send(:ie?)
     end
   end
 end

data/lib/capybara/spec/test_app.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'sinatra/base'
 require 'tilt/erb'
 require 'rack'
@@ -21,7 +22,7 @@ class TestApp < Sinatra::Base
   # Also check lib/capybara/spec/views/*.erb for pages not listed here
 
   get '/' do
-    response.set_cookie('capybara', { value: 'root cookie', domain: request.host, path: request.path} )
+    response.set_cookie('capybara', value: 'root cookie', domain: request.host, path: request.path)
     'Hello world! <a href="with_html">Relative</a>'
   end
 
@@ -38,8 +39,8 @@ class TestApp < Sinatra::Base
   end
 
   get '/referer_base' do
-    '<a href="/get_referer">direct link</a>' +
-    '<a href="/redirect_to_get_referer">link via redirect</a>' +
+    '<a href="/get_referer">direct link</a>' \
+    '<a href="/redirect_to_get_referer">link via redirect</a>' \
     '<form action="/get_referer" method="get"><input type="submit"></form>'
   end
 
@@ -69,7 +70,7 @@ class TestApp < Sinatra::Base
   end
 
   get '/with-quotes' do
-    %q{"No," he said, "you can't do that."}
+    %q("No," he said, "you can't do that.")
   end
 
   get '/form/get' do
@@ -143,13 +144,22 @@ class TestApp < Sinatra::Base
     erb :with_html, locals: { referrer: request.referrer }
   end
 
+  get '/with_title' do
+    <<-HTML
+      <title>#{params[:title] || 'Test Title'}</title>
+      <body>
+        <svg><title>abcdefg</title></svg>
+      </body>
+    HTML
+  end
+
   get '/:view' do |view|
     erb view.to_sym, locals: { referrer: request.referrer }
   end
 
   post '/form' do
     @@form_post_count += 1
-    '<pre id="results">' + params[:form].merge({"post_count" => @@form_post_count}).to_yaml + '</pre>'
+    '<pre id="results">' + params[:form].merge("post_count" => @@form_post_count).to_yaml + '</pre>'
   end
 
   post '/upload_empty' do
@@ -173,7 +183,7 @@ class TestApp < Sinatra::Base
 
   post '/upload_multiple' do
     begin
-      buffer = ["#{params[:form][:multiple_documents].size}"]
+      buffer = [params[:form][:multiple_documents].size.to_s]
       params[:form][:multiple_documents].each do |doc|
         buffer << "Content-type: #{doc[:type]}"
         buffer << "File content: #{doc[:tempfile].read}"
@@ -185,6 +195,4 @@ class TestApp < Sinatra::Base
   end
 end
 
-if __FILE__ == $0
-  Rack::Handler::WEBrick.run TestApp, Port: 8070
-end
+Rack::Handler::Puma.run TestApp, Port: 8070 if $PROGRAM_NAME == __FILE__

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

@@ -186,6 +186,7 @@ New line after and before textarea tag
     <input type="checkbox" value="pagani" name="form[cars][]" id="form_cars_pagani" style="position: absolute; left: -9999px"/>
     <label for="form_cars_pagani">Pagani</label>
     <input type="checkbox" value="ariel" name="form[cars][]" id="form_cars_ariel" style="display: none"/>
+    <input type="checkbox" value="porsche" name="form[cars][]" id="form_cars_porsche" checked="checked" style="display: none"/>
     <label>
       McLaren
       <input type="checkbox" value="mclaren" name="form[cars][]" id="form_cars_mclaren" style="display: none"/>
@@ -425,6 +426,12 @@ New line after and before textarea tag
     <input type="button" disabled="disabled" value="Disabled button"/>
   </p>
 
+  <p>
+    <input type="date" name="form[date]" id="form_date"/>
+    <input type="time" name="form[time]" id="form_time"/>
+    <input type="datetime-local" name="form[datetime]" id="form_datetime">
+  </p>
+
   <p>
     <input id="readonly" name="form[readonly_test]" readonly/>
     <input id="not_readonly" name="form[readonly_test]" />

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

@@ -150,4 +150,26 @@ banana</textarea>
     <div data-pre=true>Pre Sibling</div>
     <div data-post=true>Post Sibling</div>
   </div>
-</div>
+</div>
+
+<div id='1escape.me' class="2escape">needs escaping</div>
+
+<div id="normalized">
+  Some text<div>More   text</div>
+  <div> And more text</div>
+  Even more &nbsp;&nbsp; text
+
+  on multiple lines
+</div>
+
+<div id="non_visible_normalized" style="display: none">
+  Some text<div>More   text</div>
+  <div> And more text</div>
+  Even more &nbsp;&nbsp; text
+
+  on multiple lines
+</div>
+
+<div id="ws">
+&#x20;&#x1680;&#x2000;&#x2001;&#x2002; &#x2003;&#x2004;&nbsp;&#x2005; &#x2006;&#x2007;&#x2008;&#x2009;&#x200A;&#x202F;&#x205F;&#x3000;
+</div>

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

@@ -4,7 +4,10 @@
         <title>With Frames</title>
     </head>
     <body>
-        <div id="divInMainWindow">This is the text for divInMainWindow</div>
+        <div id="divInMainWindow">
+          This is the text for divInMainWindow
+          <iframe src="/frame_parent" id="innerParentFrame"></iframe>
+        </div>
     <iframe src="/frame_one" id="frameOne" name="my frame one"></iframe>
     <iframe src="/frame_two" id="frameTwo"></iframe>
     <iframe src="/frame_parent" id="parentFrame"></iframe>

data/lib/capybara/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Capybara
-  VERSION = '2.18.0'
+  VERSION = '3.0.0'.freeze
 end

data/lib/capybara/window.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Capybara
   ##
   # The Window class represents a browser window.
@@ -101,7 +102,7 @@ module Capybara
     end
 
     def eql?(other)
-      other.kind_of?(self.class) && @session == other.session && @handle == other.handle
+      other.is_a?(self.class) && @session == other.session && @handle == other.handle
     end
     alias_method :==, :eql?
 
@@ -113,9 +114,9 @@ module Capybara
       "#<Window @handle=#{@handle.inspect}>"
     end
 
-    private
+  private
 
-    def wait_for_stable_size(seconds=session.config.default_max_wait_time)
+    def wait_for_stable_size(seconds = session.config.default_max_wait_time)
       res = yield if block_given?
       prev_size = size
       start_time = Capybara::Helpers.monotonic_time
@@ -125,16 +126,11 @@ module Capybara
         return res if cur_size == prev_size
         prev_size = cur_size
       end while (Capybara::Helpers.monotonic_time - start_time) < seconds
-      #TODO raise error in 3.0
-      #raise Capybara::WindowError, "Window size not stable."
-      warn "Window size not stable in #{seconds} seconds.  This will raise an exception in a future version of Capybara"
-      return res
+      raise Capybara::WindowError, "Window size not stable within #{seconds} seconds."
     end
 
     def raise_unless_current(what)
-      unless current?
-        raise Capybara::WindowError, "#{what} not current window is not possible."
-      end
+      raise Capybara::WindowError, "#{what} not current window is not possible." unless current?
     end
   end
 end

data/lib/capybara.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'timeout'
 require 'nokogiri'
 require 'xpath'
@@ -21,7 +22,6 @@ module Capybara
   class WindowError < CapybaraError; end
   class ReadOnlyElementError < CapybaraError; end
 
-
   class << self
     extend Forwardable
 
@@ -51,8 +51,6 @@ module Capybara
     #   See {Capybara.configure}
     # @!method always_include_port
     #   See {Capybara.configure}
-    # @!method wait_on_first_by_default
-    #   See {Capybara.configure}
     SessionConfig::OPTIONS.each do |method|
       def_delegators :config, method, "#{method}="
     end
@@ -79,7 +77,6 @@ module Capybara
     # [ignore_hidden_elements = Boolean]  Whether to ignore hidden elements on the page (Default: true)
     # [automatic_reload = Boolean]        Whether to automatically reload elements as Capybara is waiting (Default: true)
     # [save_path = String]  Where to put pages saved through save_(page|screenshot), save_and_open_(page|screenshot) (Default: Dir.pwd)
-    # [wait_on_first_by_default = Boolean]   Whether Node#first defaults to Capybara waiting behavior for at least 1 element to match (Default: false)
     # [automatic_label_click = Boolean]   Whether Node#choose, Node#check, Node#uncheck will attempt to click the associated label element if the checkbox/radio button are non-visible (Default: false)
     # [enable_aria_label = Boolean]  Whether fields, links, and buttons will match against aria-label attribute (Default: false)
     # [reuse_server = Boolean]  Reuse the server thread between multiple sessions using the same app object (Default: true)
@@ -94,7 +91,7 @@ module Capybara
     # [javascript_driver = Symbol]        The name of a driver to use for JavaScript enabled tests. (Default: :selenium)
     #
     def configure
-      yield ConfigureDeprecator.new(config)
+      yield config
     end
 
     ##
@@ -128,7 +125,6 @@ module Capybara
     # @yieldparam [<Rack>] app                The rack application that this server will contain.
     # @yieldparam port                        The port number the server should listen on
     # @yieldparam host                        The host/ip to bind to
-    # @yieldreturn [Capybara::Driver::Base]   A Capybara driver instance
     #
     def register_server(name, &block)
       servers[name.to_sym] = block
@@ -192,8 +188,6 @@ module Capybara
       @servers ||= {}
     end
 
-    ##
-    #
     # Wraps the given string, which should contain an HTML document or fragment
     # in a {Capybara::Node::Simple} which exposes all {Capybara::Node::Matchers},
     # {Capybara::Node::Finders} and {Capybara::Node::DocumentMatchers}. This allows you to query
@@ -238,7 +232,7 @@ module Capybara
     # @param [Integer] port              The port to run the application on
     #
     def run_default_server(app, port)
-      servers[:webrick].call(app, port, server_host)
+      servers[:puma].call(app, port, server_host)
     end
 
     ##
@@ -310,7 +304,7 @@ module Capybara
     # as cookies.
     #
     def reset_sessions!
-      #reset in reverse so sessions that started servers are reset last
+      # reset in reverse so sessions that started servers are reset last
       session_pool.reverse_each { |_mode, session| session.reset! }
     end
     alias_method :reset!, :reset_sessions!
@@ -364,10 +358,10 @@ module Capybara
     # @param [String] html              The raw html
     # @return [Nokogiri::HTML::Document]      HTML document
     #
-    def HTML(html)
+    def HTML(html) # rubocop:disable Naming/MethodName
       Nokogiri::HTML(html).tap do |document|
         document.xpath('//textarea').each do |textarea|
-          textarea['_capybara_raw_value'] = textarea.content.sub(/\A\n/,'')
+          textarea['_capybara_raw_value'] = textarea.content.sub(/\A\n/, '')
         end
       end
     end
@@ -376,12 +370,8 @@ module Capybara
       config.session_options
     end
 
-    def included(base)
-      base.send(:include, Capybara::DSL)
-      warn "`include Capybara` is deprecated. Please use `include Capybara::DSL` instead."
-    end
-
   private
+
     def config
       @config ||= Capybara::Config.new
     end
@@ -415,7 +405,6 @@ module Capybara
   require 'capybara/queries/match_query'
   require 'capybara/queries/ancestor_query'
   require 'capybara/queries/sibling_query'
-  require 'capybara/query'
 
   require 'capybara/node/finders'
   require 'capybara/node/matchers'
@@ -443,14 +432,29 @@ Capybara.register_server :default do |app, port, _host|
   Capybara.run_default_server(app, port)
 end
 
-Capybara.register_server :webrick do |app, port, host, options={}|
+Capybara.register_server :webrick do |app, port, host, **options|
   require 'rack/handler/webrick'
-  Rack::Handler::WEBrick.run(app, {Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0)}.merge(options))
+  Rack::Handler::WEBrick.run(app, { Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log.new(nil, 0) }.merge(options))
 end
 
-Capybara.register_server :puma do |app, port, host, options={}|
+Capybara.register_server :puma do |app, port, host, **options|
   require 'rack/handler/puma'
-  Rack::Handler::Puma.run(app, {Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false}.merge(options))
+  # If we just run the Puma Rack handler it installs signal handlers which prevent us from being able to interrupt tests.
+  # Therefore construct and run the Server instance ourselves.
+  # Rack::Handler::Puma.run(app, { Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false }.merge(options))
+
+  conf = Rack::Handler::Puma.config(app, { Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false }.merge(options))
+  events = conf.options[:Silent] ? ::Puma::Events.strings : ::Puma::Events.stdio
+
+  events.log "Capybara starting Puma..."
+  events.log "* Version #{Puma::Const::PUMA_VERSION} , codename: #{Puma::Const::CODE_NAME}"
+  events.log "* Min threads: #{conf.options[:min_threads]}, max threads: #{conf.options[:max_threads]}"
+
+  Puma::Server.new(conf.app, events, conf.options).tap do |s|
+    s.binder.parse conf.options[:binds], s.events
+    s.min_threads = conf.options[:min_threads]
+    s.max_threads = conf.options[:max_threads]
+  end.run.join
 end
 
 Capybara.configure do |config|
@@ -468,7 +472,6 @@ Capybara.configure do |config|
   config.raise_server_errors = true
   config.server_errors = [StandardError]
   config.visible_text_only = false
-  config.wait_on_first_by_default = false
   config.automatic_label_click = false
   config.enable_aria_label = false
   config.reuse_server = true
@@ -483,11 +486,11 @@ Capybara.register_driver :selenium do |app|
 end
 
 Capybara.register_driver :selenium_chrome do |app|
-  Capybara::Selenium::Driver.new(app, :browser => :chrome)
+  Capybara::Selenium::Driver.new(app, browser: :chrome)
 end
 
 Capybara.register_driver :selenium_chrome_headless do |app|
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new()
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new
   browser_options.args << '--headless'
   browser_options.args << '--disable-gpu'
   Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)

data/spec/basic_node_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Capybara do

data/spec/capybara_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Capybara do
@@ -12,15 +13,6 @@ RSpec.describe Capybara do
       Capybara.default_max_wait_time = 5
       expect(Capybara.default_max_wait_time).to eq(5)
     end
-
-    it "should be accesible as the deprecated default_wait_time" do
-      expect(Capybara.send(:config)).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time= is deprecated, please use #default_max_wait_time= instead')
-      expect(Capybara.send(:config)).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time is deprecated, please use #default_max_wait_time instead')
-      @previous_default_time = Capybara.default_max_wait_time
-      Capybara.default_wait_time = 5
-      expect(Capybara.default_wait_time).to eq(5)
-      expect(Capybara.default_max_wait_time).to eq(5)
-    end
   end
 
   describe '.register_driver' do
@@ -37,7 +29,7 @@ RSpec.describe Capybara do
   describe '.register_server' do
     it "should add a new server" do
       handler = double("handler")
-      Capybara.register_server :blob do |app, port, host|
+      Capybara.register_server :blob do |_app, _port, _host|
         handler.run
       end
 
@@ -46,12 +38,8 @@ RSpec.describe Capybara do
   end
 
   describe ".server" do
-    before do
-      @old_server = Capybara.server
-    end
-
     after do
-      Capybara.server(&@old_server)
+      Capybara.server = :default
     end
 
     it "should default to a proc that calls run_default_server" do
@@ -61,33 +49,18 @@ RSpec.describe Capybara do
     end
 
     it "should return a custom server proc" do
-      server = lambda {|app, port|}
-      Capybara.server(&server)
+      server = ->(_app, _port) {}
+      Capybara.register_server :custom, &server
+      Capybara.server = :custom
       expect(Capybara.server).to eq(server)
     end
 
     it "should have :webrick registered" do
-      require 'rack/handler/webrick'
-      mock_app = double('app')
-      Capybara.server = :webrick
-      expect(Rack::Handler::WEBrick).to receive(:run)
-      Capybara.server.call(mock_app, 8000)
+      expect(Capybara.servers[:webrick]).not_to be_nil
     end
 
     it "should have :puma registered" do
-      require 'rack/handler/puma'
-      mock_app = double('app')
-      Capybara.server = :puma
-      expect(Rack::Handler::Puma).to receive(:run).with(mock_app, hash_including(Host: nil, Port: 8000))
-      Capybara.server.call(mock_app, 8000)
-    end
-
-    it "should pass options to server" do
-      require 'rack/handler/puma'
-      mock_app = double('app')
-      Capybara.server = :puma, { Silent: true }
-      expect(Rack::Handler::Puma).to receive(:run).with(mock_app, hash_including(Host: nil, Port: 9000, Silent: true))
-      Capybara.server.call(mock_app, 9000)
+      expect(Capybara.servers[:puma]).not_to be_nil
     end
   end
 
@@ -116,7 +89,7 @@ RSpec.describe Capybara do
       Capybara.default_host = old_default
     end
 
-    it "should warn if not a valid URL" do
+    it "should raise if not a valid URL" do
       expect { Capybara.default_host = "www.example.com" }.to raise_error(ArgumentError, /Capybara\.default_host should be set to a url/)
     end
 
@@ -124,26 +97,14 @@ RSpec.describe Capybara do
       expect { Capybara.default_host = "http://www.example.com" }.not_to raise_error
     end
   end
-
-  describe "configure" do
-    it 'deprecates calling non configuration option methods in configure' do
-      expect_any_instance_of(Kernel).to receive(:warn).
-        with('Calling register_driver from Capybara.configure is deprecated - please call it on Capybara directly ( Capybara.register_driver(...) )')
-      Capybara.configure do |config|
-        config.register_driver(:random_name) do
-          #just a random block
-        end
-      end
-    end
-  end
 end
 
 RSpec.describe Capybara::Session do
   context 'with nonexistent driver' do
     it "should raise an error" do
-      expect {
+      expect do
         Capybara::Session.new(:quox, TestApp).driver
-      }.to raise_error(Capybara::DriverNotFoundError)
+      end.to raise_error(Capybara::DriverNotFoundError)
     end
   end
 end

data/spec/dsl_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'capybara/dsl'
 
@@ -6,17 +7,8 @@ class TestClass
   include Capybara::DSL
 end
 
-Capybara::SpecHelper.run_specs TestClass.new, "DSL", capybara_skip: [
-  :js,
-  :modals,
-  :screenshot,
-  :frames,
-  :windows,
-  :send_keys,
-  :server,
-  :hover,
-  :about_scheme,
-  :psc
+Capybara::SpecHelper.run_specs TestClass.new, "DSL", capybara_skip: %i[
+  js modals screenshot frames windows send_keys server hover about_scheme psc
 ]
 
 RSpec.describe Capybara::DSL do
@@ -93,7 +85,7 @@ RSpec.describe Capybara::DSL do
       driver_before_block = Capybara.current_driver
       begin
         Capybara.using_driver(:selenium) { raise "ohnoes!" }
-      rescue Exception
+      rescue Exception # rubocop:disable Lint/RescueException
       end
       expect(Capybara.current_driver).to eq(driver_before_block)
     end
@@ -211,7 +203,7 @@ RSpec.describe Capybara::DSL do
         Capybara.using_session(:raise) do
           raise
         end
-      rescue Exception
+      rescue Exception # rubocop:disable Lint/RescueException
       end
       expect(Capybara.session_name).to eq(:default)
     end

data/spec/filter_set_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Capybara::Selector::FilterSet do
@@ -8,8 +9,8 @@ RSpec.describe Capybara::Selector::FilterSet do
 
   it "allows node filters" do
     fs = Capybara::Selector::FilterSet.add(:test) do
-      filter(:node_test, :boolean) { |node, value| true }
-      expression_filter(:expression_test, :boolean) { |expr, value| true }
+      filter(:node_test, :boolean) { |_node, _value| true }
+      expression_filter(:expression_test, :boolean) { |_expr, _value| true }
     end
 
     expect(fs.node_filters.keys).to include(:node_test)
@@ -18,8 +19,8 @@ RSpec.describe Capybara::Selector::FilterSet do
 
   it "allows expression filters" do
     fs = Capybara::Selector::FilterSet.add(:test) do
-      filter(:node_test, :boolean) { |node, value| true }
-      expression_filter(:expression_test, :boolean) { |expr, value| true }
+      filter(:node_test, :boolean) { |_node, _value| true }
+      expression_filter(:expression_test, :boolean) { |_expr, _value| true }
     end
 
     expect(fs.expression_filters.keys).to include(:expression_test)

data/spec/fixtures/selenium_driver_rspec_failure.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'selenium-webdriver'
 
 RSpec.describe Capybara::Selenium::Driver do
   it "should exit with a non-zero exit status" do
     options = { browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym }
-    options[:desired_capabilities] = Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false) if ENV['LEGACY_FIREFOX']
     browser = Capybara::Selenium::Driver.new(TestApp, options).browser
+    expect(browser).to be
     expect(true).to eq(false)
   end
 end