capybara 3.26.0 → 3.27.0

data/spec/filter_set_spec.rb

@@ -4,11 +4,11 @@ require 'spec_helper'
 
 RSpec.describe Capybara::Selector::FilterSet do
   after do
-    Capybara::Selector::FilterSet.remove(:test)
+    described_class.remove(:test)
   end
 
   it 'allows node filters' do
-    fs = Capybara::Selector::FilterSet.add(:test) do
+    fs = described_class.add(:test) do
       node_filter(:node_test, :boolean) { |_node, _value| true }
       expression_filter(:expression_test, :boolean) { |_expr, _value| true }
     end
@@ -18,7 +18,7 @@ RSpec.describe Capybara::Selector::FilterSet do
   end
 
   it 'allows expression filters' do
-    fs = Capybara::Selector::FilterSet.add(:test) do
+    fs = described_class.add(:test) do
       node_filter(:node_test, :boolean) { |_node, _value| true }
       expression_filter(:expression_test, :boolean) { |_expr, _value| true }
     end
@@ -28,7 +28,7 @@ RSpec.describe Capybara::Selector::FilterSet do
   end
 
   it 'allows node filter and expression filter with the same name' do
-    fs = Capybara::Selector::FilterSet.add(:test) do
+    fs = described_class.add(:test) do
       node_filter(:test, :boolean) { |_node, _value| true }
       expression_filter(:test, :boolean) { |_expr, _value| true }
     end
@@ -37,7 +37,7 @@ RSpec.describe Capybara::Selector::FilterSet do
   end
 
   it 'allows `filter` as an alias of `node_filter`' do
-    fs = Capybara::Selector::FilterSet.add(:test) do
+    fs = described_class.add(:test) do
       filter(:node_test, :boolean) { |_node, _value| true }
     end
 

data/spec/fixtures/selenium_driver_rspec_failure.rb

@@ -6,7 +6,7 @@ require 'selenium-webdriver'
 RSpec.describe Capybara::Selenium::Driver do
   it 'should exit with a non-zero exit status' do
     options = { browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym }
-    browser = Capybara::Selenium::Driver.new(TestApp, options).browser
+    browser = described_class.new(TestApp, options).browser
     expect(browser).to be_truthy
     expect(true).to eq(false) # rubocop:disable RSpec/ExpectActual
   end

data/spec/fixtures/selenium_driver_rspec_success.rb

@@ -6,7 +6,7 @@ require 'selenium-webdriver'
 RSpec.describe Capybara::Selenium::Driver do
   it 'should exit with a zero exit status' do
     options = { browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym }
-    browser = Capybara::Selenium::Driver.new(TestApp, options).browser
+    browser = described_class.new(TestApp, options).browser
     expect(browser).to be_truthy
     expect(true).to eq(true) # rubocop:disable RSpec/ExpectActual
   end

data/spec/rack_test_spec.rb

@@ -155,27 +155,27 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':headers option' do
     it 'should always set headers' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/get_header')
       expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on link clicks' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/header_links')
       driver.find_xpath('.//a').first.click
       expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on form submit' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/header_links')
       driver.find_xpath('.//input').first.click
       expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on redirects' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/get_header_via_redirect')
       expect(driver.html).to include('foobar')
     end
@@ -183,7 +183,7 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':follow_redirects option' do
     it 'defaults to following redirects' do
-      driver = Capybara::RackTest::Driver.new(TestApp)
+      driver = described_class.new(TestApp)
 
       driver.visit('/redirect')
       expect(driver.response.header['Location']).to be_nil
@@ -191,7 +191,7 @@ RSpec.describe Capybara::RackTest::Driver do
     end
 
     it 'is possible to not follow redirects' do
-      driver = Capybara::RackTest::Driver.new(TestApp, follow_redirects: false)
+      driver = described_class.new(TestApp, follow_redirects: false)
 
       driver.visit('/redirect')
       expect(driver.response.header['Location']).to match %r{/redirect_again$}
@@ -201,7 +201,7 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':redirect_limit option' do
     context 'with default redirect limit' do
-      let(:driver) { Capybara::RackTest::Driver.new(TestApp) }
+      let(:driver) { described_class.new(TestApp) }
 
       it 'should follow 5 redirects' do
         driver.visit('/redirect/5/times')
