capybara 3.37.1 → 3.39.2

data/lib/capybara/session.rb

@@ -40,6 +40,7 @@ module Capybara
 
     NODE_METHODS = %i[
       all first attach_file text check choose scroll_to scroll_by
+      click double_click right_click
       click_link_or_button click_button click_link
       fill_in find find_all find_button find_by_id find_field find_link
       has_content? has_text? has_css? has_no_content? has_no_text?
@@ -58,7 +59,7 @@ module Capybara
     ].freeze
     SESSION_METHODS = %i[
       body html source current_url current_host current_path
-      execute_script evaluate_script visit refresh go_back go_forward send_keys
+      execute_script evaluate_script evaluate_async_script visit refresh go_back go_forward send_keys
       within within_element within_fieldset within_table within_frame switch_to_frame
       current_window windows open_new_window switch_to_window within_window window_opened_by
       save_page save_and_open_page save_screenshot
@@ -129,6 +130,8 @@ module Capybara
       if @touched
         driver.reset!
         @touched = false
+        switch_to_frame(:top) rescue nil # rubocop:disable Style/RescueModifier
+        @scopes = [nil]
       end
       @server&.wait_for_pending_requests
       raise_server_error!
@@ -159,9 +162,8 @@ module Capybara
         if config.raise_server_errors
           raise CapybaraError, 'Your application server raised an error - It has been raised in your test code because Capybara.raise_server_errors == true'
         end
-      rescue CapybaraError
-        # needed to get the cause set correctly in JRuby -- otherwise we could just do raise @server.error
-        raise @server.error, @server.error.message, @server.error.backtrace
+      rescue CapybaraError => capy_error # rubocop:disable Naming/RescuedExceptionsVariableName
+        raise @server.error, cause: capy_error
       ensure
         @server.reset_error!
       end
@@ -360,7 +362,7 @@ module Capybara
       new_scope = args.first.respond_to?(:to_capybara_node) ? args.first.to_capybara_node : find(*args, **kw_args)
       begin
         scopes.push(new_scope)
-        yield if block_given?
+        yield new_scope if block_given?
       ensure
         scopes.pop
       end
@@ -409,7 +411,7 @@ module Capybara
         scopes.push(:frame)
       when :parent
         if scopes.last != :frame
-          raise Capybara::ScopeError, "`switch_to_frame(:parent)` cannot be called from inside a descendant frame's "\
+          raise Capybara::ScopeError, "`switch_to_frame(:parent)` cannot be called from inside a descendant frame's " \
                                       '`within` block.'
         end
         scopes.pop
@@ -419,7 +421,7 @@ module Capybara
         top_level_scopes = [:frame, nil]
         if idx
           if scopes.slice(idx..).any? { |scope| !top_level_scopes.include?(scope) }
-            raise Capybara::ScopeError, "`switch_to_frame(:top)` cannot be called from inside a descendant frame's "\
+            raise Capybara::ScopeError, "`switch_to_frame(:top)` cannot be called from inside a descendant frame's " \
                                         '`within` block.'
           end
           scopes.slice!(idx..)
@@ -511,7 +513,7 @@ module Capybara
       raise ArgumentError, '`switch_to_window`: either window or block should be provided' if !window && !window_locator
 
       unless scopes.last.nil?
-        raise Capybara::ScopeError, '`switch_to_window` is not supposed to be invoked from '\
+        raise Capybara::ScopeError, '`switch_to_window` is not supposed to be invoked from ' \
                                     '`within` or `within_frame` blocks.'
       end
 
@@ -582,7 +584,7 @@ module Capybara
       synchronize_windows(options) do
         opened_handles = (driver.window_handles - old_handles)
         if opened_handles.size != 1
-          raise Capybara::WindowError, 'block passed to #window_opened_by '\
+          raise Capybara::WindowError, 'block passed to #window_opened_by ' \
                                        "opened #{opened_handles.size} windows instead of 1"
         end
         Window.new(self, opened_handles.first)

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

@@ -44,6 +44,10 @@ $(function() {
     $(this).after('<div class="log">DragOver with client position: ' + ev.clientX + ',' + ev.clientY)
     if ($(this).hasClass('drop')) { ev.preventDefault(); }
   });
+  $('#drop_html5, #drop_html5_scroll').on('dragenter', function(ev){
+    $(this).after('<div class="log">DragEnter')
+    if ($(this).hasClass('drop')) { ev.preventDefault(); }
+  });
   $('#drop_html5, #drop_html5_scroll').on('dragleave', function(ev){
     $(this).after('<div class="log">DragLeave with client position: ' + ev.clientX + ',' + ev.clientY)
     if ($(this).hasClass('drop')) { ev.preventDefault(); }

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

@@ -31,7 +31,7 @@ Capybara::SpecHelper.spec '#all' do
   it 'should accept an XPath instance', :exact_false do
     @session.visit('/form')
     @xpath = Capybara::Selector.new(:fillable_field, config: {}, format: :xpath).call('Name')
-    expect(@xpath).to be_a(::XPath::Union)
+    expect(@xpath).to be_a(XPath::Union)
     @result = @session.all(@xpath).map(&:value)
     expect(@result).to include('Smith', 'John', 'John Smith')
   end

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

@@ -55,6 +55,12 @@ Capybara::SpecHelper.spec '#attach_file' do
       expect(@session).to have_content('No file uploaded')
     end
 
+    it 'should send prior hidden field if no file submitted' do
+      @session.click_button('Upload Empty With Hidden')
+      expect(extract_results(@session)['document2']).to eq('hidden_field')
+      expect(extract_content_type(@session)).to start_with('multipart/form-data;')
+    end
+
     it 'should send content type text/plain when uploading a text file' do
       @session.attach_file 'Single Document', with_os_path_separators(test_file_path)
       @session.click_button 'Upload Single'

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

@@ -239,6 +239,7 @@ Capybara::SpecHelper.spec '#check' do
 
       context 'with allow_label_click options', requires: [:js] do
         it 'should allow offsets to click location on label' do
+          Capybara.w3c_click_offset = false
           expect(@session.find(:checkbox, 'form_cars_lotus', unchecked: true, visible: :hidden)).to be_truthy
           @session.check('form_cars_lotus', allow_label_click: { x: 90, y: 10 })
           @session.click_button('awesome')

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

@@ -131,6 +131,17 @@ Capybara::SpecHelper.spec '#click_link' do
     end
   end
 
+  context 'with :target option given' do
+    it 'should find links with valid target' do
+      @session.click_link('labore', target: '_self')
+      expect(@session).to have_content('Bar')
+    end
+
+    it "should raise error if link wasn't found" do
+      expect { @session.click_link('labore', target: '_blank') }.to raise_error(Capybara::ElementNotFound, /Unable to find link "labore"/)
+    end
+  end
+
   it 'should follow relative links' do
     @session.visit('/')
     @session.click_link('Relative')

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

@@ -7,7 +7,7 @@ Capybara::SpecHelper.spec '#current_scope' do
 
   context 'when not in a #within block' do
     it 'should return the document' do
-      expect(@session.current_scope).to be_kind_of Capybara::Node::Document
+      expect(@session.current_scope).to be_a Capybara::Node::Document
     end
   end
 

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

@@ -98,6 +98,12 @@ Capybara::SpecHelper.spec '#fill_in' do
     expect(extract_results(@session)['description']).to eq("\r\nSome text\r\n")
   end
 
+  it 'should handle carriage returns with line feeds in a textarea correctly' do
+    @session.fill_in('form_description', with: "\r\nSome text\r\n")
+    @session.click_button('awesome')
+    expect(extract_results(@session)['description']).to eq("\r\nSome text\r\n")
+  end
+
   it 'should fill in a color field' do
     @session.fill_in('Html5 Color', with: '#112233')
     @session.click_button('html5_submit')

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

@@ -67,4 +67,14 @@ Capybara::SpecHelper.spec '#find_link' do
       expect { @session.find_link(download: 37) }.to raise_error ArgumentError
     end
   end
+
+  context 'with :target option' do
+    it 'should accept partial matches when false' do
+      expect(@session.find_link(target: '_self').text).to eq('labore')
+    end
+
+    it 'should not accept partial matches when true' do
+      expect { @session.find_link(target: '_blank') }.to raise_error Capybara::ElementNotFound
+    end
+  end
 end

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

@@ -236,7 +236,7 @@ Capybara::SpecHelper.spec '#find' do
   it 'should accept an XPath instance' do
     @session.visit('/form')
     @xpath = Capybara::Selector.new(:fillable_field, config: {}, format: :xpath).call('First Name')
-    expect(@xpath).to be_a(::XPath::Union)
+    expect(@xpath).to be_a(XPath::Union)
     expect(@session.find(@xpath).value).to eq('John')
   end
 
@@ -528,7 +528,7 @@ Capybara::SpecHelper.spec '#find' do
       expect(@session.find(:link, 'test-foo')[:id]).to eq 'foo'
     end
   end
-  
+
   it 'should warn if passed count options' do
     allow(Capybara::Helpers).to receive(:warn)
     @session.find('//h1', count: 44)

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

@@ -25,7 +25,7 @@ Capybara::SpecHelper.spec '#first' do
   it 'should accept an XPath instance' do
     @session.visit('/form')
     @xpath = Capybara::Selector.new(:fillable_field, config: {}, format: :xpath).call('First Name')
-    expect(@xpath).to be_a(::XPath::Union)
+    expect(@xpath).to be_a(XPath::Union)
     expect(@session.first(@xpath).value).to eq('John')
   end
 

data/lib/capybara/spec/session/frame/within_frame_spec.rb

@@ -64,7 +64,9 @@ Capybara::SpecHelper.spec '#within_frame', requires: [:frames] do
     end
     expect do
       # Multiple frames in scope here
+      # rubocop:disable Style/Semicolon
       @session.within_frame { ; }
+      # rubocop:enable Style/Semicolon
     end.to raise_error Capybara::Ambiguous
   end
 

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

@@ -12,7 +12,7 @@ Capybara::SpecHelper.spec '#have_all_of_selectors' do
   it 'should be false if any of the given selectors are not on the page' do
     expect do
       expect(@session).to have_all_of_selectors(:css, 'p a#foo', 'h2#h2three', 'h2#h2one')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   it 'should use default selector' do
@@ -20,7 +20,7 @@ Capybara::SpecHelper.spec '#have_all_of_selectors' do
     expect(@session).to have_all_of_selectors('p a#foo', 'h2#h2two', 'h2#h2one')
     expect do
       expect(@session).to have_all_of_selectors('p a#foo', 'h2#h2three', 'h2#h2one')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   context 'should respect scopes' do
@@ -29,7 +29,7 @@ Capybara::SpecHelper.spec '#have_all_of_selectors' do
         expect(@session).to have_all_of_selectors(".//a[@id='foo']")
         expect do
           expect(@session).to have_all_of_selectors(".//a[@id='red']")
-        end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+        end.to raise_error RSpec::Expectations::ExpectationNotMetError
       end
     end
 
@@ -38,7 +38,7 @@ Capybara::SpecHelper.spec '#have_all_of_selectors' do
       expect(el).to have_all_of_selectors(".//a[@id='foo']")
       expect do
         expect(el).to have_all_of_selectors(".//a[@id='red']")
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
     end
   end
 
@@ -47,7 +47,7 @@ Capybara::SpecHelper.spec '#have_all_of_selectors' do
       expect(@session).to have_all_of_selectors(:field, 'normal', 'additional_newline', type: :textarea)
       expect do
         expect(@session).to have_all_of_selectors(:field, 'normal', 'test_field', 'additional_newline', type: :textarea)
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
     end
   end
 

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

@@ -39,8 +39,8 @@ Capybara::SpecHelper.spec '#have_no_ancestor' do
   it 'should assert no matching ancestor' do
     el = @session.find(:css, '#ancestor1')
     expect(el).to have_no_ancestor(:css, '#child')
-    expect(el).to have_no_ancestor(:css, '#ancestor1_sibiling')
+    expect(el).to have_no_ancestor(:css, '#ancestor1_sibling')
     expect(el).not_to have_ancestor(:css, '#child')
-    expect(el).not_to have_ancestor(:css, '#ancestor1_sibiling')
+    expect(el).not_to have_ancestor(:css, '#ancestor1_sibling')
   end
 end

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

@@ -12,7 +12,7 @@ Capybara::SpecHelper.spec '#have_any_of_selectors' do
   it 'should be false if none of the given selectors are not on the page' do
     expect do
       expect(@session).to have_any_of_selectors(:css, 'span a#foo', 'h2#h2nope', 'h2#h2one_no')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   it 'should use default selector' do
@@ -20,7 +20,7 @@ Capybara::SpecHelper.spec '#have_any_of_selectors' do
     expect(@session).to have_any_of_selectors('p a#foo', 'h2#h2two', 'a#not_on_page')
     expect do
       expect(@session).to have_any_of_selectors('p a#blah', 'h2#h2three')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   it 'should be negateable' do

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

@@ -77,6 +77,12 @@ Capybara::SpecHelper.spec '#has_button?' do
       expect(@session).to have_button('A Button', focused: false)
     end
   end
+
+  it 'should raise an error if an invalid option is passed' do
+    expect do
+      expect(@session).to have_button('A Button', invalid: true)
+    end.to raise_error(ArgumentError, 'Invalid option(s) :invalid, should be one of :above, :below, :left_of, :right_of, :near, :count, :minimum, :maximum, :between, :text, :id, :class, :style, :visible, :obscured, :exact, :exact_text, :normalize_ws, :match, :wait, :filter_set, :focused, :disabled, :name, :value, :title, :type')
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_button?' do

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

@@ -75,7 +75,7 @@ Capybara::SpecHelper.spec '#has_current_path?' do
     @session.visit('/with_js?test=test')
     expect(@session).to have_current_path('/with_js?test=test')
     expect(@session).to have_current_path('/with_js', ignore_query: true)
-    uri = ::Addressable::URI.parse(@session.current_url)
+    uri = Addressable::URI.parse(@session.current_url)
     uri.query = nil
     expect(@session).to have_current_path(uri.to_s, ignore_query: true)
   end

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

@@ -11,12 +11,14 @@ Capybara::SpecHelper.spec '#has_link?' do
     expect(@session).to have_link('A link', href: '/with_simple_html')
     expect(@session).to have_link(:'A link', href: :'/with_simple_html')
     expect(@session).to have_link('A link', href: %r{/with_simple_html})
+    expect(@session).to have_link('labore', target: '_self')
   end
 
   it 'should be false if the given link is not on the page' do
     expect(@session).not_to have_link('monkey')
     expect(@session).not_to have_link('A link', href: '/nonexistent-href')
     expect(@session).not_to have_link('A link', href: /nonexistent/)
+    expect(@session).not_to have_link('labore', target: '_blank')
   end
 
   it 'should notify if an invalid locator is specified' do
@@ -36,6 +38,12 @@ Capybara::SpecHelper.spec '#has_link?' do
       expect(@session).to have_link('labore', focused: false)
     end
   end
+
+  it 'should raise an error if an invalid option is passed' do
+    expect do
+      expect(@session).to have_link('labore', invalid: true)
+    end.to raise_error(ArgumentError, 'Invalid option(s) :invalid, should be one of :above, :below, :left_of, :right_of, :near, :count, :minimum, :maximum, :between, :text, :id, :class, :style, :visible, :obscured, :exact, :exact_text, :normalize_ws, :match, :wait, :filter_set, :focused, :href, :alt, :title, :target, :download')
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_link?' do
@@ -47,12 +55,14 @@ Capybara::SpecHelper.spec '#has_no_link?' do
     expect(@session).not_to have_no_link('foo')
     expect(@session).not_to have_no_link('awesome title')
     expect(@session).not_to have_no_link('A link', href: '/with_simple_html')
+    expect(@session).not_to have_no_link('labore', target: '_self')
   end
 
   it 'should be true if the given link is not on the page' do
     expect(@session).to have_no_link('monkey')
     expect(@session).to have_no_link('A link', href: '/nonexistent-href')
     expect(@session).to have_no_link('A link', href: %r{/nonexistent-href})
+    expect(@session).to have_no_link('labore', target: '_blank')
   end
 
   context 'with focused:', requires: [:active_element] do

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

@@ -8,10 +8,10 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
   it 'should be false if any of the given locators are on the page' do
     expect do
       expect(@session).to have_none_of_selectors(:xpath, '//p', '//a')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
     expect do
       expect(@session).to have_none_of_selectors(:css, 'p a#foo')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   it 'should be true if none of the given locators are on the page' do
@@ -24,7 +24,7 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
     expect(@session).to have_none_of_selectors('p a#doesnotexist', 'abbr')
     expect do
       expect(@session).to have_none_of_selectors('abbr', 'p a#foo')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   context 'should respect scopes' do
@@ -32,7 +32,7 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
       @session.within "//p[@id='first']" do
         expect do
           expect(@session).to have_none_of_selectors(".//a[@id='foo']")
-        end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+        end.to raise_error RSpec::Expectations::ExpectationNotMetError
         expect(@session).to have_none_of_selectors(".//a[@id='red']")
       end
     end
@@ -41,7 +41,7 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
       el = @session.find "//p[@id='first']"
       expect do
         expect(el).to have_none_of_selectors(".//a[@id='foo']")
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
       expect(el).to have_none_of_selectors(".//a[@id='red']")
     end
   end
@@ -50,14 +50,14 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
     it 'should apply the options to all locators' do
       expect do
         expect(@session).to have_none_of_selectors('//p//a', text: 'Redirect')
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
       expect(@session).to have_none_of_selectors('//p', text: 'Doesnotexist')
     end
 
     it 'should discard all matches where the given regexp is matched' do
       expect do
         expect(@session).to have_none_of_selectors('//p//a', text: /re[dab]i/i, count: 1)
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
       expect(@session).to have_none_of_selectors('//p//a', text: /Red$/)
     end
   end

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

@@ -179,6 +179,12 @@ Capybara::SpecHelper.spec '#has_select?' do
     end
   end
 
+  it 'should raise an error if an invalid option is passed' do
+    expect do
+      expect(@session).to have_select('form_languages', invalid: true)
+    end.to raise_error(ArgumentError, 'Invalid option(s) :invalid, should be one of :above, :below, :left_of, :right_of, :near, :count, :minimum, :maximum, :between, :text, :id, :class, :style, :visible, :obscured, :exact, :exact_text, :normalize_ws, :match, :wait, :filter_set, :focused, :disabled, :name, :placeholder, :options, :enabled_options, :disabled_options, :selected, :with_selected, :multiple, :with_options')
+  end
+
   it 'should support locator-less usage' do
     expect(@session.has_select?(with_options: %w[Norway Sweden])).to be true
     expect(@session).to have_select(with_options: ['London'])

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

@@ -153,16 +153,12 @@ Capybara::SpecHelper.spec '#has_text?' do
     expect(@session).to have_text(42)
   end
 
-  it 'should be true when passed nil' do
+  it 'should be true when passed nil, and warn about it' do
     # nil is converted to '' when to_s is invoked
     @session.visit('/with_html')
-    expect(@session).to have_text(nil)
-  end
-
-  it 'should warn when passed nil' do
-    @session.visit('/with_html')
-    expect_any_instance_of(Kernel).to receive(:warn).with(/Checking for expected text of nil is confusing/) # rubocop:disable RSpec/AnyInstance
-    expect(@session).to have_text(nil)
+    expect do
+      expect(@session).to have_text(nil)
+    end.to output(/Checking for expected text of nil is confusing/).to_stderr
   end
 
   it 'should wait for text to appear', requires: [:js] do

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

@@ -23,6 +23,7 @@ Capybara::SpecHelper.spec '#matches_style?', requires: [:css] do
     expect(@session.find(:css, '#first').matches_style?(display: /^in/)).to be false
   end
 
+  # rubocop:disable Capybara/MatchStyle
   it 'deprecated has_style?' do
     expect { have_style(display: /^bl/) }.to \
       output(/have_style is deprecated/).to_stderr
@@ -32,4 +33,5 @@ Capybara::SpecHelper.spec '#matches_style?', requires: [:css] do
     el.has_style?('display' => /^bl/)
     expect(Capybara::Helpers).to have_received(:warn)
   end
+  # rubocop:enable Capybara/MatchStyle
 end

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

@@ -157,6 +157,12 @@ Capybara::SpecHelper.spec 'node' do
         expect(@session.find(:css, '#existing_content_editable_child_parent').text).to eq("Some content\nWYSIWYG")
       end
     end
+
+    it 'should submit single text input forms if ended with \n' do
+      @session.visit('/form')
+      @session.find(:css, '#single_input').set("my entry\n")
+      expect(extract_results(@session)['single_input']).to eq('my entry')
+    end
   end
 
   describe '#tag_name' do
@@ -651,6 +657,16 @@ Capybara::SpecHelper.spec 'node' do
           expect(target).to have_text(%r{^HTML5 Dropped string: text/plain drag_html5-#{key}$}m, exact: true)
         end
       end
+
+      it 'should trigger a dragenter event, before the first 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)
+
+        # Events are listed in reverse chronological order
+        expect(@session).to have_text(/DragOver.*DragEnter/m)
+      end
     end
   end
 
@@ -775,6 +791,7 @@ Capybara::SpecHelper.spec 'node' do
     end
 
     it 'should allow to adjust the click offset', requires: [:js] do
+      Capybara.w3c_click_offset = false
       @session.visit('with_js')
       @session.find(:css, '#click-test').click(x: 5, y: 5)
       link = @session.find(:link, 'has-been-clicked')
@@ -901,6 +918,7 @@ Capybara::SpecHelper.spec 'node' do
     end
 
     it 'should allow to adjust the offset', requires: [:js] do
+      Capybara.w3c_click_offset = false
       @session.visit('with_js')
       @session.find(:css, '#click-test').double_click(x: 10, y: 5)
       link = @session.find(:link, 'has-been-double-clicked')
@@ -987,6 +1005,7 @@ Capybara::SpecHelper.spec 'node' do
     end
 
     it 'should allow to adjust the offset', requires: [:js] do
+      Capybara.w3c_click_offset = false
       @session.visit('with_js')
       @session.find(:css, '#click-test').right_click(x: 10, y: 10)
       link = @session.find(:link, 'has-been-right-clicked')
@@ -1181,7 +1200,7 @@ Capybara::SpecHelper.spec 'node' do
       @session.visit('/with_shadow')
       expect do
         shadow_root = @session.find(:css, '#shadow_host').shadow_root
-        expect(shadow_root).not_to be_nil
+        expect(shadow_root).to be_a(Capybara::Node::Element)
       end.not_to raise_error
     end
 
@@ -1216,6 +1235,26 @@ Capybara::SpecHelper.spec 'node' do
       end.not_to raise_error
       expect(descendant).to have_checked_field('shadow_checkbox')
     end
+
+    it 'should produce error messages when failing' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      expect do
+        expect(shadow_root).to have_css('#shadow_content', text: 'Not in the document')
+      end.to raise_error(/tag="ShadowRoot"/)
+    end
+
+    it 'should get visible text' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      expect(shadow_root).to have_text('some text scroll.html')
+    end
+
+    it 'should get all text' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      expect(shadow_root).to have_text(:all, 'some text scroll.html')
+    end
   end
 
   describe '#reload', requires: [:js] do

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

@@ -95,6 +95,19 @@ Capybara::SpecHelper.spec '#reset_session!' do
     expect(@session.windows.size).to eq 1
   end
 
+  it 'does not block opening a new window after a frame was switched to and not switched back', requires: [:windows] do
+    @session.visit('/with_iframe?id=test_iframe&url=/')
+    @session.switch_to_frame(@session.find(:frame, 'test_iframe'))
+    within_window_test = lambda do
+      @session.within_window(@session.open_new_window) do
+        @session.visit('/')
+      end
+    end
+    expect(&within_window_test).to raise_error(Capybara::ScopeError)
+    @session.reset_session!
+    expect(&within_window_test).not_to raise_error
+  end
+
   context 'When reuse_server == false' do
     let!(:orig_reuse_server) { Capybara.reuse_server }
 

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

@@ -36,7 +36,9 @@ 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.documentElement.scrollHeight - document.documentElement.clientHeight')
-    expect(@session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')).to eq [0, max_scroll]
+    scrolled_location_x, scrolled_location_y = @session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')
+    expect(scrolled_location_x).to be_within(0.5).of(0)
+    expect(scrolled_location_y).to be_within(0.5).of(max_scroll)
   end
 
   it 'can scroll the window to the vertical center' do

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

@@ -29,6 +29,6 @@ Capybara::SpecHelper.spec '#windows', requires: [:windows] do
     titles = @session.windows.map do |window|
       @session.within_window(window) { @session.title }
     end
-    expect(titles).to match_array(['With Windows', 'Title of the first popup', 'Title of popup two'])
+    expect(titles).to match_array(['With Windows', 'Title of the first popup', 'Title of popup two']) # rubocop:disable RSpec/MatchArray
   end
 end

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

@@ -49,6 +49,19 @@ Capybara::SpecHelper.spec '#within' do
         expect { @session.text }.to raise_error(StandardError)
       end
     end
+
+    it 'should pass scope element to the block' do
+      @session.within(:css, '#another_foo') do |scope|
+        expect(scope).to match_css('#another_foo')
+      end
+    end
+
+    it 'should scope click', requires: [:js] do
+      @session.within(:css, '#another_foo') do |scope|
+        @session.click
+        expect(scope).to have_text('I was clicked')
+      end
+    end
   end
 
   context 'with XPath selector' do