capybara 2.10.1 → 2.11.0

data/lib/capybara/session/matchers.rb

@@ -17,13 +17,7 @@ module Capybara
     # @return [true]
     #
     def assert_current_path(path, options={})
-      query = Capybara::Queries::CurrentPathQuery.new(path, options)
-      document.synchronize(query.wait) do
-        unless query.resolves_for?(self)
-          raise Capybara::ExpectationNotMet, query.failure_message
-        end
-      end
-      return true
+      _verify_current_path(path,options) { |query| raise Capybara::ExpectationNotMet, query.failure_message unless query.resolves_for?(self) }
     end
 
     ##
@@ -34,13 +28,7 @@ module Capybara
     # @return [true]
     #
     def assert_no_current_path(path, options={})
-      query = Capybara::Queries::CurrentPathQuery.new(path, options)
-      document.synchronize(query.wait) do
-        if query.resolves_for?(self)
-          raise Capybara::ExpectationNotMet, query.negative_failure_message
-        end
-      end
-      return true
+      _verify_current_path(path,options) { |query| raise Capybara::ExpectationNotMet, query.negative_failure_message if query.resolves_for?(self) }
     end
 
     ##
@@ -66,5 +54,15 @@ module Capybara
     rescue Capybara::ExpectationNotMet
       return false
     end
+
+    private
+
+    def _verify_current_path(path, options)
+      query = Capybara::Queries::CurrentPathQuery.new(path, options)
+      document.synchronize(query.wait) do
+        yield(query)
+      end
+      return true
+    end
   end
 end

data/lib/capybara/session.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'capybara/session/matchers'
+require 'addressable/uri'
 
 module Capybara
 
@@ -125,7 +126,8 @@ module Capybara
         begin
           raise CapybaraError, "Your application server raised an error - It has been raised in your test code because Capybara.raise_server_errors == true"
         rescue CapybaraError
-          raise @server.error.class, @server.error.message, @server.error.backtrace
+          #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
         end
       end
     ensure
@@ -167,7 +169,11 @@ module Capybara
     # @return [String] Path of the current page, without any domain information
     #
     def current_path
-      path = URI.parse(current_url).path
+      # Addressable parsing is more lenient than URI
+      uri = Addressable::URI.parse(current_url)
+      # Addressable doesn't support opaque URIs - we want nil here
+      return nil if uri.scheme == "about"
+      path = uri.path
       path if path and not path.empty?
     end
 
@@ -263,7 +269,7 @@ module Capybara
     # block, any command to Capybara will be handled as though it were scoped
     # to the given element.
     #
-    #     within(:xpath, '//div[@id="delivery-address"]') do
+    #     within(:xpath, './/div[@id="delivery-address"]') do
     #       fill_in('Street', with: '12 Main Street')
     #     end
     #
@@ -587,11 +593,7 @@ module Capybara
     #   @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
     #
     def accept_alert(text_or_options=nil, options={}, &blk)
-      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
-      options[:text] ||= text_or_options unless text_or_options.nil?
-      options[:wait] ||= Capybara.default_max_wait_time
-
-      driver.accept_modal(:alert, options, &blk)
+      accept_modal(:alert, text_or_options, options, &blk)
     end
 
     ##
@@ -601,11 +603,7 @@ module Capybara
     # @macro modal_params
     #
     def accept_confirm(text_or_options=nil, options={}, &blk)
-      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
-      options[:text] ||= text_or_options unless text_or_options.nil?
-      options[:wait] ||= Capybara.default_max_wait_time
-
-      driver.accept_modal(:confirm, options, &blk)
+      accept_modal(:confirm, text_or_options, options, &blk)
     end
 
     ##
@@ -615,11 +613,7 @@ module Capybara
     # @macro modal_params
     #
     def dismiss_confirm(text_or_options=nil, options={}, &blk)
-      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
-      options[:text] ||= text_or_options unless text_or_options.nil?
-      options[:wait] ||= Capybara.default_max_wait_time
-
-      driver.dismiss_modal(:confirm, options, &blk)
+      dismiss_modal(:confirm, text_or_options, options, &blk)
     end
 
     ##
@@ -630,11 +624,7 @@ module Capybara
     # @option options [String] :with   Response to provide to the prompt
     #
     def accept_prompt(text_or_options=nil, options={}, &blk)
-      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
-      options[:text] ||= text_or_options unless text_or_options.nil?
-      options[:wait] ||= Capybara.default_max_wait_time
-
-      driver.accept_modal(:prompt, options, &blk)
+      accept_modal(:prompt, text_or_options, options, &blk)
     end
 
     ##
