capybara 3.8.1 → 3.33.0

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

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# because of the methods being tested. In tests using Capybara this type of behavior should be implemented
+# using Capybara provided assertions with builtin waiting behavior.
+
 Capybara::SpecHelper.spec 'node' do
   before do
     @session.visit('/with_html')
@@ -21,9 +25,9 @@ Capybara::SpecHelper.spec 'node' do
 
   describe '#query_scope' do
     it 'should have a reference to the element the query was evaluated on if there is one' do
-      @node = @session.find(:css, '#first')
-      expect(@node.query_scope).to eq(@node.session.document)
-      expect(@node.find(:css, '#foo').query_scope).to eq(@node)
+      node = @session.find(:css, '#first')
+      expect(node.query_scope).to eq(node.session.document)
+      expect(node.find(:css, '#foo').query_scope).to eq(node)
     end
   end
 
@@ -105,12 +109,24 @@ Capybara::SpecHelper.spec 'node' do
       expect(@session.first('//input').value).to eq('')
     end
 
-    it 'should raise if the text field is readonly' do
-      expect { @session.first('//input[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
-    end
+    if ENV['CAPYBARA_THOROUGH']
+      it 'should raise if the text field is readonly' do
+        expect { @session.first('//input[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
+      end
 
-    it 'should raise if the textarea is readonly' do
-      expect { @session.first('//textarea[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
+      it 'should raise if the textarea is readonly' do
+        expect { @session.first('//textarea[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
+      end
+    else
+      it 'should not change if the text field is readonly' do
+        @session.first('//input[@readonly]').set('changed')
+        expect(@session.first('//input[@readonly]').value).to eq 'should not change'
+      end
+
+      it 'should not change if the textarea is readonly' do
+        @session.first('//textarea[@readonly]').set('changed')
+        expect(@session.first('//textarea[@readonly]').value).to eq 'textarea should not change'
+      end
     end
 
     it 'should use global default options' do
@@ -179,7 +195,7 @@ Capybara::SpecHelper.spec 'node' do
 
     it 'should see a disabled fieldset as disabled' do
       @session.visit('/form')
-      expect(@session.find(:css, '#form_disabled_fieldset')).to be_disabled
+      expect(@session.find(:xpath, './/fieldset[@id="form_disabled_fieldset"]')).to be_disabled
     end
 
     context 'in a disabled fieldset' do
@@ -217,8 +233,9 @@ Capybara::SpecHelper.spec 'node' do
   end
 
   describe '#visible?' do
+    before { Capybara.ignore_hidden_elements = false }
+
     it 'should extract node visibility' do
-      Capybara.ignore_hidden_elements = false
       expect(@session.first('//a')).to be_visible
 
       expect(@session.find('//div[@id="hidden"]')).not_to be_visible
@@ -228,11 +245,113 @@ Capybara::SpecHelper.spec 'node' do
       expect(@session.find('//input[@id="hidden_input"]')).not_to be_visible
     end
 
+    it 'template elements should not be visible' do
+      expect(@session.find('//template')).not_to be_visible
+    end
+
     it 'should be boolean' do
-      Capybara.ignore_hidden_elements = false
       expect(@session.first('//a').visible?).to be true
       expect(@session.find('//div[@id="hidden"]').visible?).to be false
     end
+
+    it 'closed details > summary elements and descendants should be visible' do
+      expect(@session.find(:css, '#closed_details summary')).to be_visible
+      expect(@session.find(:css, '#closed_details summary h6')).to be_visible
+    end
+
+    it 'details non-summary descendants should be non-visible when closed' do
+      descendants = @session.all(:css, '#closed_details > *:not(summary), #closed_details > *:not(summary) *', minimum: 2)
+      expect(descendants).not_to include(be_visible)
+    end
+
+    it 'deatils descendants should be visible when open' do
+      descendants = @session.all(:css, '#open_details *')
+      expect(descendants).to all(be_visible)
+    end
+
+    it 'works when details is toggled open and closed' do
+      @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 > summary').click
+      descendants_css = '#closed_details > *:not(summary), #closed_details > *:not(summary) *'
+      expect(@session).to have_no_css(descendants_css, visible: :visible)
+        .and(have_css(descendants_css, visible: :hidden, count: 3))
+    end
+  end
+
+  describe '#obscured?', requires: [:css] do
+    it 'should see non visible elements as obscured' do
+      Capybara.ignore_hidden_elements = false
+      expect(@session.find('//div[@id="hidden"]')).to be_obscured
+      expect(@session.find('//div[@id="hidden_via_ancestor"]')).to be_obscured
+      expect(@session.find('//div[@id="hidden_attr"]')).to be_obscured
+      expect(@session.find('//a[@id="hidden_attr_via_ancestor"]')).to be_obscured
+      expect(@session.find('//input[@id="hidden_input"]')).to be_obscured
+    end
+
+    it 'should see non-overlapped elements as not obscured' do
+      @session.visit('/obscured')
+      expect(@session.find(:css, '#cover')).not_to be_obscured
+    end
+
+    it 'should see elements only overlapped by descendants as not obscured' do
+      expect(@session.first(:css, 'p:not(.para)')).not_to be_obscured
+    end
+
+    it 'should see elements outside the viewport as obscured' do
+      @session.visit('/obscured')
+      off = @session.find(:css, '#offscreen')
+      off_wrapper = @session.find(:css, '#offscreen_wrapper')
+      expect(off).to be_obscured
+      expect(off_wrapper).to be_obscured
+      @session.scroll_to(off_wrapper)
+      expect(off_wrapper).not_to be_obscured
+      expect(off).to be_obscured
+      off_wrapper.scroll_to(off)
+      expect(off).not_to be_obscured
+      expect(off_wrapper).not_to be_obscured
+    end
+
+    it 'should see overlapped elements as obscured' do
+      @session.visit('/obscured')
+      expect(@session.find(:css, '#obscured')).to be_obscured
+    end
+
+    it 'should be boolean' do
+      Capybara.ignore_hidden_elements = false
+      expect(@session.first('//a').obscured?).to be false
+      expect(@session.find('//div[@id="hidden"]').obscured?).to be true
+    end
+
+    it 'should work in frames' do
+      @session.visit('/obscured')
+      frame = @session.find(:css, '#frameOne')
+      @session.within_frame(frame) do
+        div = @session.find(:css, '#divInFrameOne')
+        expect(div).to be_obscured
+        @session.scroll_to div
+        expect(div).not_to be_obscured
+      end
+    end
+
+    it 'should work in nested iframes' do
+      @session.visit('/obscured')
+      frame = @session.find(:css, '#nestedFrames')
+      @session.within_frame(frame) do
+        @session.within_frame(:css, '#childFrame') do
+          gcframe = @session.find(:css, '#grandchildFrame2')
+          @session.within_frame(gcframe) do
+            expect(@session.find(:css, '#divInFrameTwo')).to be_obscured
+          end
+          @session.scroll_to(gcframe)
+          @session.within_frame(gcframe) do
+            expect(@session.find(:css, '#divInFrameTwo')).not_to be_obscured
+          end
+        end
+      end
+    end
   end
 
   describe '#checked?' do
@@ -324,6 +443,241 @@ Capybara::SpecHelper.spec 'node' do
       link.drag_to target
       expect(@session).to have_xpath('//div[contains(., "Dropped!")]')
     end
+
+    it 'should work with Dragula' do
+      @session.visit('/with_dragula')
+      @session.within(:css, '#sortable.ready') do
+        src = @session.find('div', text: 'Item 1')
+        target = @session.find('div', text: 'Item 3')
+        src.drag_to target
+        expect(@session).to have_content(/Item 2.*Item 1/, normalize_ws: true)
+      end
+    end
+
+    it 'should work with jsTree' do
+      @session.visit('/with_jstree')
+      @session.within(:css, '#container') do
+        @session.assert_text(/A.*B.*C/m)
+        source = @session.find(:css, '#j1_1_anchor')
+        target = @session.find(:css, '#j1_2_anchor')
+
+        source.drag_to(target)
+
+        @session.assert_no_text(/A.*B.*C/m)
+        @session.assert_text(/B.*C/m)
+      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')
+        element = @session.find('//div[@id="drag_html5"]')
+        target = @session.find('//div[@id="drop_html5"]')
+        element.drag_to(target)
+        expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain drag_html5")]')
+      end
+
+      it 'should HTML5 drag and drop an object child' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5"]/p')
+        target = @session.find('//div[@id="drop_html5"]')
+        element.drag_to(target)
+        expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain drag_html5")]')
+      end
+
+      it 'should set clientX/Y in dragover events' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5"]')
+        target = @session.find('//div[@id="drop_html5"]')
+        element.drag_to(target)
+        expect(@session).to have_css('div.log', text: /DragOver with client position: [1-9]\d*,[1-9]\d*/, count: 2)
+      end
+
+      it 'should preserve clientX/Y from last dragover event' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5"]')
+        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.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)
+        expect(@session).to have_css('div.log', text: /Drop #{position}/, count: 1)
+        expect(@session).to have_css('div.log', text: /DragEnd #{position}/, count: 1)
+      end
+
+      it 'should not HTML5 drag and drop on a non HTML5 drop element' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5"]')
+        target = @session.find('//div[@id="drop_html5"]')
+        target.execute_script("$(this).removeClass('drop');")
+        element.drag_to(target)
+        sleep 1
+        expect(@session).not_to have_xpath('//div[contains(., "HTML5 Dropped")]')
+      end
+
+      it 'should HTML5 drag and drop when scrolling needed' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5_scroll"]')
+        target = @session.find('//div[@id="drop_html5_scroll"]')
+        element.drag_to(target)
+        expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain drag_html5_scroll")]')
+      end
+
+      it 'should drag HTML5 default draggable elements' do
+        @session.visit('/with_js')
+        link = @session.find_link('drag_link_html5')
+        target = @session.find(:id, 'drop_html5')
+        link.drag_to target
+        expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped")]')
+      end
+
+      it 'should work with SortableJS' do
+        @session.visit('/with_sortable_js')
+        @session.within(:css, '#sortable') do
+          src = @session.find('div', text: 'Item 1')
+          target = @session.find('div', text: 'Item 3')
+          src.drag_to target
+          expect(@session).to have_content(/Item 3.*Item 1/, normalize_ws: true)
+        end
+      end
+
+      it 'should drag HTML5 default draggable element child' do
+        @session.visit('/with_js')
+        source = @session.find_link('drag_link_html5').find(:css, 'p')
+        target = @session.find(:id, 'drop_html5')
+        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
+
+  describe 'Element#drop', requires: %i[js html5_drag] do
+    it 'can drop a file' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop(
+        with_os_path_separators(File.expand_path('../fixtures/capybara.jpg', File.dirname(__FILE__)))
+      )
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped file: capybara.jpg")]')
+    end
+
+    it 'can drop multiple files' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop(
+        with_os_path_separators(File.expand_path('../fixtures/capybara.jpg', File.dirname(__FILE__))),
+        with_os_path_separators(File.expand_path('../fixtures/test_file.txt', File.dirname(__FILE__)))
+      )
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped file: capybara.jpg")]')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped file: test_file.txt")]')
+    end
+
+    it 'can drop strings' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop('text/plain' => 'Some dropped text')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain Some dropped text")]')
+    end
+
+    it 'can drop multiple strings' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop('text/plain' => 'Some dropped text', 'text/url' => 'http://www.google.com')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain Some dropped text")]')
+      expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/url http://www.google.com")]')
+    end
   end
 
   describe '#hover', requires: [:hover] do
@@ -340,6 +694,15 @@ Capybara::SpecHelper.spec 'node' do
       @session.find(:css, '.wrapper.scroll_needed').hover
       expect(@session.find(:css, '.wrapper.scroll_needed .hidden_until_hover', visible: false)).to be_visible
     end
+
+    it 'should hover again after following a link and back' do
+      @session.visit('/with_hover')
+      @session.find(:css, '.wrapper:not(.scroll_needed)').hover
+      @session.click_link('Other hover page')
+      @session.click_link('Go back')
+      @session.find(:css, '.wrapper:not(.scroll_needed)').hover
+      expect(@session.find(:css, '.wrapper:not(.scroll_needed) .hidden_until_hover', visible: false)).to be_visible
+    end
   end
 
   describe '#click' do
@@ -395,18 +758,113 @@ 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)
       expect(locations[:y].to_f).to be_within(1).of(5)
     end
 
+    it 'should raise error if both x and y values are not passed' do
+      @session.visit('with_js')
+      el = @session.find(:css, '#click-test')
+      expect { el.click(x: 5) }.to raise_error ArgumentError
+      expect { el.click(x: nil, y: 3) }.to raise_error ArgumentError
+    end
+
     it 'should be able to click a table row', requires: [:js] do
       @session.visit('/tables')
       tr = @session.find(:css, '#agent_table tr:first-child').click
       expect(tr).to have_css('label', text: 'Clicked')
     end
+
+    it 'should retry clicking', requires: [:js] do
+      @session.visit('/animated')
+      obscured = @session.find(:css, '#obscured')
+      @session.execute_script <<~JS
+        setTimeout(function(){ $('#cover').hide(); }, 700)
+      JS
+      expect { obscured.click }.not_to raise_error
+    end
+
+    it 'should allow to retry longer', requires: [:js] do
+      @session.visit('/animated')
+      obscured = @session.find(:css, '#obscured')
+      @session.execute_script <<~JS
+        setTimeout(function(){ $('#cover').hide(); }, 3000)
+      JS
+      expect { obscured.click(wait: 4) }.not_to raise_error
+    end
+
+    it 'should not retry clicking when wait is disabled', requires: [:js] do
+      @session.visit('/animated')
+      obscured = @session.find(:css, '#obscured')
+      @session.execute_script <<~JS
+        setTimeout(function(){ $('#cover').hide(); }, 2000)
+      JS
+      expect { obscured.click(wait: 0) }.to(raise_error { |e| expect(e).to be_an_invalid_element_error(@session) })
+    end
+
+    context 'offset', requires: [:js] do
+      before do
+        @session.visit('/offset')
+      end
+
+      let :clicker do
+        @session.find(:id, 'clicker')
+      end
+
+      context 'when w3c_click_offset is false' do
+        before do
+          Capybara.w3c_click_offset = false
+        end
+
+        it 'should offset from top left of element' do
+          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)
+          expect(@session).to have_text(/clicked at 85,90/)
+        end
+
+        it 'should default to click the middle' do
+          clicker.click
+          expect(@session).to have_text(/clicked at 150,150/)
+        end
+      end
+
+      context 'when w3c_click_offset is true' do
+        before do
+          Capybara.w3c_click_offset = true
+        end
+
+        it 'should offset from center of element' do
+          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)
+          expect(@session).to have_text(/clicked at 85,90/)
+        end
+
+        it 'should default to click the middle' do
+          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
@@ -426,12 +884,73 @@ 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)
       expect(locations[:y].to_f).to be_within(1).of(5)
     end
+
+    it 'should retry clicking', requires: [:js] do
+      @session.visit('/animated')
+      obscured = @session.find(:css, '#obscured')
+      @session.execute_script <<~JS
+        setTimeout(function(){ $('#cover').hide(); }, 700)
+      JS
+      expect { obscured.double_click }.not_to raise_error
+    end
+
+    context 'offset', requires: [:js] do
+      before do
+        @session.visit('/offset')
+      end
+
+      let :clicker do
+        @session.find(:id, 'clicker')
+      end
+
+      context 'when w3c_click_offset is false' do
+        before do
+          Capybara.w3c_click_offset = false
+        end
+
+        it 'should offset from top left of element' do
+          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)
+          expect(@session).to have_text(/clicked at 85,90/)
+        end
+
+        it 'should default to click the middle' do
+          clicker.double_click
+          expect(@session).to have_text(/clicked at 150,150/)
+        end
+      end
+
+      context 'when w3c_click_offset is true' do
+        before do
+          Capybara.w3c_click_offset = true
+        end
+
+        it 'should offset from center of element' do
+          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)
+          expect(@session).to have_text(/clicked at 85,90/)
+        end
+
+        it 'should default to click the middle' do
+          clicker.double_click
+          expect(@session).to have_text(/clicked at 150,150/)
+        end
+      end
+    end
   end
 
   describe '#right_click', requires: [:js] do
@@ -451,12 +970,82 @@ 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)
       expect(locations[:y].to_f).to be_within(1).of(10)
     end