@@ -216,7 +216,7 @@ RSpec.describe Capybara::RackTest::Driver do
     end
 
     context 'with 21 redirect limit' do
-      let(:driver) { Capybara::RackTest::Driver.new(TestApp, redirect_limit: 21) }
+      let(:driver) { described_class.new(TestApp, redirect_limit: 21) }
 
       it 'should follow 21 redirects' do
         driver.visit('/redirect/21/times')
@@ -251,6 +251,6 @@ RSpec.describe Capybara::RackTest::CSSHandlers do
   include CSSHandlerIncludeTester
 
   it 'should not be extended by global includes' do
-    expect(Capybara::RackTest::CSSHandlers.new).not_to respond_to(:dont_extend_css_handler)
+    expect(described_class.new).not_to respond_to(:dont_extend_css_handler)
   end
 end

data/spec/regexp_dissassembler_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe Capybara::Selector::RegexpDisassembler, :aggregate_failures do
       /abc?def?g/ => %w[ab de g],
       /d?/ => []
     }.each do |regexp, expected|
-      expect(Capybara::Selector::RegexpDisassembler.new(regexp).substrings).to eq expected
+      expect(described_class.new(regexp).substrings).to eq expected
     end
   end
 
@@ -131,7 +131,7 @@ RSpec.describe Capybara::Selector::RegexpDisassembler, :aggregate_failures do
       /ab(cd|cd)?ef/ => %w[ab ef],
       /ab\\?cd/ => %w[ab cd]
     }.each do |regexp, expected|
-      expect(Capybara::Selector::RegexpDisassembler.new(regexp).substrings).to eq expected
+      expect(described_class.new(regexp).substrings).to eq expected
     end
   end
 
@@ -212,6 +212,16 @@ RSpec.describe Capybara::Selector::RegexpDisassembler, :aggregate_failures do
     )
   end
 
