capybara 3.36.0 → 3.37.1

data/spec/result_spec.rb

@@ -86,25 +86,23 @@ RSpec.describe Capybara::Result do
     expect(result[2..].map(&:text)).to eq %w[Gamma Delta]
   end
 
-  eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.6
-    it 'supports inclusive positive beginless ranges' do
-      expect(result[..2].map(&:text)).to eq %w[Alpha Beta Gamma]
-    end
+  it 'supports inclusive positive beginless ranges' do
+    expect(result[..2].map(&:text)).to eq %w[Alpha Beta Gamma]
+  end
 
-    it 'supports inclusive negative beginless ranges' do
-      expect(result[..-2].map(&:text)).to eq %w[Alpha Beta Gamma]
-      expect(result[..-1].map(&:text)).to eq %w[Alpha Beta Gamma Delta]
-    end
+  it 'supports inclusive negative beginless ranges' do
+    expect(result[..-2].map(&:text)).to eq %w[Alpha Beta Gamma]
+    expect(result[..-1].map(&:text)).to eq %w[Alpha Beta Gamma Delta]
+  end
 
-    it 'supports exclusive positive beginless ranges' do
-      expect(result[...2].map(&:text)).to eq %w[Alpha Beta]
-    end
+  it 'supports exclusive positive beginless ranges' do
+    expect(result[...2].map(&:text)).to eq %w[Alpha Beta]
+  end
 
-    it 'supports exclusive negative beginless ranges' do
-      expect(result[...-2].map(&:text)).to eq %w[Alpha Beta]
-      expect(result[...-1].map(&:text)).to eq %w[Alpha Beta Gamma]
-    end
-  TEST
+  it 'supports exclusive negative beginless ranges' do
+    expect(result[...-2].map(&:text)).to eq %w[Alpha Beta]
+    expect(result[...-1].map(&:text)).to eq %w[Alpha Beta Gamma]
+  end
 
   it 'works with filter blocks' do
     result = string.all('//li') { |node| node.text == 'Alpha' }
@@ -115,52 +113,52 @@ RSpec.describe Capybara::Result do
   it 'should evaluate filters lazily for idx' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     # Not processed until accessed
-    expect(result.instance_variable_get('@result_cache').size).to be 0
+    expect(result.instance_variable_get(:@result_cache).size).to be 0
 
     # Only one retrieved when needed
     result.first
-    expect(result.instance_variable_get('@result_cache').size).to be 1
+    expect(result.instance_variable_get(:@result_cache).size).to be 1
 
     # works for indexed access
     result[0]
-    expect(result.instance_variable_get('@result_cache').size).to be 1
+    expect(result.instance_variable_get(:@result_cache).size).to be 1
 
     result[2]
-    expect(result.instance_variable_get('@result_cache').size).to be 3
+    expect(result.instance_variable_get(:@result_cache).size).to be 3
 
     # All cached when converted to array
     result.to_a
-    expect(result.instance_variable_get('@result_cache').size).to eq 4
+    expect(result.instance_variable_get(:@result_cache).size).to eq 4
   end
 
   it 'should evaluate filters lazily for range' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result[0..1]
-    expect(result.instance_variable_get('@result_cache').size).to be 2
+    expect(result.instance_variable_get(:@result_cache).size).to be 2
 
     expect(result[0..7].size).to eq 4
-    expect(result.instance_variable_get('@result_cache').size).to be 4
+    expect(result.instance_variable_get(:@result_cache).size).to be 4
   end
 
   it 'should evaluate filters lazily for idx and length' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result[1, 2]
-    expect(result.instance_variable_get('@result_cache').size).to be 3
+    expect(result.instance_variable_get(:@result_cache).size).to be 3
 
     expect(result[2, 5].size).to eq 2
-    expect(result.instance_variable_get('@result_cache').size).to be 4
+    expect(result.instance_variable_get(:@result_cache).size).to be 4
   end
 
   it 'should only need to evaluate one result for any?' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result.any?
