capybara 3.29.0 → 3.37.1

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# 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.
 
@@ -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
@@ -388,8 +388,8 @@ Capybara::SpecHelper.spec 'node' do
 
   describe '#==' do
     it 'preserve object identity' do
-      expect(@session.find('//h1') == @session.find('//h1')).to be true # rubocop:disable Lint/UselessComparison
-      expect(@session.find('//h1') === @session.find('//h1')).to be true # rubocop:disable Style/CaseEquality, Lint/UselessComparison
+      expect(@session.find('//h1') == @session.find('//h1')).to be true # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
+      expect(@session.find('//h1') === @session.find('//h1')).to be true # rubocop:disable Style/CaseEquality, Lint/BinaryOperatorWithIdenticalOperands
       expect(@session.find('//h1').eql?(@session.find('//h1'))).to be false
     end
 
@@ -409,6 +409,17 @@ Capybara::SpecHelper.spec 'node' do
       element = @session.find(:link, 'Second Link')
       expect(@session.find(:xpath, element.path)).to eq(element)
     end
+
+    it 'reports when element in shadow dom', requires: [:shadow_dom] do
+      @session.visit('/with_js')
+      shadow = @session.find(:css, '#shadow')
+      element = @session.evaluate_script(<<~JS, shadow)
+        (function(root){
+          return root.shadowRoot.querySelector('span');
+        })(arguments[0])
+      JS
+      expect(element.path).to eq '(: Shadow DOM element - no XPath :)'
+    end
   end
 
   describe '#trigger', requires: %i[js trigger] do
@@ -446,7 +457,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 +479,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')
@@ -493,6 +548,26 @@ Capybara::SpecHelper.spec 'node' do
         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"]')
@@ -536,6 +611,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
 
@@ -567,6 +682,15 @@ Capybara::SpecHelper.spec 'node' do
       expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped string: text/plain Some dropped text")]')
     end
 
+    it 'can drop a pathname' do
+      @session.visit('/with_js')
+      target = @session.find('//div[@id="drop_html5"]')
+      target.drop(
+        Pathname.new(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 strings' do
       @session.visit('/with_js')
       target = @session.find('//div[@id="drop_html5"]')
@@ -654,7 +778,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)
@@ -704,7 +828,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
@@ -713,17 +840,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
@@ -734,21 +861,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
@@ -768,7 +904,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)
@@ -787,7 +923,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
@@ -796,17 +935,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
@@ -817,17 +956,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
@@ -851,7 +990,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)
@@ -870,7 +1009,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
@@ -879,17 +1021,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
@@ -900,21 +1042,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
@@ -964,7 +1115,7 @@ Capybara::SpecHelper.spec 'node' do
   end
 
   describe '#evaluate_script', requires: %i[js es_args] do
-    it 'should evaluate the given script in the context of the element and  return whatever it produces' do
+    it 'should evaluate the given script in the context of the element and return whatever it produces' do
       @session.visit('/with_js')
       el = @session.find(:css, '#with_change_event')
       expect(el.evaluate_script('this.value')).to eq('default value')
@@ -1025,6 +1176,48 @@ Capybara::SpecHelper.spec 'node' do
     end
   end
 
+  describe '#shadow_root', requires: %i[js] do
+    it 'should get the shadow root' do
+      @session.visit('/with_shadow')
+      expect do
+        shadow_root = @session.find(:css, '#shadow_host').shadow_root
+        expect(shadow_root).not_to be_nil
+      end.not_to raise_error
+    end
+
+    it 'should find elements inside the shadow dom using CSS' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      expect(shadow_root).to have_css('#shadow_content', text: 'some text')
+    end
+
+    it 'should find nested shadow roots' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      nested_shadow_root = shadow_root.find(:css, '#nested_shadow_host').shadow_root
+      expect(nested_shadow_root).to have_css('#nested_shadow_content', text: 'nested text')
+    end
+
+    it 'should click on elements' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      checkbox = shadow_root.find(:css, 'input[type="checkbox"]')
+      expect(checkbox).not_to be_checked
+      checkbox.click
+      expect(checkbox).to be_checked
+    end
+
+    it 'should use convenience methods once moved to a descendant of the shadow root' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      descendant = shadow_root.find(:css, '#controls_wrapper')
+      expect do
+        descendant.check('shadow_checkbox')
+      end.not_to raise_error
+      expect(descendant).to have_checked_field('shadow_checkbox')
+    end
+  end
+
   describe '#reload', requires: [:js] do
     it 'should reload elements found via ancestor with CSS' do
       @session.visit('/with_js')

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# 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.
 
