capybara 3.31.0 → 3.32.0

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

@@ -92,11 +92,6 @@ private
     end
   end
 
-  def w3c?
-    (defined?(Selenium::WebDriver::VERSION) && (Selenium::WebDriver::VERSION.to_f >= 4)) ||
-      capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities)
-  end
-
   def browser_version(to_float = true)
     caps = capabilities
     ver = (caps[:browser_version] || caps[:version])
@@ -116,10 +111,6 @@ private
     capabilities['chrome']['chromedriverVersion'].split(' ')[0]
   end
 
-  def capabilities
-    driver.browser.capabilities
-  end
-
   def native_displayed?
     (driver.options[:native_displayed] != false) &&
       (w3c? && chromedriver_supports_displayed_endpoint?) &&

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

@@ -85,7 +85,7 @@ private
     (driver.options[:native_displayed] != false) && !ENV['DISABLE_CAPYBARA_SELENIUM_OPTIMIZATIONS']
   end
 
-  def click_with_options(click_options)
+  def perform_with_options(click_options)
     # Firefox/marionette has an issue clicking with offset near viewport edge
     # scroll element to middle just in case
     scroll_to_center if click_options.coords?

data/lib/capybara/selenium/patches/action_pauser.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module ActionPauser
+  def initialize(mouse, keyboard)
+    super
+    @devices[:pauser] = Pauser.new
+  end
+
+  def pause(duration)
+    @actions << [:pauser, :pause, [duration]]
+    self
+  end
+
+  class Pauser
+    def pause(duration)
+      sleep duration
+    end
+  end
+
+  private_constant :Pauser
+end
+
+::Selenium::WebDriver::ActionBuilder.prepend ActionPauser if defined? ::Selenium::WebDriver::ActionBuilder

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