+  it 'ignores negative lookaheads' do
+    verify_strings(
+      /^(?!.*\bContributing Editor\b).*$/ => %w[],
+      /abc(?!.*def).*/ => %w[abc],
+      /(?!.*def)abc/ => %w[abc],
+      /abc(?!.*def.*).*ghi/ => %w[abc ghi],
+      /abc(?!.*bcd)def/ => %w[abcdef]
+    )
+  end
+
   it 'handles anchors' do
     verify_strings(
       /^abc/ => %w[abc],

data/spec/rspec/shared_spec_matchers.rb

@@ -682,12 +682,12 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'treats a given value as a string' do
-      class Foo
+      foo = Class.new do
         def to_s
           'some value'
         end
       end
-      expect(html).to have_field('Text field', with: Foo.new)
+      expect(html).to have_field('Text field', with: foo.new)
     end
 
     it 'supports compounding' do

data/spec/rspec_spec.rb

@@ -76,7 +76,7 @@ RSpec.describe 'capybara/rspec' do
   context 'Type: Other', type: :other do
     context 'when RSpec::Matchers is included after Capybara::DSL' do
       let(:test_class_instance) do
-        class DSLMatchersTest
+        Class.new do
           include Capybara::DSL
           include RSpec::Matchers
         end.new

data/spec/selector_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Capybara do
   describe 'Selectors' do
     let :string do
-      Capybara.string <<-STRING
+      described_class.string <<-STRING
         <html>
           <head>
             <title>selectors</title>
@@ -69,12 +69,12 @@ RSpec.describe Capybara do
     end
 
     before do
-      Capybara.add_selector :custom_selector do
+      described_class.add_selector :custom_selector do
         css { |css_class| "div.#{css_class}" }
         node_filter(:not_empty, boolean: true, default: true, skip_if: :all) { |node, value| value ^ (node.text == '') }
       end
 
-      Capybara.add_selector :custom_css_selector do
+      described_class.add_selector :custom_css_selector do
         css(:name, :other_name) do |selector, name: nil, **|
           selector ||= ''
           selector += "[name='#{name}']" if name
@@ -94,7 +94,7 @@ RSpec.describe Capybara do
         end
       end
 
-      Capybara.add_selector :custom_xpath_selector do
+      described_class.add_selector :custom_xpath_selector do
         xpath(:valid1, :valid2) { |selector| selector }
         match { |value| value == 'match_me' }
       end
@@ -102,7 +102,7 @@ RSpec.describe Capybara do
 
     it 'supports `filter` as an alias for `node_filter`' do
       expect do
-        Capybara.add_selector :filter_alias_selector do
+        described_class.add_selector :filter_alias_selector do
           css { |_unused| 'div' }
           filter(:something) { |_node, _value| true }
         end
@@ -111,7 +111,7 @@ RSpec.describe Capybara do
 
     describe 'adding a selector' do
       it 'can set default visiblity' do
-        Capybara.add_selector :hidden_field do
+        described_class.add_selector :hidden_field do
           visible :hidden
           css { |_sel| 'input[type="hidden"]' }
         end
@@ -125,7 +125,7 @@ RSpec.describe Capybara do
       it 'allows modifying a selector' do
         el = string.find(:custom_selector, 'aa')
         expect(el.tag_name).to eq 'div'
-        Capybara.modify_selector :custom_selector do
+        described_class.modify_selector :custom_selector do
           css { |css_class| "h1.#{css_class}" }
         end
         el = string.find(:custom_selector, 'aa')
@@ -133,7 +133,7 @@ RSpec.describe Capybara do
       end
 
       it "doesn't change existing filters" do
-        Capybara.modify_selector :custom_selector do
+        described_class.modify_selector :custom_selector do
           css { |css_class| "p.#{css_class}" }
         end
         expect(string).to have_selector(:custom_selector, 'bb', count: 1)
@@ -164,7 +164,7 @@ RSpec.describe Capybara do
 
     describe 'xpath' do
       it 'uses filter names passed in' do
-        Capybara.add_selector :test do
+        described_class.add_selector :test do
           xpath(:something, :other) { |_locator| XPath.descendant }
         end
         selector = Capybara::Selector.new :test, config: nil, format: nil
@@ -173,7 +173,7 @@ RSpec.describe Capybara do
       end
 
       it 'gets filter names from block if none passed to xpath method' do
-        Capybara.add_selector :test do
+        described_class.add_selector :test do
           xpath { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
         selector = Capybara::Selector.new :test, config: nil, format: nil
@@ -182,7 +182,7 @@ RSpec.describe Capybara do
       end
 
       it 'ignores block parameters if names passed in' do
-        Capybara.add_selector :test do
+        described_class.add_selector :test do
           xpath(:valid1) { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
         selector = Capybara::Selector.new :test, config: nil, format: nil
@@ -205,7 +205,7 @@ RSpec.describe Capybara do
       end
 
       it 'uses filter names passed in' do
-        Capybara.add_selector :test do
+        described_class.add_selector :test do
           css(:name, :other_name) { |_locator| '' }
         end
         selector = Capybara::Selector.new :test, config: nil, format: nil
@@ -214,7 +214,7 @@ RSpec.describe Capybara do
       end
 
       it 'gets filter names from block if none passed to css method' do
-        Capybara.add_selector :test do
+        described_class.add_selector :test do
           css { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
         selector = Capybara::Selector.new :test, config: nil, format: nil
@@ -223,7 +223,7 @@ RSpec.describe Capybara do
       end
 
       it 'ignores block parameters if names passed in' do
-        Capybara.add_selector :test do
+        described_class.add_selector :test do
           css(:valid1) { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
         selector = Capybara::Selector.new :test, config: nil, format: nil
@@ -477,7 +477,7 @@ RSpec.describe Capybara do
 
       describe ':link_or_button selector' do
         around(:all) do |example|
-          Capybara.modify_selector(:link_or_button) do
+          described_class.modify_selector(:link_or_button) do
             expression_filter(:random) { |xpath, _| xpath } # do nothing filter
           end
           example.run

data/spec/selenium_spec_chrome.rb

@@ -28,6 +28,22 @@ Capybara.register_driver :selenium_chrome_not_clear_storage do |app|
   Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: false, clear_session_storage: false))
 end
 
+Capybara.register_driver :selenium_chrome_not_clear_session_storage do |app|
+  chrome_options = {
+    browser: :chrome,
+    options: browser_options
+  }
+  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_session_storage: false))
+end
+
+Capybara.register_driver :selenium_chrome_not_clear_local_storage do |app|
+  chrome_options = {
+    browser: :chrome,
+    options: browser_options
+  }
+  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: false))
+end
+
 Capybara.register_driver :selenium_driver_subclass_with_chrome do |app|
   subclass = Class.new(Capybara::Selenium::Driver)
   subclass.new(app, browser: :chrome, options: browser_options, timeout: 30)
