capybara 3.30.0 → 3.33.0

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

@@ -193,6 +193,17 @@ Capybara::SpecHelper.spec '#click_button' do
     end
   end
 
+  context 'when Capybara.enable_aria_role = true' do
+    it 'should click on a button role', requires: [:js] do
+      Capybara.enable_aria_role = true
+      @session.using_wait_time(1.5) do
+        @session.visit('/with_js')
+        @session.click_button('ARIA button')
+        expect(@session).to have_button('ARIA button has been clicked')
+      end
+    end
+  end
+
   context 'with fields associated with the form using the form attribute', requires: [:form_attribute] do
     let(:results) { extract_results(@session) }
 

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')
@@ -95,6 +104,26 @@ Capybara::SpecHelper.spec '#fill_in' do
     expect(extract_results(@session)['html5_color']).to eq('#112233')
   end
 
+  describe 'with input[type="range"]' do
+    it 'should set the range slider correctly' do
+      @session.fill_in('form_age', with: 51)
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 51
+    end
+
+    it 'should set the range slider to valid values' do
+      @session.fill_in('form_age', with: '37.6')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 37.5
+    end
+
+    it 'should respect the range slider limits' do
+      @session.fill_in('form_age', with: '3')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 13
+    end
+  end
+
   it 'should fill in a field with a custom type' do
     @session.fill_in('Schmooo', with: 'Schmooo is the game')
     @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_button_spec.rb

@@ -39,6 +39,14 @@ Capybara::SpecHelper.spec '#has_button?' do
     expect(@session).to have_button('awe123', type: 'submit')
     expect(@session).not_to have_button('awe123', type: 'reset')
   end
+
+  it 'should be true for role=button when enable_aria_role: true' do
+    expect(@session).to have_button('ARIA button', enable_aria_role: true)
+  end
+
+  it 'should be false for role=button when enable_aria_role: false' do
+    expect(@session).not_to have_button('ARIA button', enable_aria_role: false)
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_button?' do
@@ -66,4 +74,12 @@ Capybara::SpecHelper.spec '#has_no_button?' do
   it 'should be false for disabled buttons if disabled: false' do
     expect(@session).to have_no_button('Disabled button', disabled: false)
   end
+
+  it 'should be true for role=button when enable_aria_role: false' do
+    expect(@session).to have_no_button('ARIA button', enable_aria_role: false)
+  end
+
+  it 'should be false for role=button when enable_aria_role: true' do
+    expect(@session).not_to have_no_button('ARIA button', enable_aria_role: true)
+  end
 end

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

@@ -185,10 +185,10 @@ Capybara::SpecHelper.spec '#has_css?' do
     end
 
     it 'should be false when content occurs more times than given' do
-      expect(@session).not_to have_css('h2.head', maximum: 4) # edge case
-      expect(@session).not_to have_css('h2', maximum: 3)
+      # expect(@session).not_to have_css('h2.head', maximum: 4) # edge case
+      # expect(@session).not_to have_css('h2', maximum: 3)
       expect(@session).not_to have_css('h2').at_most(3).times
-      expect(@session).not_to have_css('p', maximum: 1)
+      # expect(@session).not_to have_css('p', maximum: 1)
     end
 
     it 'should coerce maximum to an integer' do
@@ -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/has_current_path_spec.rb

@@ -128,11 +128,11 @@ Capybara::SpecHelper.spec '#has_no_current_path?' do
     # Without ignore_query option
     expect do
       expect(@session).not_to have_current_path('/with_js')
-    end. not_to raise_exception
+    end.not_to raise_exception
 
     # With ignore_query option
     expect do
       expect(@session).not_to have_current_path('/with_js', ignore_query: true)
-    end. not_to raise_exception
+    end.not_to raise_exception
   end
 end

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

@@ -60,6 +60,22 @@ Capybara::SpecHelper.spec '#has_field' do
     end
   end
 
+  context 'with validation message', requires: [:html_validation] do
+    it 'should accept a regexp' do
+      @session.fill_in('form_zipcode', with: '1234')
+      expect(@session).to have_field('form_zipcode', validation_message: /match the requested format/)
+      expect(@session).not_to have_field('form_zipcode', validation_message: /random/)
+    end
+
+    it 'should accept a string' do
+      @session.fill_in('form_zipcode', with: '1234')
+      expect(@session).to have_field('form_zipcode', validation_message: 'Please match the requested format.')
+      expect(@session).not_to have_field('form_zipcode', validation_message: 'match the requested format.')
+      @session.fill_in('form_zipcode', with: '12345')
+      expect(@session).to have_field('form_zipcode', validation_message: '')
+    end
+  end
+
   context 'with type' do
     it 'should be true if a field with the given type is on the page' do
       expect(@session).to have_field('First Name', type: 'text')

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