@@ -644,11 +634,7 @@ module Capybara
     # @macro modal_params
     #
     def dismiss_prompt(text_or_options=nil, options={}, &blk)
-      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
-      options[:text] ||= text_or_options unless text_or_options.nil?
-      options[:wait] ||= Capybara.default_max_wait_time
-
-      driver.dismiss_modal(:prompt, options, &blk)
+      dismiss_modal(:prompt, text_or_options, options, &blk)
     end
 
     ##
@@ -751,6 +737,21 @@ module Capybara
     end
 
   private
+    def accept_modal(type, text_or_options, options, &blk)
+      driver.accept_modal(type, modal_options(text_or_options, options), &blk)
+    end
+
+    def dismiss_modal(type, text_or_options, options, &blk)
+      driver.dismiss_modal(type, modal_options(text_or_options, options), &blk)
+    end
+
+    def modal_options(text_or_options, options)
+      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
+      options[:text] ||= text_or_options unless text_or_options.nil?
+      options[:wait] ||= Capybara.default_max_wait_time
+      options
+    end
+
 
     def open_file(path)
       begin
@@ -774,7 +775,7 @@ module Capybara
 
     def default_fn(extension)
       timestamp = Time.new.strftime("%Y%m%d%H%M%S")
-      path = "capybara-#{timestamp}#{rand(10**10)}.#{extension}"
+      "capybara-#{timestamp}#{rand(10**10)}.#{extension}"
     end
 
     def scopes

data/lib/capybara/spec/public/test.js

@@ -123,4 +123,8 @@ $(function() {
       input.disabled = true;
     }, 500)
   })
+  $('#set-storage').click(function(e){
+    sessionStorage.setItem('session', 'session_value');
+    localStorage.setItem('local', 'local value');
+  })
 });

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

@@ -26,7 +26,7 @@ Capybara::SpecHelper.spec '#accept_alert', requires: [:modals] do
   end
 
   it "should accept the alert if the text matches a regexp" do
-    @session.accept_alert /op.{2}ed/ do
+    @session.accept_alert(/op.{2}ed/) do
       @session.click_link('Open alert')
     end
     expect(@session).to have_xpath("//a[@id='open-alert' and @opened='true']")

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

@@ -65,7 +65,7 @@ Capybara::SpecHelper.spec "#attach_file" do
     end
 
     it  "should not break when using HTML5 multiple file input uploading multiple files" do
-      pending "Selenium is buggy on this, see http://code.google.com/p/selenium/issues/detail?id=2239" if @session.respond_to?(:mode) && @session.mode.to_s =~ /^selenium/
+      pending "Selenium is buggy on this, see http://code.google.com/p/selenium/issues/detail?id=2239" if @session.respond_to?(:mode) && @session.mode.to_s =~ /^selenium_(firefox|marionette)/
       @session.attach_file "Multiple Documents", [@test_file_path, @another_test_file_path]
       @session.click_button('Upload Multiple')
       expect(@session.body).to include("2 | ")#number of files

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

@@ -169,6 +169,14 @@ Capybara::SpecHelper.spec "#check" do
           expect(extract_results(@session)['cars']).to include('tesla')
         end
 
+        it "should not wait the full time if label can be clicked" do
+          expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+          start_time = Time.now
+          @session.check('form_cars_tesla', allow_label_click: true, wait: 10)
+          end_time = Time.now
+          expect(end_time - start_time).to be < 10
+        end
+
         it "should check via the label if input is moved off the left edge of the page" do
           expect(@session.find(:checkbox, 'form_cars_pagani', unchecked: true, visible: :all)).to be
           @session.check('form_cars_pagani', allow_label_click: true)

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

@@ -86,4 +86,9 @@ Capybara::SpecHelper.spec "#choose" do
       end
     end
   end
+
+  it "should return the chosen radio button" do
+    el = @session.find(:radio_button, 'gender_male')
+    expect(@session.choose("gender_male")).to eq el
+  end
 end

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

@@ -108,6 +108,11 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
         @session.click_link_or_button('Disabled button', disabled: false)
       end.to raise_error(Capybara::ElementNotFound)
     end
+  end
 
+  it "should return the element clicked" do
+    @session.visit('/with_html')
+    link = @session.find(:link, 'Blank Anchor')
+    expect(@session.click_link_or_button('Blank Anchor')).to eq link
   end
 end

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