@@ -47,6 +63,8 @@ Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybar
     skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
   when /Capybara::Session selenium_chrome Capybara::Window#maximize/
     pending "Chrome headless doesn't support maximize" if ENV['HEADLESS']
+  when /details non-summary descendants should be non-visible/
+    pending 'Chromedriver built-in is_displayed is currently broken' if ENV['W3C'] == 'false'
   end
 end
 
@@ -77,6 +95,26 @@ RSpec.describe 'Capybara::Session with chrome' do
         expect(session.evaluate_script('Object.keys(localStorage)')).not_to be_empty
         expect(session.evaluate_script('Object.keys(sessionStorage)')).not_to be_empty
       end
+
+      it 'can not clear session storage' do
+        session = Capybara::Session.new(:selenium_chrome_not_clear_session_storage, TestApp)
+        session.visit('/with_js')
+        session.find(:css, '#set-storage').click
+        session.reset!
+        session.visit('/with_js')
+        expect(session.evaluate_script('Object.keys(localStorage)')).to be_empty
+        expect(session.evaluate_script('Object.keys(sessionStorage)')).not_to be_empty
+      end
+
+      it 'can not clear local storage' do
+        session = Capybara::Session.new(:selenium_chrome_not_clear_local_storage, TestApp)
+        session.visit('/with_js')
+        session.find(:css, '#set-storage').click
+        session.reset!
+        session.visit('/with_js')
+        expect(session.evaluate_script('Object.keys(localStorage)')).not_to be_empty
+        expect(session.evaluate_script('Object.keys(sessionStorage)')).to be_empty
+      end
     end
   end
 

data/spec/selenium_spec_firefox.rb

@@ -106,7 +106,7 @@ RSpec.describe 'Capybara::Session with firefox' do # rubocop:disable RSpec/Multi
 end
 
 RSpec.describe Capybara::Selenium::Driver do
-  let(:driver) { Capybara::Selenium::Driver.new(TestApp, browser: :firefox, options: browser_options) }
+  let(:driver) { described_class.new(TestApp, browser: :firefox, options: browser_options) }
 
   describe '#quit' do
     it 'should reset browser when quit' do

data/spec/server_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Capybara::Server do
   it 'should spool up a rack server' do
     app = proc { |_env| [200, {}, ['Hello Server!']] }
-    server = Capybara::Server.new(app).boot
+    server = described_class.new(app).boot
 
     res = Net::HTTP.start(server.host, server.port) { |http| http.get('/') }
 
@@ -14,7 +14,7 @@ RSpec.describe Capybara::Server do
 
   it 'should do nothing when no server given' do
     expect do
-      Capybara::Server.new(nil).boot
+      described_class.new(nil).boot
     end.not_to raise_error
   end
 
@@ -26,12 +26,12 @@ RSpec.describe Capybara::Server do
       app = proc { |_env| [200, {}, ['Hello Server!']] }
 
       Capybara.server_host = '127.0.0.1'
-      server = Capybara::Server.new(app).boot
+      server = described_class.new(app).boot
       res = Net::HTTP.get(URI("http://127.0.0.1:#{server.port}"))
       expect(res).to eq('Hello Server!')
 
       Capybara.server_host = '0.0.0.0'
-      server = Capybara::Server.new(app).boot
+      server = described_class.new(app).boot
       res = Net::HTTP.get(URI("http://127.0.0.1:#{server.port}"))
       expect(res).to eq('Hello Server!')
     ensure
@@ -43,7 +43,7 @@ RSpec.describe Capybara::Server do
     Capybara.server_port = 22789
 
     app = proc { |_env| [200, {}, ['Hello Server!']] }
-    server = Capybara::Server.new(app).boot
+    server = described_class.new(app).boot
 
     res = Net::HTTP.start(server.host, 22789) { |http| http.get('/') }
     expect(res.body).to include('Hello Server')
@@ -53,7 +53,7 @@ RSpec.describe Capybara::Server do
 
   it 'should use given port' do
     app = proc { |_env| [200, {}, ['Hello Server!']] }
-    server = Capybara::Server.new(app, port: 22790).boot
+    server = described_class.new(app, port: 22790).boot
 
     res = Net::HTTP.start(server.host, 22790) { |http| http.get('/') }
     expect(res.body).to include('Hello Server')