+
+    it 'should retry clicking', requires: [:js] do
+      @session.visit('/animated')
+      obscured = @session.find(:css, '#obscured')
+      @session.execute_script <<~JS
+        setTimeout(function(){ $('#cover').hide(); }, 700)
+      JS
+      expect { obscured.right_click }.not_to raise_error
+    end
+
+    context 'offset', requires: [:js] do
+      before do
+        @session.visit('/offset')
+      end
+
+      let :clicker do
+        @session.find(:id, 'clicker')
+      end
+
+      context 'when w3c_click_offset is false' do
+        before do
+          Capybara.w3c_click_offset = false
+        end
+
+        it 'should offset from top left of element' do
+          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)
+          expect(@session).to have_text(/clicked at 85,90/)
+        end
+
+        it 'should default to click the middle' do
+          clicker.right_click
+          expect(@session).to have_text(/clicked at 150,150/)
+        end
+      end
+
+      context 'when w3c_click_offset is true' do
+        before do
+          Capybara.w3c_click_offset = true
+        end
+
+        it 'should offset from center of element' do
+          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)
+          expect(@session).to have_text(/clicked at 85,90/)
+        end
+
+        it 'should default to click the middle' do
+          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
@@ -478,6 +1067,12 @@ Capybara::SpecHelper.spec 'node' do
       expect(@session.find(:css, '#address1_city').value).to eq 'Oceanside'
     end
 