@@ -186,4 +186,9 @@ Capybara::SpecHelper.spec '#click_link' do
       expect(@session).to have_content('Another World')
     end
   end
+
+  it "should return element clicked" do
+    el = @session.find(:link, 'Normal Anchor')
+    expect(@session.click_link('Normal Anchor')).to eq el
+  end
 end

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

@@ -28,4 +28,9 @@ Capybara::SpecHelper.spec '#assert_matches_selector' do
   it "should not accept count options" do
     expect { @element.assert_matches_selector(:css, '.number', count: 1) }.to raise_error(ArgumentError)
   end
+
+  it "should accept a filter block" do
+    @element.assert_matches_selector(:css, 'span') { |el| el[:class] == "number" }
+    @element.assert_not_matches_selector(:css,'span') { |el| el[:class] == "not_number" }
+  end
 end

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

@@ -14,4 +14,10 @@ Capybara::SpecHelper.spec '#match_css?' do
     expect(@element).not_to match_css("p a#doesnotexist")
     expect(@element).not_to match_css("p.nosuchclass")
   end
+
+  it "should accept an optional filter block" do
+    # This would be better done with
+    expect(@element).to match_css('span') { |el| el[:class] == "number" }
+    expect(@element).not_to match_css('span') { |el| el[:class] == "not_number" }
+  end
 end

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

@@ -52,6 +52,8 @@ Capybara::SpecHelper.spec '#match_selector?' do
   it 'should accept a custom filter block' do
     @session.visit('/form')
     cbox = @session.find(:css, '#form_pets_dog')
+    expect(cbox).to match_selector(:checkbox){ |node| node[:id] == "form_pets_dog"}
+    expect(cbox).not_to match_selector(:checkbox){ |node| node[:id] != "form_pets_dog"}
     expect(cbox.matches_selector?(:checkbox){ |node| node[:id] == "form_pets_dog"}).to be true
     expect(cbox.matches_selector?(:checkbox){ |node| node[:id] != "form_pets_dog"}).to be false
   end

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

@@ -181,4 +181,9 @@ Capybara::SpecHelper.spec "#fill_in" do
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
+
+  it "should return the element filled in" do
+    el = @session.find(:fillable_field, 'form_first_name')
+    expect(@session.fill_in('form_first_name', with: 'Harry')).to eq el
+  end
 end

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

@@ -320,7 +320,7 @@ Capybara::SpecHelper.spec '#find' do
         end
         it "raises an error when there is a single inexact matches" do
           expect do
-            result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact:  true)
           end.to raise_error(Capybara::ElementNotFound)
         end
         it "raises an error if there is no match" do

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

@@ -19,6 +19,11 @@ Capybara::SpecHelper.spec '#first' do
     expect(@session.first(@xpath).value).to eq('John')
   end
 
+  it "should warn when unused parameters are passed" do
+    expect_any_instance_of(Kernel).to receive(:warn).with(/Unused parameters passed.*unused text/)
+    @session.first(:css, '.header h2', 'unused text')
+  end
+
   context "with css selectors" do
     it "should find the first element using the given selector" do
       expect(@session.first(:css, 'h1').text).to eq('This is a test')
@@ -48,21 +53,26 @@ Capybara::SpecHelper.spec '#first' do
 
     it "should find nodes regardless of whether they are invisible when false" do
       expect(@session.first(:css, "a#invisible", visible: false)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: false, text: 'hidden link')).not_to be_nil
       expect(@session.first(:css, "a#visible", visible: false)).not_to be_nil
     end
 
     it "should find nodes regardless of whether they are invisible when :all" do
       expect(@session.first(:css, "a#invisible", visible: :all)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :all, text: 'hidden link')).not_to be_nil
       expect(@session.first(:css, "a#visible", visible: :all)).not_to be_nil
     end
 
     it "should find only hidden nodes when :hidden" do
       expect(@session.first(:css, "a#invisible", visible: :hidden)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :hidden, text: 'hidden link')).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :hidden, text: 'not hidden link')).to be_nil
       expect(@session.first(:css, "a#visible", visible: :hidden)).to be_nil
     end
 
     it "should find only visible nodes when :visible" do
       expect(@session.first(:css, "a#invisible", visible: :visible)).to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :visible, text: 'hidden link')).to be_nil
       expect(@session.first(:css, "a#visible", visible: :visible)).not_to be_nil
     end
 

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