-    expect(result.instance_variable_get('@result_cache').size).to be 1
+    expect(result.instance_variable_get(:@result_cache).size).to be 1
   end
 
   it 'should evaluate all elements when #to_a called' do
     # All cached when converted to array
     result.to_a
-    expect(result.instance_variable_get('@result_cache').size).to eq 4
+    expect(result.instance_variable_get(:@result_cache).size).to eq 4
   end
 
   describe '#each' do
@@ -169,7 +167,7 @@ RSpec.describe Capybara::Result do
       results = []
       result.each do |el|
         results << el
-        expect(result.instance_variable_get('@result_cache').size).to eq results.size
+        expect(result.instance_variable_get(:@result_cache).size).to eq results.size
       end
 
       expect(results.size).to eq 4
@@ -183,7 +181,7 @@ RSpec.describe Capybara::Result do
       it 'lazily evaluates' do
         skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
         result.each.with_index do |_el, idx|
-          expect(result.instance_variable_get('@result_cache').size).to eq(idx + 1) # 0 indexing
+          expect(result.instance_variable_get(:@result_cache).size).to eq(idx + 1) # 0 indexing
         end
       end
     end

data/spec/rspec/features_spec.rb

@@ -91,11 +91,11 @@ end
 
 ffeature 'if ffeature aliases focused tag then' do # rubocop:disable RSpec/Focus
   scenario 'scenario inside this feature has metatag focus tag' do |example|
-    expect(example.metadata[:focus]).to eq true
+    expect(example.metadata[:focus]).to be true
   end
 
   scenario 'other scenarios also has metatag focus tag' do |example|
-    expect(example.metadata[:focus]).to eq true
+    expect(example.metadata[:focus]).to be true
   end
 end
 # rubocop:enable RSpec/RepeatedExample, RSpec/MultipleDescribes

data/spec/rspec/scenarios_spec.rb

@@ -11,7 +11,7 @@ end
 
 feature 'if fscenario aliases focused tag then' do
   fscenario 'scenario should have focused meta tag' do |example| # rubocop:disable RSpec/Focus
-    expect(example.metadata[:focus]).to eq true
+    expect(example.metadata[:focus]).to be true
   end
 end
 

data/spec/sauce_spec_chrome.rb

@@ -15,9 +15,9 @@ Capybara.register_driver :sauce_chrome do |app|
     browser_name: 'chrome',
     version: '65.0',
     name: 'Capybara test',
-    build: ENV['TRAVIS_REPO_SLUG'] || "Ruby-RSpec-Selenium: Local-#{Time.now.to_i}",
-    username: ENV['SAUCE_USERNAME'],
-    access_key: ENV['SAUCE_ACCESS_KEY']
+    build: ENV.fetch('TRAVIS_REPO_SLUG', "Ruby-RSpec-Selenium: Local-#{Time.now.to_i}"),
+    username: ENV.fetch('SAUCE_USERNAME', nil),
+    access_key: ENV.fetch('SAUCE_ACCESS_KEY', nil)
   }
 
   options.delete(:browser_name)

data/spec/selector_spec.rb

@@ -159,7 +159,7 @@ RSpec.describe Capybara do
       end
 
       it 'returns nil if no match' do
-        expect(Capybara::Selector.for('nothing')).to be nil
+        expect(Capybara::Selector.for('nothing')).to be_nil
       end
     end
 
@@ -471,7 +471,7 @@ RSpec.describe Capybara do
         end
 
         it 'includes wildcarded keys in description' do