@@ -63,7 +63,7 @@ Capybara::SpecHelper.spec '#has_select?' do
     end
 
     it "should be true even when the selected option invisible, regardless of the select's visibility" do
-      expect(@session).to have_select('Icecream', visible: false, selected: 'Chocolate')
+      expect(@session).to have_select('Icecream', visible: :hidden, selected: 'Chocolate')
       expect(@session).to have_select('Sorbet', selected: 'Vanilla')
     end
   end
@@ -88,7 +88,7 @@ Capybara::SpecHelper.spec '#has_select?' do
     end
 
     it "should be true even when the selected values are invisible, regardless of the select's visibility" do
-      expect(@session).to have_select('Dessert', visible: false, with_options: %w[Pudding Tiramisu])
+      expect(@session).to have_select('Dessert', visible: :hidden, with_options: %w[Pudding Tiramisu])
       expect(@session).to have_select('Cake', with_selected: ['Chocolate Cake', 'Sponge Cake'])
     end
 
@@ -113,7 +113,35 @@ Capybara::SpecHelper.spec '#has_select?' do
     end
 
     it 'should be true even when the options are invisible, if the select itself is invisible' do
-      expect(@session).to have_select('Icecream', visible: false, options: %w[Chocolate Vanilla Strawberry])
+      expect(@session).to have_select('Icecream', visible: :hidden, options: %w[Chocolate Vanilla Strawberry])
+    end
+  end
+
+  context 'with enabled options' do
+    it 'should be true if the listed options exist and are enabled' do
+      expect(@session).to have_select('form_title', enabled_options: %w[Mr Mrs Miss])
+    end
+
+    it 'should be false if the listed options do not exist' do
+      expect(@session).not_to have_select('form_title', enabled_options: ['Not there'])
+    end
+
+    it 'should be false if the listed option exists but is not enabled' do
+      expect(@session).not_to have_select('form_title', enabled_options: %w[Mr Mrs Miss Other])
+    end
+  end
+
+  context 'with disabled options' do
+    it 'should be true if the listed options exist and are disabled' do
+      expect(@session).to have_select('form_title', disabled_options: ['Other'])
+    end
+
+    it 'should be false if the listed options do not exist' do
+      expect(@session).not_to have_select('form_title', disabled_options: ['Not there'])
+    end
+
+    it 'should be false if the listed option exists but is not disabled' do
+      expect(@session).not_to have_select('form_title', disabled_options: %w[Other Mrs])
     end
   end
 
@@ -130,7 +158,7 @@ Capybara::SpecHelper.spec '#has_select?' do
     end
 
     it 'should be true even when the options are invisible, if the select itself is invisible' do
-      expect(@session).to have_select('Icecream', visible: false, with_options: %w[Vanilla Strawberry])
+      expect(@session).to have_select('Icecream', visible: :hidden, with_options: %w[Vanilla Strawberry])
     end
   end
 

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

@@ -61,12 +61,12 @@ Capybara::SpecHelper.spec '#has_selector?' do
     end
 
     it 'should respect visibility setting' do
-      expect(@session).to have_selector(:id, 'hidden-text', text: 'Some of this text is hidden!', visible: false)
-      expect(@session).not_to have_selector(:id, 'hidden-text', text: 'Some of this text is hidden!', visible: true)
+      expect(@session).to have_selector(:id, 'hidden-text', text: 'Some of this text is hidden!', visible: :all)
+      expect(@session).not_to have_selector(:id, 'hidden-text', text: 'Some of this text is hidden!', visible: :visible)
       Capybara.ignore_hidden_elements = false
-      expect(@session).to have_selector(:id, 'hidden-text', text: 'Some of this text is hidden!', visible: false)
+      expect(@session).to have_selector(:id, 'hidden-text', text: 'Some of this text is hidden!', visible: :all)
       Capybara.visible_text_only = true