@@ -29,6 +29,10 @@ Capybara::SpecHelper.spec '#has_selector?' do
     end
   end
 
+  it "should accept a filter block" do
+    expect(@session).to have_selector(:css, "a", count: 1) { |el| el[:id] == "foo" }
+  end
+
   context "with count" do
     it "should be true if the content is on the page the given number of times" do
       expect(@session).to have_selector("//p", count: 3)
@@ -105,6 +109,13 @@ Capybara::SpecHelper.spec '#has_no_selector?' do
     end
   end
 
+  it "should accept a filter block" do
+    if !defined?(::RSpec::Expectations::Version) || (Gem::Version.new(RSpec::Expectations::Version::STRING) < Gem::Version.new('3.0'))
+      skip "RSpec < 3 doesn't pass the block along to the matcher for the Builtin::Has matcher"
+    end
+    expect(@session).to have_no_selector(:css, "a#foo") { |el| el[:id] != "foo" }
+  end
+
   context "with count" do
     it "should be false if the content is on the page the given number of times" do
       expect(@session).not_to have_no_selector("//p", count: 3)

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

@@ -425,7 +425,18 @@ Capybara::SpecHelper.spec "node" do
         @session.find(:css, 'span')
       end.to raise_error(TestApp::TestAppError) do |e|
         expect(e.cause).to be_a Capybara::CapybaraError
-        expect(e.cause.message).to match /Your application server raised an error/
+        expect(e.cause.message).to match(/Your application server raised an error/)
+      end
+    end
+
+    it "sets an explanatory exception as the cause of server exceptions with errors with initializers", requires: [:server, :js] do
+      skip "This version of ruby doesn't support exception causes" unless Exception.instance_methods.include? :cause
+      quietly { @session.visit("/other_error") }
+      expect do
+        @session.find(:css, 'span')
+      end.to raise_error(TestApp::TestAppOtherError) do |e|
+        expect(e.cause).to be_a Capybara::CapybaraError
+        expect(e.cause.message).to match(/Your application server raised an error/)
       end
     end
   end

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

@@ -35,7 +35,7 @@ Capybara::SpecHelper.spec '#text' do
     Capybara.ignore_hidden_elements = false
     expect(@session.find(:id, "hidden-text").text).to eq('Some of this text is')
   end
-  
+
   it "ignores invisible text if ancestor is invisible" do
     @session.visit('/with_html')
     expect(@session.find(:id, "hidden_via_ancestor", visible: false).text).to eq('')
@@ -52,8 +52,7 @@ Capybara::SpecHelper.spec '#text' do
 
   it "should strip whitespace" do
     @session.visit('/with_html')
-    n = @session.find(:css, '#second')
-    expect(@session.find(:css, '#second').text).to match \
-      /\ADuis aute .* text with whitespace .* est laborum\.\z/
+    @session.find(:css, '#second')
+    expect(@session.find(:css, '#second').text).to match(/\ADuis aute .* text with whitespace .* est laborum\.\z/)
   end
 end

data/lib/capybara/spec/test_app.rb

@@ -6,7 +6,12 @@ require 'yaml'
 
 class TestApp < Sinatra::Base
   class TestAppError < StandardError; end
-
+  class TestAppOtherError < StandardError
+    def initialize(string1, msg)
+      @something = string1
+      @message = msg
+    end
+  end
   set :root, File.dirname(__FILE__)
   set :static, true
   set :raise_errors, true
@@ -125,6 +130,10 @@ class TestApp < Sinatra::Base
     raise TestAppError, "some error"
   end
 
+  get '/other_error' do
+    raise TestAppOtherError.new("something", "other error")
+  end
+
   get '/load_error' do
     raise LoadError
   end

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

@@ -97,7 +97,9 @@
     <p>
       <input id="disable-on-click"/>
     </p>
-
+    <p>
+      <input id="set-storage"/>
+    </p>
     <p>
       <a href="#" id="delayed-page-change">Change page</a>
       <a href="/with_html?options[]=things">Non-escaped query options</a>

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.10.1'
+  VERSION = '2.11.0'
 end

data/lib/capybara/window.rb

@@ -85,7 +85,7 @@ module Capybara
     # @param height [String]  the new window height in pixels
     #
     def resize_to(width, height)
-      @driver.resize_window_to(handle, width, height)
+      wait_for_stable_size { @driver.resize_window_to(handle, width, height) }
     end
 
     ##
@@ -97,7 +97,7 @@ module Capybara
     # @macro about_current
     #
     def maximize