-          expect { string.find(:element, 'input', not_there: 'bad', presence: true, absence: false, count: 1) }
+          expect { string.all(:element, 'input', not_there: 'bad', presence: true, absence: false, count: 1) }
             .to(raise_error do |e|
               expect(e).to be_a(Capybara::ElementNotFound)
               expect(e.message).to include 'not_there => bad'

data/spec/selenium_spec_chrome.rb

@@ -8,7 +8,7 @@ require 'rspec/shared_spec_matchers'
 
 CHROME_DRIVER = :selenium_chrome
 
-Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-beta' if ENV['CI'] && ENV['CHROME_BETA']
+Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-beta' if ENV.fetch('CI', nil) && ENV.fetch('CHROME_BETA', nil)
 
 browser_options = ::Selenium::WebDriver::Chrome::Options.new
 browser_options.headless! if ENV['HEADLESS']

data/spec/selenium_spec_firefox.rb

@@ -72,6 +72,10 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
   when 'Capybara::Session selenium #accept_alert should handle the alert if the page changes',
        'Capybara::Session selenium #accept_alert with an asynchronous alert should accept the alert'
     skip 'No clue what Firefox is doing here - works fine on MacOS locally'
+  when 'Capybara::Session selenium node #shadow_root should get the shadow root',
+       'Capybara::Session selenium node #shadow_root should find elements inside the shadow dom using CSS',
+       'Capybara::Session selenium node #shadow_root should find nested shadow roots'
+    pending "Firefox doesn't yet have W3C shadow root support"
   end
 end
 
@@ -103,7 +107,7 @@ RSpec.describe 'Capybara::Session with firefox' do # rubocop:disable RSpec/Multi
     end
 
     it 'should fill in a datetime input with a String' do
-      pending "Need to figure out what string format this will actually accept"
+      pending 'Need to figure out what string format this will actually accept'
       session.fill_in('form_datetime', with: datetime.iso8601)
       session.click_button('awesome')
       expect(Time.parse(extract_results(session)['datetime'])).to eq datetime

data/spec/selenium_spec_safari.rb

@@ -80,10 +80,14 @@ Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybar
   when 'Capybara::Session selenium_safari node #double_click should allow modifiers'
     pending "safaridriver doesn't generate double click with key modifiers"
   when /when w3c_click_offset is true should offset/
-    pending "w3c_click_offset is not currently supported with safaridriver"
+    pending 'w3c_click_offset is not currently supported with safaridriver'
   when 'Capybara::Session selenium_safari #go_back should fetch a response from the driver from the previous page',
        'Capybara::Session selenium_safari #go_forward should fetch a response from the driver from the previous page'
     skip 'safaridriver loses the ability to find elements in the document after `go_back`'
+  when 'Capybara::Session selenium node #shadow_root should get the shadow root',
+    'Capybara::Session selenium node #shadow_root should find elements inside the shadow dom using CSS',
+    'Capybara::Session selenium node #shadow_root should find nested shadow roots'
+    pending "Safari doesn't yet have W3C shadow root support"
   end
 end
 

data/spec/server_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Capybara::Server do
 
   it 'should bind to the specified host' do
     # TODO: travis with jruby in container mode has an issue with this test
-    skip 'This platform has an issue with this test' if (ENV['TRAVIS'] && (RUBY_ENGINE == 'jruby')) || Gem.win_platform?
+    skip 'This platform has an issue with this test' if (ENV.fetch('TRAVIS', nil) && (RUBY_ENGINE == 'jruby')) || Gem.win_platform?
 
     begin
       app = proc { |_env| [200, {}, ['Hello Server!']] }
@@ -78,7 +78,7 @@ RSpec.describe Capybara::Server do
     # Use a port to force a EADDRINUSE error to be generated
     server = TCPServer.new('0.0.0.0', 0)
     server_port = server.addr[1]
-    d_server = instance_double('TCPServer', addr: [nil, server_port, nil, nil], close: nil)
+    d_server = instance_double(TCPServer, addr: [nil, server_port, nil, nil], close: nil)
     call_count = 0
     allow(TCPServer).to receive(:new).and_wrap_original do |m, *args|
       call_count.zero? ? d_server : m.call(*args)
@@ -184,7 +184,7 @@ RSpec.describe Capybara::Server do
         start_request(server2, 3.0)
         server1.wait_for_pending_requests
       end.to change { done }.from(0).to(2)
-      expect(server2.send(:pending_requests?)).to eq(false)
+      expect(server2.send(:pending_requests?)).to be(false)
     end
   end
 
@@ -229,7 +229,7 @@ RSpec.describe Capybara::Server do
         start_request(server2, 3.0)
         server1.wait_for_pending_requests
       end.to change { done }.from(0).to(1)
-      expect(server2.send(:pending_requests?)).to eq(true)
+      expect(server2.send(:pending_requests?)).to be(true)
       expect do
         server2.wait_for_pending_requests
       end.to change { done }.from(1).to(2)
@@ -274,7 +274,7 @@ RSpec.describe Capybara::Server do
     app = -> { [200, {}, ['Hello, world']] }
     server = described_class.new(app)
     allow(Net::HTTP).to receive(:start).and_raise(SystemCallError.allocate)
-    expect(server.responsive?).to eq false
+    expect(server.responsive?).to be false
   end
 
   [EOFError, Net::ReadTimeout].each do |err|

data/spec/shared_selenium_session.rb

@@ -23,7 +23,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       it 'freshly reset session should not be touched' do
         session.instance_variable_set(:@touched, true)
         session.reset!
-        expect(session.instance_variable_get(:@touched)).to eq false
+        expect(session.instance_variable_get(:@touched)).to be false
       end
     end
 
@@ -280,6 +280,13 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         expect(element).to eq session.find(:id, 'form_title')
       end
 
+      it 'returns a shadow root' do
+        session.visit('/with_shadow')
+        shadow = session.find(:css, '#shadow_host')
+        element = session.evaluate_script('arguments[0].shadowRoot', shadow)
+        expect(element).to be_instance_of(Capybara::Node::Element)
+      end
+
       it 'can return arrays of nested elements' do
         session.visit('/form')
         elements = session.evaluate_script('document.querySelectorAll("#form_city option")')
@@ -336,7 +343,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       it 'can attach a directory' do
         pending "Geckodriver doesn't support uploading a directory" if firefox?(session)
         pending "Selenium remote doesn't support transferring a directory" if remote?(session)
-        pending "Headless Chrome doesn't support directory upload - https://bugs.chromium.org/p/chromedriver/issues/detail?id=2521&q=directory%20upload&colspec=ID%20Status%20Pri%20Owner%20Summary" if chrome?(session) && ENV['HEADLESS']
+        pending "Headless Chrome doesn't support directory upload - https://bugs.chromium.org/p/chromedriver/issues/detail?id=2521&q=directory%20upload&colspec=ID%20Status%20Pri%20Owner%20Summary" if chrome?(session) && ENV.fetch('HEADLESS', nil)
         pending "IE doesn't support uploading a directory" if ie?(session)
         pending 'Chrome/chromedriver 73 breaks this' if chrome?(session) && chrome_gte?(73, session) && chrome_lt?(75, session)
         pending "Safari doesn't support uploading a directory" if safari?(session)

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rspec/expectations'
-require 'webdrivers' if ENV['CI'] || ENV['WEBDRIVERS']
+require 'webdrivers' if ENV.fetch('CI', nil) || ENV.fetch('WEBDRIVERS', nil)
 require 'selenium_statistics'
 if ENV['TRAVIS']
   require 'coveralls'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.36.0
+  version: 3.37.1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -734,6 +734,7 @@ files:
 - lib/capybara/spec/views/with_namespace.erb
 - lib/capybara/spec/views/with_scope.erb
 - lib/capybara/spec/views/with_scope_other.erb
+- lib/capybara/spec/views/with_shadow.erb
 - lib/capybara/spec/views/with_simple_html.erb
 - lib/capybara/spec/views/with_slow_unload.erb
 - lib/capybara/spec/views/with_sortable_js.erb
@@ -786,6 +787,7 @@ licenses:
 metadata:
   changelog_uri: https://github.com/teamcapybara/capybara/blob/master/History.md
   source_code_uri: https://github.com/teamcapybara/capybara
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -794,14 +796,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,