+    it 'should hold modifiers at top level' do
+      @session.visit('/form')
+      @session.find(:css, '#address1_city').send_keys('ocean', :shift, 'side')
+      expect(@session.find(:css, '#address1_city').value).to eq 'oceanSIDE'
+    end
+
     it 'should generate key events', requires: %i[send_keys js] do
       @session.visit('/with_js')
       @session.find(:css, '#with-key-events').send_keys([:shift, 't'], [:shift, 'w'])
@@ -532,6 +1127,18 @@ Capybara::SpecHelper.spec 'node' do
       expect(el).to be_instance_of(Capybara::Node::Element)
       expect(el).to eq(change)
     end
+
+    it 'should support multiple statements via IIFE' do
+      @session.visit('/with_js')
+      change = @session.find(:css, '#change') # ensure page has loaded and element is available
+      res = change.evaluate_script(<<~JS, 3)
+        (function(n){
+          var el = this;
+          return [el, n];
+        }).apply(this, arguments)
+      JS
+      expect(res).to eq [change, 3]
+    end
   end
 
   describe '#evaluate_async_script', requires: %i[js es_args] do
@@ -550,6 +1157,28 @@ Capybara::SpecHelper.spec 'node' do
   end
 
   describe '#reload', requires: [:js] do
+    it 'should reload elements found via ancestor with CSS' do
+      @session.visit('/with_js')
+      node = @session.find(:css, '#reload-me em').ancestor(:css, 'div')
+      node.reload
+      expect(node[:id]).to eq 'reload-me'
+    end
+
+    it 'should reload elements found via ancestor with XPath' do
+      @session.visit('/with_js')
+      node = @session.find(:css, '#reload-me em').ancestor(:xpath, './/div')
+      node.reload
+      expect(node[:id]).to eq 'reload-me'
+    end
+
+    it 'should reload elements found via sibling' do
+      @session.visit('/with_js')
+      node = @session.find(:css, '#the-list li', text: 'Item 1').sibling(:css, 'li')
+      expect(node.text).to eq 'Item 2'
+      node.reload
+      expect(node.text).to eq 'Item 2'
+    end
+
     context 'without automatic reload' do
       before { Capybara.automatic_reload = false }
 
@@ -660,8 +1289,4 @@ Capybara::SpecHelper.spec 'node' do
       end)
     end
   end
-
-  def be_an_invalid_element_error(session)
-    satisfy { |error| session.driver.invalid_element_errors.any? { |e| error.is_a? e } }
-  end
 end