-      @driver.maximize_window(handle)
+      wait_for_stable_size { @driver.maximize_window(handle) }
     end
 
     def eql?(other)
@@ -115,6 +115,22 @@ module Capybara
 
     private
 
+    def wait_for_stable_size(seconds=Capybara.default_max_wait_time)
+      res = yield if block_given?
+      prev_size = size
+      start_time = Capybara::Helpers.monotonic_time
+      begin
+        sleep 0.05
+        cur_size = size
+        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
+    end
+
     def raise_unless_current(what)
       unless current?
         raise Capybara::WindowError, "#{what} not current window is not possible."

data/lib/capybara.rb

@@ -25,7 +25,8 @@ module Capybara
     attr_accessor :server_port, :exact, :match, :exact_options, :visible_text_only, :enable_aria_label
     attr_accessor :default_selector, :default_max_wait_time, :ignore_hidden_elements
     attr_accessor :save_path, :wait_on_first_by_default, :automatic_label_click, :automatic_reload
-    attr_accessor :reuse_server, :raise_server_errors, :server_errors
+    attr_reader :reuse_server
+    attr_accessor :raise_server_errors, :server_errors
     attr_writer :default_driver, :current_driver, :javascript_driver, :session_name, :server_host
     attr_reader :save_and_open_page_path
     attr_accessor :app
@@ -331,7 +332,7 @@ module Capybara
     #
     def reset_sessions!
       #reset in reverse so sessions that started servers are reset last
-      session_pool.reverse_each { |mode, session| session.reset! }
+      session_pool.reverse_each { |_mode, session| session.reset! }
     end
     alias_method :reset!, :reset_sessions!
 
@@ -391,12 +392,12 @@ module Capybara
     end
 
     def app_host=(url)
-      raise ArgumentError.new("Capybara.app_host should be set to a url (http://www.example.com)") unless url.nil? || (url =~ URI::regexp)
+      raise ArgumentError.new("Capybara.app_host should be set to a url (http://www.example.com)") unless url.nil? || (url =~ URI::Parser.new.make_regexp)
       @app_host = url
     end
 
     def default_host=(url)
-      raise ArgumentError.new("Capybara.default_host should be set to a url (http://www.example.com)") unless url.nil? || (url =~ URI::regexp)
+      raise ArgumentError.new("Capybara.default_host should be set to a url (http://www.example.com)") unless url.nil? || (url =~ URI::Parser.new.make_regexp)
       @default_host = url
     end
 
@@ -469,7 +470,7 @@ module Capybara
   require 'capybara/selenium/driver'
 end
 
-Capybara.register_server :default do |app, port, host|
+Capybara.register_server :default do |app, port, _host|
   Capybara.run_default_server(app, port)
 end
 
@@ -479,10 +480,8 @@ Capybara.register_server :webrick do |app, port, host|
 end
 
 Capybara.register_server :puma do |app, port, host|
-  require 'puma'
-  Puma::Server.new(app).tap do |s|
-    s.add_tcp_listener host, port
-  end.run.join
+  require 'rack/handler/puma'
+  Rack::Handler::Puma.run(app, Host: host, Port: port, Threads: "0:4")
 end
 
 Capybara.configure do |config|

data/spec/basic_node_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe Capybara do
 
     it "allows using custom matchers" do
       Capybara.add_selector :lifeform do
-        xpath { |name| "//option[contains(.,'#{name}')]" }
+        xpath { |name| ".//option[contains(.,'#{name}')]" }
       end
       expect(string).to have_selector(:id, "page")
       expect(string).not_to have_selector(:id, 'does-not-exist')

data/spec/capybara_spec.rb

@@ -46,11 +46,14 @@ RSpec.describe Capybara do
     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))
       end
       Capybara.server = :blob
-      session = Capybara::Session.new(:selenium, TestApp.dup)
+      session = Capybara::Session.new(:selenium, TestApp.new)
       session.visit('/')
       expect(session.body).to include("Hello world!")
     end

data/spec/fixtures/selenium_driver_rspec_failure.rb

@@ -1,9 +1,12 @@
 # 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
-    browser = Capybara::Selenium::Driver.new(TestApp, browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym).browser
+    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(true).to eq(false)
   end
 end

data/spec/fixtures/selenium_driver_rspec_success.rb

@@ -1,9 +1,12 @@
 # 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
-    browser = Capybara::Selenium::Driver.new(TestApp, browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym).browser
+    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(true).to eq(true)
   end
 end