-      expect(@session).not_to have_selector(:id, 'hidden-text', text: 'Some of this text is hidden!', visible: true)
+      expect(@session).not_to have_selector(:id, 'hidden-text', text: 'Some of this text is hidden!', visible: :visible)
     end
 
     it 'should discard all matches where the given regexp is not matched' do

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

@@ -127,7 +127,11 @@ Capybara::SpecHelper.spec '#has_text?' do
         def to_hash; { value: 'Other hash' } end
       end.new
       @session.visit('/with_html')
-      expect(@session).to have_text(:visible, with_to_hash, {})
+      if RUBY_VERSION >= '2.7'
+        expect(@session).to have_text(:visible, with_to_hash, **{})
+      else
+        expect(@session).to have_text(:visible, with_to_hash, {})
+      end
     end
 
     it 'should fail if passed without empty options' do

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

@@ -270,13 +270,13 @@ Capybara::SpecHelper.spec 'node' do
     end
 
     it 'works when details is toggled open and closed' do
-      @session.find(:css, '#closed_details').click
-      expect(@session).to have_css('#closed_details *', visible: true, count: 5)
+      @session.find(:css, '#closed_details > summary').click
+      expect(@session).to have_css('#closed_details *', visible: :visible, count: 5)
         .and(have_no_css('#closed_details *', visible: :hidden))
 
-      @session.find(:css, '#closed_details').click
+      @session.find(:css, '#closed_details > summary').click
       descendants_css = '#closed_details > *:not(summary), #closed_details > *:not(summary) *'
-      expect(@session).to have_no_css(descendants_css, visible: true)
+      expect(@session).to have_no_css(descendants_css, visible: :visible)
         .and(have_css(descendants_css, visible: :hidden, count: 3))
     end
   end
@@ -446,7 +446,7 @@ Capybara::SpecHelper.spec 'node' do
 
     it 'should work with Dragula' do
       @session.visit('/with_dragula')
-      @session.within(:css, '#sortable') do
+      @session.within(:css, '#sortable.ready') do
         src = @session.find('div', text: 'Item 1')
         target = @session.find('div', text: 'Item 3')
         src.drag_to target
@@ -468,6 +468,50 @@ Capybara::SpecHelper.spec 'node' do
       end
     end
 
+    it 'should simulate a single held down modifier key' do
+      %I[
+        alt
+        ctrl
+        meta
+        shift
+      ].each do |modifier_key|
+        @session.visit('/with_js')
+
+        element = @session.find('//div[@id="drag"]')
+        target = @session.find('//div[@id="drop"]')
+
+        element.drag_to(target, drop_modifiers: modifier_key)
+        expect(@session).to have_css('div.drag_start', exact_text: 'Dragged!')
+        expect(@session).to have_xpath("//div[contains(., 'Dropped!-#{modifier_key}')]")
+      end
+    end
+
+    it 'should simulate multiple held down modifier keys' do
+      @session.visit('/with_js')
+
+      element = @session.find('//div[@id="drag"]')
+      target = @session.find('//div[@id="drop"]')
+
+      modifier_keys = %I[alt ctrl meta shift]
+
+      element.drag_to(target, drop_modifiers: modifier_keys)
+      expect(@session).to have_xpath("//div[contains(., 'Dropped!-#{modifier_keys.join('-')}')]")
+    end
+
+    it 'should support key aliases' do
+      { control: :ctrl,
+        command: :meta,
+        cmd: :meta }.each do |(key_alias, key)|
+        @session.visit('/with_js')
+
+        element = @session.find('//div[@id="drag"]')
+        target = @session.find('//div[@id="drop"]')
+
+        element.drag_to(target, drop_modifiers: [key_alias])
+        expect(target).to have_text("Dropped!-#{key}", exact: true)
+      end
+    end
+
     context 'HTML5', requires: %i[js html5_drag] do
       it 'should HTML5 drag and drop an object' do
         @session.visit('/with_js')
@@ -499,8 +543,13 @@ Capybara::SpecHelper.spec 'node' do
         target = @session.find('//div[@id="drop_html5"]')
         element.drag_to(target)
 
+        conditions = %w[DragLeave Drop DragEnd].map do |text|
+          have_css('div.log', text: text)
+        end
+        expect(@session).to(conditions.reduce { |memo, cond| memo.and(cond) })
+
         # The first "DragOver" div is inserted by the last dragover event dispatched
