capybara 2.15.0 → 3.0.0

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
@@ -69,7 +67,7 @@ module Capybara
     # === Configurable options
     #
     # [app_host = String/nil]             The default host to use when giving a relative URL to visit, must be a valid URL e.g. http://www.example.com
-    # [always_include_port = Boolean]     Whether the Rack server's port should automatically be inserted into every visited URL (Default: false)
+    # [always_include_port = Boolean]     Whether the Rack server's port should automatically be inserted into every visited URL unless another port is explicitly specified (Default: false)
     # [asset_host = String]               Where dynamic assets are hosted - will be prepended to relative asset locations if present (Default: nil)
     # [run_server = Boolean]              Whether to start a Rack server for the given Rack app (Default: true)
     # [raise_server_errors = Boolean]     Should errors raised in the server be raised in the tests? (Default: true)
@@ -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
@@ -35,37 +27,19 @@ RSpec.describe Capybara do
   end
 
   describe '.register_server' do
-    before do
-      Capybara.reuse_server = false
-      @old_server = Capybara.server
-    end
-
-    after do
-      Capybara.server(&@old_server)
-      Capybara.reuse_server = true
-    end
-
     it "should add a new server" do
-      skip "JRuby fails this because of path issues to geckodriver I think. Its tested in other runs - not worth figuring out at this time" if RUBY_PLATFORM == 'java'
-
-      require 'rack/handler/webrick'
-      Capybara.register_server :blob do |app, port, host|
-        Rack::Handler::WEBrick.run(app, Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0))
+      handler = double("handler")
+      Capybara.register_server :blob do |_app, _port, _host|
+        handler.run
       end
-      Capybara.server = :blob
-      session = Capybara::Session.new(:selenium, TestApp.new)
-      session.visit('/')
-      expect(session.body).to include("Hello world!")
+
+      expect(Capybara.servers).to have_key(:blob)
     end
   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
@@ -75,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
 
@@ -130,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
 
@@ -138,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 non-existant driver' 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

data/spec/fixtures/selenium_driver_rspec_success.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 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
+    browser = Capybara::Selenium::Driver.new(TestApp, options).browser
+    expect(browser).to be
     expect(true).to eq(true)
   end
 end

data/spec/minitest_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'capybara/minitest'
 
@@ -37,7 +38,7 @@ class MinitestTest < Minitest::Test
     assert_xpath('.//select[@id="form_title"]')
     assert_xpath('.//select', count: 1) { |el| el[:id] == "form_title" }
     assert_no_xpath('.//select[@id="not_form_title"]')
-    assert_no_xpath('.//select') { |el| el[:id] == "not_form_title"}
+    assert_no_xpath('.//select') { |el| el[:id] == "not_form_title" }
     refute_xpath('.//select[@id="not_form_title"]')
   end
 
@@ -49,13 +50,13 @@ class MinitestTest < Minitest::Test
   def test_assert_link
     visit('/with_html')
     assert_link('A link')
-    assert_link(count: 1){ |el| el.text == 'A link'}
+    assert_link(count: 1) { |el| el.text == 'A link' }
     assert_no_link('Not on page')
   end
 
   def test_assert_button
     assert_button('fresh_btn')
-    assert_button(count: 1){ |el| el[:id] == 'fresh_btn' }
+    assert_button(count: 1) { |el| el[:id] == 'fresh_btn' }
     assert_no_button('not_btn')
   end
 
@@ -88,6 +89,14 @@ class MinitestTest < Minitest::Test
     refute_table('not_on_form')
   end
 
+  def test_assert_all_of_selectors
+    assert_all_of_selectors(:css, 'select#form_other_title', 'input#form_last_name')
+  end
+
+  def test_assert_none_of_selectors
+    assert_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
+  end
+
   def test_assert_matches_selector
     assert_matches_selector(find(:field, 'customer_email'), :field, 'customer_email')
     assert_not_matches_selector(find(:select, 'form_title'), :field, 'customer_email')
@@ -117,6 +126,6 @@ RSpec.describe 'capybara/minitest' do
     reporter.start
     MinitestTest.run reporter, {}
     reporter.report
-    expect(output.string).to include("15 runs, 42 assertions, 0 failures, 0 errors, 0 skips")
+    expect(output.string).to include("17 runs, 44 assertions, 0 failures, 0 errors, 0 skips")
   end
 end

data/spec/minitest_spec_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'capybara/minitest'
 require 'capybara/minitest/spec'
@@ -39,7 +40,7 @@ class MinitestSpecTest < Minitest::Spec
     page.wont_have_xpath('.//input[@id="customer_email"]') { |el| el[:id] == "not_customer_email" }
     select = find(:select, 'form_title')
     select.must_have_xpath('.//option[@class="title"]')
-    select.must_have_xpath('.//option', count: 1) { |option| option[:class] != 'title' && !option.disabled?}
+    select.must_have_xpath('.//option', count: 1) { |option| option[:class] != 'title' && !option.disabled? }
     select.wont_have_xpath('.//input[@id="customer_email"]')
   end
 