@@ -25,6 +25,7 @@ Capybara::SpecHelper.spec '#refresh' do
     @session.visit('/form')
     @session.select('Sweden', from: 'form_region')
     @session.click_button('awesome')
+    sleep 2
     expect do
       @session.refresh
       sleep 2

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

@@ -15,7 +15,7 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
     @session.save_and_open_screenshot
 
     expect(@session.driver).to have_received(:save_screenshot)
-      .with(expected_file_regex, {})
+      .with(expected_file_regex, any_args)
     expect(Launchy).to have_received(:open).with(expected_file_regex)
   end
 
@@ -27,7 +27,7 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
     @session.save_and_open_screenshot(custom_path)
 
     expect(@session.driver).to have_received(:save_screenshot)
-      .with(/#{custom_path}$/, {})
+      .with(/#{custom_path}$/, any_args)
     expect(Launchy).to have_received(:open).with(/#{custom_path}$/)
   end
 

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

@@ -31,7 +31,7 @@ Capybara::SpecHelper.spec '#save_page' do
   it 'can store files in a specified directory' do
     Capybara.save_path = alternative_path
     @session.save_page
-    path = Dir.glob(alternative_path + '/capybara-*.html').first
+    path = Dir.glob("#{alternative_path}/capybara-*.html").first
     expect(File.read(path)).to include('Another World')
   end
 
@@ -43,14 +43,14 @@ Capybara::SpecHelper.spec '#save_page' do
   it 'can store files in a specified directory with a given filename' do
     Capybara.save_path = alternative_path
     @session.save_page('capybara-001133.html')
-    path = alternative_path + '/capybara-001133.html'
+    path = "#{alternative_path}/capybara-001133.html"
     expect(File.read(path)).to include('Another World')
   end
 
   it 'can store files in a specified directory with a given relative filename' do
     Capybara.save_path = alternative_path
     @session.save_page('tmp/capybara-001144.html')
-    path = alternative_path + '/tmp/capybara-001144.html'
+    path = "#{alternative_path}/tmp/capybara-001144.html"
     expect(File.read(path)).to include('Another World')
   end
 
@@ -63,7 +63,7 @@ Capybara::SpecHelper.spec '#save_page' do
   it 'returns an absolute path in given directory' do
     Capybara.save_path = alternative_path
     result = @session.save_page
-    path = File.expand_path(Dir.glob(alternative_path + '/capybara-*.html').first, alternative_path)
+    path = File.expand_path(Dir.glob("#{alternative_path}/capybara-*.html").first, alternative_path)
     expect(result).to eq(path)
   end
 

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

@@ -19,7 +19,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
     @session.save_screenshot
 
     regexp = Regexp.new(File.join(Dir.pwd, 'capybara-\d+\.png'))
-    expect(@session.driver).to have_received(:save_screenshot).with(regexp, {})
+    expect(@session.driver).to have_received(:save_screenshot).with(regexp, any_args)
   end
 
   it 'allows to specify another path' do
@@ -28,7 +28,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
     custom_path = 'screenshots/1.png'
     @session.save_screenshot(custom_path)
 
-    expect(@session.driver).to have_received(:save_screenshot).with(/#{custom_path}$/, {})
+    expect(@session.driver).to have_received(:save_screenshot).with(/#{custom_path}$/, any_args)
   end
 
   context 'with Capybara.save_path' do
@@ -39,7 +39,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
       @session.save_screenshot
 
       regexp = Regexp.new(File.join(alternative_path, 'capybara-\d+\.png'))
-      expect(@session.driver).to have_received(:save_screenshot).with(regexp, {})
+      expect(@session.driver).to have_received(:save_screenshot).with(regexp, any_args)
     end
 
     it 'relative paths are relative to save_path' do
@@ -49,7 +49,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
       custom_path = 'screenshots/2.png'
       @session.save_screenshot(custom_path)
 
-      expect(@session.driver).to have_received(:save_screenshot).with(File.expand_path(custom_path, alternative_path), {})
+      expect(@session.driver).to have_received(:save_screenshot).with(File.expand_path(custom_path, alternative_path), any_args)
     end
   end
 end

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

@@ -15,7 +15,7 @@ Capybara::SpecHelper.spec '#scroll_to', requires: [:scroll] do
     el = @session.find(:css, '#scroll')
     @session.scroll_to(el, align: :bottom)
     el_bottom = el.evaluate_script('this.getBoundingClientRect().bottom')
-    viewport_bottom = el.evaluate_script('document.body.clientHeight')
+    viewport_bottom = el.evaluate_script('document.documentElement.clientHeight')
     expect(el_bottom).to be_within(1).of(viewport_bottom)
   end
 
@@ -23,7 +23,7 @@ Capybara::SpecHelper.spec '#scroll_to', requires: [:scroll] do
     el = @session.find(:css, '#scroll')
     @session.scroll_to(el, align: :center)
     el_center = el.evaluate_script('(function(rect){return (rect.top + rect.bottom)/2})(this.getBoundingClientRect())')
-    viewport_bottom = el.evaluate_script('document.body.clientHeight')
+    viewport_bottom = el.evaluate_script('document.documentElement.clientHeight')
     expect(el_center).to be_within(2).of(viewport_bottom / 2)
   end
 
@@ -35,13 +35,13 @@ Capybara::SpecHelper.spec '#scroll_to', requires: [:scroll] do
 
   it 'can scroll the window to the vertical bottom' do
     @session.scroll_to :bottom
-    max_scroll = @session.evaluate_script('document.body.scrollHeight - document.body.clientHeight')
+    max_scroll = @session.evaluate_script('document.documentElement.scrollHeight - document.documentElement.clientHeight')
     expect(@session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')).to eq [0, max_scroll]
   end
 
   it 'can scroll the window to the vertical center' do
     @session.scroll_to :center
-    max_scroll = @session.evaluate_script('document.documentElement.scrollHeight - document.body.clientHeight')
+    max_scroll = @session.evaluate_script('document.documentElement.scrollHeight - document.documentElement.clientHeight')
     expect(@session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')).to eq [0, max_scroll / 2]
   end
 

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

@@ -31,6 +31,11 @@ Capybara::SpecHelper.spec Capybara::Selector do
       expect(@session.find(:label, for: input).text).to eq 'Nested Label'
     end
 
+    it 'finds a label from nested input using :for filter with element when no id on label' do
+      input = @session.find(:css, '#wrapper_label').find(:css, 'input')
+      expect(@session.find(:label, for: input).text).to eq 'Wrapper Label'
+    end
+
     it 'finds the label for an non-nested element when using :for filter' do
       select = @session.find(:id, 'form_other_title')
       expect(@session.find(:label, for: select)['for']).to eq 'form_other_title'
@@ -62,14 +67,22 @@ Capybara::SpecHelper.spec Capybara::Selector do
       end
     end
 
-    it 'can find specifically by name' do
+    it 'can find specifically by name string' do
       expect(@session.find(:field, name: 'form[other_title]')['id']).to eq 'form_other_title'
     end
 
-    it 'can find specifically by placeholder' do
+    it 'can find specifically by name regex' do
+      expect(@session.find(:field, name: /form\[other_.*\]/)['id']).to eq 'form_other_title'
+    end
+
+    it 'can find specifically by placeholder string' do
       expect(@session.find(:field, placeholder: 'FirstName')['id']).to eq 'form_first_name'
     end
 
+    it 'can find specifically by placeholder regex' do
+      expect(@session.find(:field, placeholder: /FirstN.*/)['id']).to eq 'form_first_name'
+    end
+
     it 'can find by type' do
       expect(@session.find(:field, 'Confusion', type: 'checkbox')['id']).to eq 'confusion_checkbox'
       expect(@session.find(:field, 'Confusion', type: 'text')['id']).to eq 'confusion_text'

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

@@ -201,4 +201,24 @@ Capybara::SpecHelper.spec '#visit' do
     @session.visit('/get_cookie')
     expect(@session).to have_content('root cookie')
   end
+
+  context 'with base element' do
+    it 'should use base href with relative links' do
+      @session.visit('/base/with_base')
+      @session.click_link('Title page')
+      expect(@session).to have_current_path('/with_title')
+    end
+
+    it 'should use base href with bare queries' do
+      @session.visit('/base/with_base')
+      @session.click_link('Bare query')
+      expect(@session).to have_current_path('/?a=3')
+    end
+
+    it 'should not use the base href with a new visit call' do
+      @session.visit('/base/with_other_base')
+      @session.visit('with_html')
+      expect(@session).to have_current_path('/with_html')
+    end
+  end
 end