@@ -153,6 +153,7 @@ $(function() {
   });
   $('#click-test').on({
     click: function(e) {
+      window.click_delay = ((new Date().getTime()) - window.mouse_down_time)/1000.0;
       var desc = "";
       if (e.altKey) desc += 'alt ';
       if (e.ctrlKey) desc += 'control ';
@@ -179,6 +180,16 @@ $(function() {
       if (e.shiftKey) desc += 'shift ';
       var pos = this.getBoundingClientRect();
       $(this).after('<a id="has-been-right-clicked" href="#">Has been ' + desc + 'right clicked at ' + (e.clientX - pos.left) + ',' + (e.clientY - pos.top) + '</a>');
+    },
+    mousedown: function(e) {
+      window.click_delay = undefined;
+      window.right_click_delay = undefined;
+      window.mouse_down_time = new Date().getTime();
+    },
+    mouseup: function(e) {
+      if (e.button == 2){
+        window.right_click_delay = ((new Date().getTime()) - window.mouse_down_time)/1000.0;
+      }
     }
   });
   $('#open-alert').click(function() {

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

@@ -47,6 +47,15 @@ Capybara::SpecHelper.spec '#fill_in' do
     expect(extract_results(@session)['description']).to eq('Texty text')
   end
 
+  it 'should fill in a textarea in a reasonable time by default' do
+    textarea = @session.find(:fillable_field, 'form[description]')
+    value = 'a' * 4000
+    start = Time.now
+    textarea.fill_in(with: value)
+    expect(Time.now.to_f).to be_within(0.25).of start.to_f
+    expect(textarea.value).to eq value
+  end
+
   it 'should fill in a password field by id' do
     @session.fill_in('form_password', with: 'supasikrit')
     @session.click_button('awesome')

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

@@ -451,32 +451,35 @@ Capybara::SpecHelper.spec '#find' do
   context 'with spatial filters', requires: [:spatial] do
     before do
       @session.visit('/spatial')
-      @center = @session.find(:css, 'div.center')
+    end
+
+    let :center do
+      @session.find(:css, 'div.center')
     end
 
     it 'should find an element above another element' do
-      expect(@session.find(:css, 'div:not(.corner)', above: @center).text).to eq('2')
+      expect(@session.find(:css, 'div:not(.corner)', above: center).text).to eq('2')
     end
 
     it 'should find an element below another element' do
-      expect(@session.find(:css, 'div:not(.corner):not(.footer)', below: @center).text).to eq('8')
+      expect(@session.find(:css, 'div:not(.corner):not(.footer)', below: center).text).to eq('8')
     end
 
     it 'should find an element left of another element' do
-      expect(@session.find(:css, 'div:not(.corner)', left_of: @center).text).to eq('4')
+      expect(@session.find(:css, 'div:not(.corner)', left_of: center).text).to eq('4')
     end
 
     it 'should find an element right of another element' do
-      expect(@session.find(:css, 'div:not(.corner)', right_of: @center).text).to eq('6')
+      expect(@session.find(:css, 'div:not(.corner)', right_of: center).text).to eq('6')
     end
 
     it 'should combine spatial filters' do
-      expect(@session.find(:css, 'div', left_of: @center, above: @center).text).to eq('1')
-      expect(@session.find(:css, 'div', right_of: @center, below: @center).text).to eq('9')
+      expect(@session.find(:css, 'div', left_of: center, above: center).text).to eq('1')
+      expect(@session.find(:css, 'div', right_of: center, below: center).text).to eq('9')
     end
 
     it 'should find an element "near" another element' do
-      expect(@session.find(:css, 'div.distance', near: @center).text).to eq('2')
+      expect(@session.find(:css, 'div.distance', near: center).text).to eq('2')
     end
   end
 

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

@@ -234,18 +234,21 @@ Capybara::SpecHelper.spec '#has_css?' do
   context 'with spatial requirements', requires: [:spatial] do
     before do
       @session.visit('/spatial')
-      @center = @session.find(:css, '.center')
+    end
+
+    let :center do
+      @session.find(:css, '.center')
     end
 
     it 'accepts spatial options' do
-      expect(@session).to have_css('div', above: @center).thrice
-      expect(@session).to have_css('div', above: @center, right_of: @center).once
+      expect(@session).to have_css('div', above: center).thrice
+      expect(@session).to have_css('div', above: center, right_of: center).once
     end
 
     it 'supports spatial sugar' do
-      expect(@session).to have_css('div').left_of(@center).thrice
-      expect(@session).to have_css('div').below(@center).right_of(@center).once
-      expect(@session).to have_css('div').near(@center).exactly(8).times
+      expect(@session).to have_css('div').left_of(center).thrice
+      expect(@session).to have_css('div').below(center).right_of(center).once
+      expect(@session).to have_css('div').near(center).exactly(8).times
     end
   end
 

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

@@ -808,7 +808,10 @@ Capybara::SpecHelper.spec 'node' do
     context 'offset', requires: [:js] do
       before do
         @session.visit('/offset')
-        @clicker = @session.find(:id, 'clicker')
+      end
+
+      let :clicker do
+        @session.find(:id, 'clicker')
       end
 
       context 'when w3c_click_offset is false' do
@@ -817,17 +820,17 @@ Capybara::SpecHelper.spec 'node' do
         end
 
         it 'should offset from top left of element' do
-          @clicker.click(x: 10, y: 5)
+          clicker.click(x: 10, y: 5)
           expect(@session).to have_text(/clicked at 110,105/)
         end
 
         it 'should offset outside the element' do
-          @clicker.click(x: -15, y: -10)
+          clicker.click(x: -15, y: -10)
           expect(@session).to have_text(/clicked at 85,90/)
         end
 
         it 'should default to click the middle' do
-          @clicker.click
+          clicker.click
           expect(@session).to have_text(/clicked at 150,150/)
         end
       end
@@ -838,21 +841,30 @@ Capybara::SpecHelper.spec 'node' do
         end
 
         it 'should offset from center of element' do
-          @clicker.click(x: 10, y: 5)
+          clicker.click(x: 10, y: 5)
           expect(@session).to have_text(/clicked at 160,155/)
         end
 
         it 'should offset outside from center of element' do
-          @clicker.click(x: -65, y: -60)
+          clicker.click(x: -65, y: -60)
           expect(@session).to have_text(/clicked at 85,90/)
         end
 
         it 'should default to click the middle' do
-          @clicker.click
+          clicker.click
           expect(@session).to have_text(/clicked at 150,150/)
         end
       end
     end
+
+    context 'delay', requires: [:js] do
+      it 'should delay the mouse up' do
+        @session.visit('with_js')
+        @session.find(:css, '#click-test').click(delay: 2)
+        delay = @session.evaluate_script('window.click_delay')
+        expect(delay).to be >= 2
+      end
+    end
   end
 
   describe '#double_click', requires: [:js] do
@@ -891,7 +903,10 @@ Capybara::SpecHelper.spec 'node' do
     context 'offset', requires: [:js] do
       before do
         @session.visit('/offset')
-        @clicker = @session.find(:id, 'clicker')
+      end
+
+      let :clicker do
+        @session.find(:id, 'clicker')
       end
 
       context 'when w3c_click_offset is false' do
@@ -900,17 +915,17 @@ Capybara::SpecHelper.spec 'node' do
         end
 
         it 'should offset from top left of element' do
-          @clicker.double_click(x: 10, y: 5)
+          clicker.double_click(x: 10, y: 5)
           expect(@session).to have_text(/clicked at 110,105/)
         end
 
         it 'should offset outside the element' do
-          @clicker.double_click(x: -15, y: -10)
+          clicker.double_click(x: -15, y: -10)
           expect(@session).to have_text(/clicked at 85,90/)
         end
 
         it 'should default to click the middle' do
-          @clicker.double_click
+          clicker.double_click
           expect(@session).to have_text(/clicked at 150,150/)
         end
       end
@@ -921,17 +936,17 @@ Capybara::SpecHelper.spec 'node' do
         end
 
         it 'should offset from center of element' do
-          @clicker.double_click(x: 10, y: 5)
+          clicker.double_click(x: 10, y: 5)
           expect(@session).to have_text(/clicked at 160,155/)
         end
 
         it 'should offset outside from center of element' do
-          @clicker.double_click(x: -65, y: -60)
+          clicker.double_click(x: -65, y: -60)
           expect(@session).to have_text(/clicked at 85,90/)
         end
 
         it 'should default to click the middle' do
-          @clicker.double_click
+          clicker.double_click
           expect(@session).to have_text(/clicked at 150,150/)
         end
       end
@@ -974,7 +989,10 @@ Capybara::SpecHelper.spec 'node' do
     context 'offset', requires: [:js] do
       before do
         @session.visit('/offset')
-        @clicker = @session.find(:id, 'clicker')
+      end
+
+      let :clicker do
+        @session.find(:id, 'clicker')
       end
 
       context 'when w3c_click_offset is false' do
@@ -983,17 +1001,17 @@ Capybara::SpecHelper.spec 'node' do
         end
 
         it 'should offset from top left of element' do
-          @clicker.right_click(x: 10, y: 5)
+          clicker.right_click(x: 10, y: 5)
           expect(@session).to have_text(/clicked at 110,105/)
         end
 
         it 'should offset outside the element' do
-          @clicker.right_click(x: -15, y: -10)
+          clicker.right_click(x: -15, y: -10)
           expect(@session).to have_text(/clicked at 85,90/)
         end
 
         it 'should default to click the middle' do
-          @clicker.right_click
+          clicker.right_click
           expect(@session).to have_text(/clicked at 150,150/)
         end
       end
@@ -1004,21 +1022,30 @@ Capybara::SpecHelper.spec 'node' do
         end
 
         it 'should offset from center of element' do
-          @clicker.right_click(x: 10, y: 5)
+          clicker.right_click(x: 10, y: 5)
           expect(@session).to have_text(/clicked at 160,155/)
         end
 
         it 'should offset outside from center of element' do
-          @clicker.right_click(x: -65, y: -60)
+          clicker.right_click(x: -65, y: -60)
           expect(@session).to have_text(/clicked at 85,90/)
         end
 
         it 'should default to click the middle' do
-          @clicker.right_click
+          clicker.right_click
           expect(@session).to have_text(/clicked at 150,150/)
         end
       end
     end
+
+    context 'delay', requires: [:js] do
+      it 'should delay the mouse up' do
+        @session.visit('with_js')
+        @session.find(:css, '#click-test').right_click(delay: 2)
+        delay = @session.evaluate_script('window.right_click_delay')
+        expect(delay).to be >= 2
+      end
+    end
   end
 
   describe '#send_keys', requires: [:send_keys] do

data/lib/capybara/spec/session/window/window_spec.rb

@@ -141,12 +141,12 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#maximize' do
-    before do
-      @initial_size = @session.current_window.size
+    let! :initial_size do
+      @session.current_window.size
     end
 
     after do
-      @session.current_window.resize_to(*@initial_size)
+      @session.current_window.resize_to(*initial_size)
       sleep 0.5
     end
 
@@ -176,7 +176,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
 
       expect(@session.current_window).to eq(orig_window)
       # Maximizing the browser affects all tabs so this may not be valid in real browsers
-      # expect(@session.current_window.size).to eq(@initial_size)
+      # expect(@session.current_window.size).to eq(initial_size)
 
       ow_width, ow_height = other_window.size
       expect(ow_width).to be > 400
@@ -185,12 +185,12 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#fullscreen' do
-    before do
-      @initial_size = @session.current_window.size
+    let! :initial_size do
+      @session.current_window.size
     end
 
     after do
-      @session.current_window.resize_to(*@initial_size)
+      @session.current_window.resize_to(*initial_size)
       sleep 1
     end
 

data/lib/capybara/spec/spec_helper.rb

@@ -60,7 +60,7 @@ module Capybara
         RSpec.describe Capybara::Session, name, options do # rubocop:disable RSpec/EmptyExampleGroup
           include Capybara::SpecHelper
           include Capybara::RSpecMatchers
-          # rubocop:disable RSpec/ScatteredSetup
+
           before do |example|
             @session = session
             instance_exec(example, &filter_block) if filter_block
@@ -81,7 +81,6 @@ module Capybara
           before :each, :exact_false do
             Capybara.exact = false
           end
-          # rubocop:enable RSpec/ScatteredSetup
 
           specs.each do |spec_name, spec_options, block|
             describe spec_name, *spec_options do # rubocop:disable RSpec/EmptyExampleGroup

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

@@ -517,6 +517,7 @@ New line after and before textarea tag
 
   <p>
     <input type="submit" name="form[mediocre]" id="mediocre" value="med" aria-label="Mediocre Button"/>
+    <input type="submit" formaction="/form/get?bar=foo" id="mediocre2" value="med2"/>
   <p>
 </form>
 

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

@@ -36,8 +36,8 @@
 </p>
 
 <p>
-  <input type="text" id="test_field" data-test-id="test_id" value="monkey"/>
-  <input type="text" readonly="readonly" value="should not change" />
+  <input type="text" id="test_field" spellcheck="TRUE" data-test-id="test_id" value="monkey"/>
+  <input type="text" readonly="readonly" spellcheck="FALSE" value="should not change" />
   <textarea id="normal" data-other-test-id="test_id">
 banana</textarea>
   <textarea id="additional_newline">

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.31.0'
+  VERSION = '3.32.0'
 end

data/spec/rack_test_spec.rb

@@ -127,6 +127,18 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
           session.find(:label, 'Female').click
           expect(session).to have_unchecked_field('gender_male')
         end
+
+        it 'should rewrite the forms action query for get submission' do
+          session.visit('/form')
+          session.click_button('mediocre')
+          expect(session).not_to have_current_path(/foo|bar/)
+        end
+
+        it 'should rewrite the submit buttons formaction query for get submission' do
+          session.visit('/form')
+          session.click_button('mediocre2')
+          expect(session).not_to have_current_path(/foo|bar/)
+        end
       end
     end