@@ -88,6 +89,14 @@ class MinitestSpecTest < Minitest::Spec
     page.wont_have_table('not_on_form')
   end
 
+  it "supports all_of_selectors expectations" do
+    page.must_have_all_of_selectors(:css, 'select#form_other_title', 'input#form_last_name')
+  end
+
+  it "supports none_of_selectors expectations" do
+    page.must_have_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
+  end
+
   it "supports match_selector expectations" do
     find(:field, 'customer_email').must_match_selector(:field, 'customer_email')
     find(:select, 'form_title').wont_match_selector(:field, 'customer_email')
@@ -120,8 +129,8 @@ RSpec.describe 'capybara/minitest/spec' do
     reporter.start
     MinitestSpecTest.run reporter, {}
     reporter.report
-    expect(output.string).to include("16 runs, 39 assertions, 1 failures, 0 errors, 0 skips")
-    #Make sure error messages are displayed
+    expect(output.string).to include("18 runs, 41 assertions, 1 failures, 0 errors, 0 skips")
+    # Make sure error messages are displayed
     expect(output.string).to include('expected to find visible select box "non_existing_form_title" that is not disabled but there were no matches')
   end
 end

data/spec/per_session_config_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'capybara/dsl'
 
@@ -7,13 +8,13 @@ RSpec.describe Capybara::SessionConfig do
     it "defaults to global session options" do
       Capybara.threadsafe = true
       session = Capybara::Session.new(:rack_test, TestApp)
-      [:default_host, :app_host, :save_and_open_page_path,
-       :always_include_port, :run_server, :default_selector, :default_max_wait_time, :ignore_hidden_elements,
-       :automatic_reload, :match, :exact, :raise_server_errors, :visible_text_only, :wait_on_first_by_default,
-       :automatic_label_click, :enable_aria_label,
-       :save_path, :exact_options, :asset_host].each do |m|
-         expect(session.config.public_send(m)).to eq Capybara.public_send(m)
-       end
+      %i[default_host app_host always_include_port run_server
+         default_selector default_max_wait_time ignore_hidden_elements
+         automatic_reload match exact raise_server_errors visible_text_only
+         automatic_label_click enable_aria_label save_path
+         asset_host].each do |m|
+           expect(session.config.public_send(m)).to eq Capybara.public_send(m)
+         end
     end
 
     it "doesn't change global session when changed" do
@@ -64,4 +65,4 @@ RSpec.describe Capybara::SessionConfig do
       expect { Capybara.threadsafe = true }.to raise_error(/Threadsafe setting cannot be changed once a session is created/)
     end
   end
-end
+end

data/spec/rack_test_spec.rb

@@ -1,20 +1,21 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 module TestSessions
   RackTest = Capybara::Session.new(:rack_test, TestApp)
 end
 
-Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", capybara_skip: [
-  :js,
-  :modals,
-  :screenshot,
-  :frames,
-  :windows,
-  :send_keys,
-  :server,
-  :hover,
-  :about_scheme,
+Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", capybara_skip: %i[
+  js
+  modals
+  screenshot
+  frames
+  windows
+  send_keys
+  server
+  hover
+  about_scheme
 ]
 
 RSpec.describe Capybara::Session do
@@ -64,10 +65,11 @@ RSpec.describe Capybara::Session do
 
     describe "#fill_in" do
       it "should warn that :fill_options are not supported" do
-        expect_any_instance_of(Capybara::Node::Element).to receive(:warn)
-          .with("Options passed to Capybara::Node#set but the driver doesn't support them")
+        expect_any_instance_of(Capybara::RackTest::Node).to receive(:warn)
+          .with("Options passed to Node#set but the RackTest driver doesn't support any - ignoring")
         @session.visit "/with_html"
-        @session.fill_in 'test_field', with: 'not_moneky', fill_options: { random: true }
+        @session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true }
+        expect(@session).to have_field('test_field', with: 'not_monkey')
       end
     end
 
@@ -132,27 +134,27 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':headers option' do
     it 'should always set headers' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       @driver.visit('/get_header')
       expect(@driver.html).to include('foobar')
     end
 
     it 'should keep headers on link clicks' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       @driver.visit('/header_links')
       @driver.find_xpath('.//a').first.click
       expect(@driver.html).to include('foobar')
     end
 
     it 'should keep headers on form submit' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       @driver.visit('/header_links')
       @driver.find_xpath('.//input').first.click
       expect(@driver.html).to include('foobar')
     end
 
     it 'should keep headers on redirects' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       @driver.visit('/get_header_via_redirect')
       expect(@driver.html).to include('foobar')
     end
@@ -218,11 +220,10 @@ module CSSHandlerIncludeTester
     raise 'should never be called'
   end
 end
-include CSSHandlerIncludeTester
+include CSSHandlerIncludeTester # rubocop:disable Style/MixinUsage
 
-RSpec.describe  Capybara::RackTest::CSSHandlers do
+RSpec.describe Capybara::RackTest::CSSHandlers do
   it "should not be extended by global includes" do
     expect(Capybara::RackTest::CSSHandlers.new).not_to respond_to(:dont_extend_css_handler)
   end
 end
-