-        drag_over_div = @session.find('//div[@class="log" and starts-with(text(), "DragOver")]', match: :first)
+        drag_over_div = @session.first('//div[@class="log" and starts-with(text(), "DragOver")]')
         position = drag_over_div.text.sub('DragOver ', '')
 
         expect(@session).to have_css('div.log', text: /DragLeave #{position}/, count: 1)
@@ -551,6 +600,46 @@ Capybara::SpecHelper.spec 'node' do
         source.drag_to target
         expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped")]')
       end
+
+      it 'should simulate a single held down modifier key' do
+        %I[alt ctrl meta shift].each do |modifier_key|
+          @session.visit('/with_js')
+
+          element = @session.find('//div[@id="drag_html5"]')
+          target = @session.find('//div[@id="drop_html5"]')
+
+          element.drag_to(target, drop_modifiers: modifier_key)
+
+          expect(@session).to have_css('div.drag_start', exact_text: 'HTML5 Dragged!')
+          expect(@session).to have_xpath("//div[contains(., 'HTML5 Dropped string: text/plain drag_html5-#{modifier_key}')]")
+        end
+      end
+
+      it 'should simulate multiple held down modifier keys' do
+        @session.visit('/with_js')
+
+        element = @session.find('//div[@id="drag_html5"]')
+        target = @session.find('//div[@id="drop_html5"]')
+
+        modifier_keys = %I[alt ctrl meta shift]
+
+        element.drag_to(target, drop_modifiers: modifier_keys)
+        expect(@session).to have_xpath("//div[contains(., 'HTML5 Dropped string: text/plain drag_html5-#{modifier_keys.join('-')}')]")
+      end
+
+      it 'should support key aliases' do
+        { control: :ctrl,
+          command: :meta,
+          cmd: :meta }.each do |(key_alias, key)|
+          @session.visit('/with_js')
+
+          element = @session.find('//div[@id="drag_html5"]')
+          target = @session.find('//div[@id="drop_html5"]')
+
+          element.drag_to(target, drop_modifiers: [key_alias])
+          expect(target).to have_text(%r{^HTML5 Dropped string: text/plain drag_html5-#{key}$}m, exact: true)
+        end
+      end
     end
   end
 
@@ -669,7 +758,7 @@ Capybara::SpecHelper.spec 'node' do
       @session.visit('with_js')
       @session.find(:css, '#click-test').click(x: 5, y: 5)
       link = @session.find(:link, 'has-been-clicked')
-      locations = link.text.match(/^Has been clicked at (?<x>[\d\.-]+),(?<y>[\d\.-]+)$/)
+      locations = link.text.match(/^Has been clicked at (?<x>[\d.-]+),(?<y>[\d.-]+)$/)
       # Resulting click location should be very close to 0, 0 relative to top left corner of the element, but may not be exact due to
       # integer/float conversions and rounding.
       expect(locations[:x].to_f).to be_within(1).of(5)
@@ -719,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
@@ -728,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
@@ -749,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
@@ -783,7 +884,7 @@ Capybara::SpecHelper.spec 'node' do
       @session.visit('with_js')
       @session.find(:css, '#click-test').double_click(x: 10, y: 5)
       link = @session.find(:link, 'has-been-double-clicked')
-      locations = link.text.match(/^Has been double clicked at (?<x>[\d\.-]+),(?<y>[\d\.-]+)$/)
+      locations = link.text.match(/^Has been double clicked at (?<x>[\d.-]+),(?<y>[\d.-]+)$/)
       # Resulting click location should be very close to 10, 5 relative to top left corner of the element, but may not be exact due
       # to integer/float conversions and rounding.
       expect(locations[:x].to_f).to be_within(1).of(10)
@@ -802,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
@@ -811,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
@@ -832,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
@@ -866,7 +970,7 @@ Capybara::SpecHelper.spec 'node' do
       @session.visit('with_js')
       @session.find(:css, '#click-test').right_click(x: 10, y: 10)
       link = @session.find(:link, 'has-been-right-clicked')
-      locations = link.text.match(/^Has been right clicked at (?<x>[\d\.-]+),(?<y>[\d\.-]+)$/)
+      locations = link.text.match(/^Has been right clicked at (?<x>[\d.-]+),(?<y>[\d.-]+)$/)
       # Resulting click location should be very close to 10, 10 relative to top left corner of the element, but may not be exact due
       # to integer/float conversions and rounding
       expect(locations[:x].to_f).to be_within(1).of(10)
@@ -885,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
@@ -894,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
@@ -915,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