@@ -66,7 +66,7 @@ RSpec.describe Capybara::Server do
     apps = responses.map do |response|
       proc { |_env| [200, {}, [response]] }
     end
-    servers = apps.map { |app| Capybara::Server.new(app).boot }
+    servers = apps.map { |app| described_class.new(app).boot }
 
     servers.each_with_index do |server, idx|
       result = Net::HTTP.start(server.host, server.port) { |http| http.get('/') }
@@ -76,7 +76,7 @@ RSpec.describe Capybara::Server do
 
   it 'should return its #base_url' do
     app = proc { |_env| [200, {}, ['Hello Server!']] }
-    server = Capybara::Server.new(app).boot
+    server = described_class.new(app).boot
     uri = ::Addressable::URI.parse(server.base_url)
     expect(uri.to_hash).to include(scheme: 'http', host: server.host, port: server.port)
   end
@@ -87,7 +87,7 @@ RSpec.describe Capybara::Server do
       cert = File.join(Dir.pwd, 'spec', 'fixtures', 'certificate.pem')
       Capybara.server = :puma, { Host: "ssl://#{Capybara.server_host}?key=#{key}&cert=#{cert}" }
       app = proc { |_env| [200, {}, ['Hello SSL Server!']] }
-      server = Capybara::Server.new(app).boot
+      server = described_class.new(app).boot
 
       expect do
         Net::HTTP.start(server.host, server.port, max_retries: 0) { |http| http.get('/__identify__') }
@@ -121,7 +121,7 @@ RSpec.describe Capybara::Server do
     it 'should use the existing server if it already running' do
       app = proc { |_env| [200, {}, ['Hello Server!']] }
 
-      servers = Array.new(2) { Capybara::Server.new(app).boot }
+      servers = Array.new(2) { described_class.new(app).boot }
 
       servers.each do |server|
         res = Net::HTTP.start(server.host, server.port) { |http| http.get('/') }
@@ -141,8 +141,8 @@ RSpec.describe Capybara::Server do
         [200, {}, ['Hello Server!']]
       end
 
-      server1 = Capybara::Server.new(app).boot
-      server2 = Capybara::Server.new(app).boot
+      server1 = described_class.new(app).boot
+      server2 = described_class.new(app).boot
 
       expect do
         start_request(server1, 1.0)
@@ -166,7 +166,7 @@ RSpec.describe Capybara::Server do
     it 'should not reuse an already running server' do
       app = proc { |_env| [200, {}, ['Hello Server!']] }
 
-      servers = Array.new(2) { Capybara::Server.new(app).boot }
+      servers = Array.new(2) { described_class.new(app).boot }
 
       servers.each do |server|
         res = Net::HTTP.start(server.host, server.port) { |http| http.get('/') }
@@ -186,8 +186,8 @@ RSpec.describe Capybara::Server do
         [200, {}, ['Hello Server!']]
       end
 
-      server1 = Capybara::Server.new(app).boot
-      server2 = Capybara::Server.new(app).boot
+      server1 = described_class.new(app).boot
+      server2 = described_class.new(app).boot
 
       expect do
         start_request(server1, 1.0)
@@ -210,7 +210,7 @@ RSpec.describe Capybara::Server do
       Capybara.server = :kaboom
 
       expect do
-        Capybara::Server.new(proc { |e| }).boot
+        described_class.new(proc { |e| }).boot
       end.to raise_error(RuntimeError, 'kaboom')
     ensure
       Capybara.server = :default
@@ -219,7 +219,7 @@ RSpec.describe Capybara::Server do
 
   it 'is not #responsive? when Net::HTTP raises a SystemCallError' do
     app = -> { [200, {}, ['Hello, world']] }
-    server = Capybara::Server.new(app)
+    server = described_class.new(app)
     allow(Net::HTTP).to receive(:start).and_raise(SystemCallError.allocate)
     expect(server.responsive?).to eq false
   end
@@ -234,7 +234,7 @@ RSpec.describe Capybara::Server do
       response = Net::HTTPSuccess.allocate
       allow(response).to receive(:body).and_return app.object_id.to_s
       allow(Net::HTTP).to receive(:start).with(anything, anything, hash_including(use_ssl: true)).and_return(response).once
-      Capybara::Server.new(app).boot
+      described_class.new(app).boot
       expect(Net::HTTP).to have_received(:start).exactly(3).times
     end
   end