capybara 3.36.0 → 3.37.1

data/lib/capybara/session.rb

@@ -765,33 +765,20 @@ module Capybara
     end
 
     NODE_METHODS.each do |method|
-      if RUBY_VERSION >= '2.7'
-        class_eval <<~METHOD, __FILE__, __LINE__ + 1
-          def #{method}(...)
-            @touched = true
-            current_scope.#{method}(...)
-          end
-        METHOD
-      else
-        define_method method do |*args, &block|
+      class_eval <<~METHOD, __FILE__, __LINE__ + 1
+        def #{method}(...)
           @touched = true
-          current_scope.send(method, *args, &block)
+          current_scope.#{method}(...)
         end
-      end
+      METHOD
     end
 
     DOCUMENT_METHODS.each do |method|
-      if RUBY_VERSION >= '2.7'
-        class_eval <<~METHOD, __FILE__, __LINE__ + 1
-          def #{method}(...)
-            document.#{method}(...)
-          end
-        METHOD
-      else
-        define_method method do |*args, &block|
-          document.send(method, *args, &block)
+      class_eval <<~METHOD, __FILE__, __LINE__ + 1
+        def #{method}(...)
+          document.#{method}(...)
         end
-      end
+      METHOD
     end
 
     def inspect

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

@@ -132,7 +132,7 @@ Capybara::SpecHelper.spec '#all' do
       it 'should use the sessions ignore_hidden_elements', psc: true do
         Capybara.ignore_hidden_elements = true
         @session.config.ignore_hidden_elements = false
-        expect(Capybara.ignore_hidden_elements).to eq(true)
+        expect(Capybara.ignore_hidden_elements).to be(true)
         expect(@session.all(:css, 'a.simple').size).to eq(2)
         @session.config.ignore_hidden_elements = true
         expect(@session.all(:css, 'a.simple').size).to eq(1)
@@ -208,12 +208,10 @@ Capybara::SpecHelper.spec '#all' do
         expect { @session.all(:css, 'h1, p', between: 5..) }.to raise_error(Capybara::ExpectationNotMet)
       end
 
-      eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.6
-        it'treats a beginless range as maximum' do
-          expect { @session.all(:css, 'h1, p', between: ..7) }.not_to raise_error
-          expect { @session.all(:css, 'h1, p', between: ..3) }.to raise_error(Capybara::ExpectationNotMet)
-        end
-      TEST
+      it 'treats a beginless range as maximum' do
+        expect { @session.all(:css, 'h1, p', between: ..7) }.not_to raise_error
+        expect { @session.all(:css, 'h1, p', between: ..3) }.to raise_error(Capybara::ExpectationNotMet)
+      end
     end
 
     context 'with multiple count filters' do

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

@@ -3,16 +3,16 @@
 Capybara::SpecHelper.spec '#assert_text' do
   it 'should be true if the given text is on the page' do
     @session.visit('/with_html')
-    expect(@session.assert_text('est')).to eq(true)
-    expect(@session.assert_text('Lorem')).to eq(true)
-    expect(@session.assert_text('Redirect')).to eq(true)
-    expect(@session.assert_text(:Redirect)).to eq(true)
-    expect(@session.assert_text('text with   whitespace')).to eq(true)
+    expect(@session.assert_text('est')).to be(true)
+    expect(@session.assert_text('Lorem')).to be(true)
+    expect(@session.assert_text('Redirect')).to be(true)
+    expect(@session.assert_text(:Redirect)).to be(true)
+    expect(@session.assert_text('text with   whitespace')).to be(true)
   end
 
   it 'should support collapsing whitespace' do
     @session.visit('/with_html')
-    expect(@session.assert_text('text with whitespace', normalize_ws: true)).to eq(true)
+    expect(@session.assert_text('text with whitespace', normalize_ws: true)).to be(true)
   end
 
   context 'with enabled default collapsing whitespace' do
@@ -20,19 +20,19 @@ Capybara::SpecHelper.spec '#assert_text' do
 
     it 'should be true if the given unnormalized text is on the page' do
       @session.visit('/with_html')
-      expect(@session.assert_text('text with   whitespace', normalize_ws: false)).to eq(true)
+      expect(@session.assert_text('text with   whitespace', normalize_ws: false)).to be(true)
     end
 
     it 'should support collapsing whitespace' do
       @session.visit('/with_html')
-      expect(@session.assert_text('text with whitespace')).to eq(true)
+      expect(@session.assert_text('text with whitespace')).to be(true)
     end
   end
 
   it 'should take scopes into account' do
     @session.visit('/with_html')
     @session.within("//a[@title='awesome title']") do
-      expect(@session.assert_text('labore')).to eq(true)
+      expect(@session.assert_text('labore')).to be(true)
     end
   end
 
@@ -47,13 +47,13 @@ Capybara::SpecHelper.spec '#assert_text' do
 
   it 'should be true if :all given and text is invisible.' do
     @session.visit('/with_html')
-    expect(@session.assert_text(:all, 'Some of this text is hidden!')).to eq(true)
+    expect(@session.assert_text(:all, 'Some of this text is hidden!')).to be(true)
   end
 
   it 'should be true if `Capybara.ignore_hidden_elements = true` and text is invisible.' do
     Capybara.ignore_hidden_elements = false
     @session.visit('/with_html')
-    expect(@session.assert_text('Some of this text is hidden!')).to eq(true)
+    expect(@session.assert_text('Some of this text is hidden!')).to be(true)
   end
 
   it 'should raise error with a helpful message if the requested text is present but invisible' do
@@ -88,7 +88,7 @@ Capybara::SpecHelper.spec '#assert_text' do
 
   it 'should be true if the text in the page matches given regexp' do
     @session.visit('/with_html')
-    expect(@session.assert_text(/Lorem/)).to eq(true)
+    expect(@session.assert_text(/Lorem/)).to be(true)
   end
 
   it "should raise error if the text in the page doesn't match given regexp" do
@@ -109,13 +109,13 @@ Capybara::SpecHelper.spec '#assert_text' do
     Capybara.default_max_wait_time = 2
     @session.visit('/with_js')
     @session.click_link('Click me')
-    expect(@session.assert_text('Has been clicked')).to eq(true)
+    expect(@session.assert_text('Has been clicked')).to be(true)
   end
 
   context 'with between' do
     it 'should be true if the text occurs within the range given' do
       @session.visit('/with_count')
-      expect(@session.assert_text('count', between: 1..3)).to eq(true)
+      expect(@session.assert_text('count', between: 1..3)).to be(true)
     end
 
     it 'should be false if the text occurs more or fewer times than range' do
@@ -203,13 +203,13 @@ Capybara::SpecHelper.spec '#assert_no_text' do
   it 'should be true if scoped to an element which does not have the text' do
     @session.visit('/with_html')
     @session.within("//a[@title='awesome title']") do
-      expect(@session.assert_no_text('monkey')).to eq(true)
+      expect(@session.assert_no_text('monkey')).to be(true)
     end
   end
 
   it 'should be true if the given text is on the page but not visible' do
     @session.visit('/with_html')
-    expect(@session.assert_no_text('Inside element with hidden ancestor')).to eq(true)
+    expect(@session.assert_no_text('Inside element with hidden ancestor')).to be(true)
   end
 
   it 'should raise error if :all given and text is invisible.' do
@@ -236,7 +236,7 @@ Capybara::SpecHelper.spec '#assert_no_text' do
   context 'with count' do
     it 'should be true if the text occurs within the range given' do
       @session.visit('/with_count')
-      expect(@session.assert_text('count', count: 2)).to eq(true)
+      expect(@session.assert_text('count', count: 2)).to be(true)
     end
 
     it 'should be false if the text occurs more or fewer times than range' do

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

@@ -528,4 +528,10 @@ 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)
+    expect(Capybara::Helpers).to have_received(:warn).with(/'find' does not support count options/)
+  end
 end

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

@@ -16,8 +16,8 @@ Capybara::SpecHelper.spec '#has_current_path?' do
 
   it 'should not raise an error when non-http' do
     @session.reset_session!
-    expect(@session.has_current_path?(/monkey/)).to eq false
-    expect(@session.has_current_path?('/with_js')).to eq false
+    expect(@session.has_current_path?(/monkey/)).to be false
+    expect(@session.has_current_path?('/with_js')).to be false
   end
 
   it 'should handle non-escaped query options' do

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

@@ -383,7 +383,7 @@ Capybara::SpecHelper.spec '#has_no_unchecked_field?' do
   end
 
   it 'should support locator-less usage' do
-    expect(@session.has_no_unchecked_field?(disabled: false, id: 'form_disabled_unchecked_checkbox')).to eq true
+    expect(@session.has_no_unchecked_field?(disabled: false, id: 'form_disabled_unchecked_checkbox')).to be true
     expect(@session).to have_no_unchecked_field(disabled: false, id: 'form_disabled_unchecked_checkbox')
   end
 end

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

@@ -19,6 +19,12 @@ Capybara::SpecHelper.spec '#has_link?' do
     expect(@session).not_to have_link('A link', href: /nonexistent/)
   end
 
+  it 'should notify if an invalid locator is specified' do
+    allow(Capybara::Helpers).to receive(:warn).and_return(nil)
+    @session.has_link?(@session)
+    expect(Capybara::Helpers).to have_received(:warn).with(/Called from: .+/)
+  end
+
   context 'with focused:', requires: [:active_element] do
     it 'should be true if the given link is on the page and has focus' do
       @session.send_keys(:tab)

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

@@ -180,9 +180,9 @@ Capybara::SpecHelper.spec '#has_select?' do
   end
 
   it 'should support locator-less usage' do
-    expect(@session.has_select?(with_options: %w[Norway Sweden])).to eq true
+    expect(@session.has_select?(with_options: %w[Norway Sweden])).to be true
     expect(@session).to have_select(with_options: ['London'])
-    expect(@session.has_select?(with_selected: %w[Commando Boxerbriefs])).to eq true
+    expect(@session.has_select?(with_selected: %w[Commando Boxerbriefs])).to be true
     expect(@session).to have_select(with_selected: ['Briefs'])
   end
 end
@@ -302,9 +302,9 @@ Capybara::SpecHelper.spec '#has_no_select?' do
   end
 
   it 'should support locator-less usage' do
-    expect(@session.has_no_select?(with_options: %w[Norway Sweden Finland Latvia])).to eq true
+    expect(@session.has_no_select?(with_options: %w[Norway Sweden Finland Latvia])).to be true
     expect(@session).to have_no_select(with_options: ['New London'])
-    expect(@session.has_no_select?(id: 'form_underwear', with_selected: ['Boxers'])).to eq true
+    expect(@session.has_no_select?(id: 'form_underwear', with_selected: ['Boxers'])).to be true
     expect(@session).to have_no_select(id: 'form_underwear', with_selected: %w[Commando Boxers])
   end
 end

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

@@ -117,6 +117,21 @@ Capybara::SpecHelper.spec '#has_selector?' do
         expect(@session).to have_selector(:id, 'h2one', text: 'Header Class Test One', exact_text: false)
         expect(@session).to have_selector(:id, 'h2one', text: 'Header Class Test', exact_text: false)
       end
+
+      it 'should warn if text option is a regexp that it is ignoring exact_text' do
+        allow(Capybara::Helpers).to receive(:warn)
+        expect(@session).to have_selector(:id, 'h2one', text: /Class Test/, exact_text: true)
+        expect(Capybara::Helpers).to have_received(:warn).with(/'exact_text' option is not supported/)
+      end
+    end
+
+    context 'regexp' do
+      it 'should only match when it fully matches' do
+        expect(@session).to have_selector(:id, 'h2one', exact_text: /Header Class Test One/)
+        expect(@session).to have_no_selector(:id, 'h2one', exact_text: /Header Class Test/)
+        expect(@session).to have_no_selector(:id, 'h2one', exact_text: /Class Test One/)
+        expect(@session).to have_no_selector(:id, 'h2one', exact_text: /Class Test/)
+      end
     end
   end
 

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

@@ -127,11 +127,7 @@ Capybara::SpecHelper.spec '#has_text?' do
         def to_hash; { value: 'Other hash' } end
       end.new
       @session.visit('/with_html')
-      if RUBY_VERSION >= '2.7'
-        expect(@session).to have_text(:visible, with_to_hash, **{})
-      else
-        expect(@session).to have_text(:visible, with_to_hash, {})
-      end
+      expect(@session).to have_text(:visible, with_to_hash, **{})
     end
   end
 

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

@@ -1176,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/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

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

@@ -59,7 +59,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
     it 'should return false if window is closed' do
       @session.switch_to_window(other_window)
       other_window.close
-      expect(other_window.current?).to eq(false)
+      expect(other_window.current?).to be(false)
     end
   end
 

data/lib/capybara/spec/test_app.rb

@@ -177,6 +177,55 @@ class TestApp < Sinatra::Base
     HTML
   end
 
+  get '/base/with_base' do
+    <<-HTML
+      <!DOCTYPE html>
+      <html>
+        <head>
+          <base href="/">
+          <title>Origin</title>
+        </head>
+        <body>
+          <a href="with_title">Title page</a>
+          <a href="?a=3">Bare query</a>
+        </body>
+      </html>
+    HTML
+  end
+
+  get '/base/with_other_base' do
+    <<-HTML
+      <!DOCTYPE html>
+      <html>
+        <head>
+          <base href="/base/">
+          <title>Origin</title>
+        </head>
+        <body>
+          <a href="with_title">Title page</a>
+          <a href="?a=3">Bare query</a>
+        </body>
+      </html>
+    HTML
+  end
+
+  get '/csp' do
+    response.headers['Content-Security-Policy'] = "default-src 'none'; connect-src 'self'; base-uri 'none'; font-src 'self'; img-src 'self' data:; object-src 'none'; script-src 'self' 'nonce-jAviMuMisoTisVXjgLoWdA=='; style-src 'self' 'nonce-jAviMuMisoTisVXjgLoWdA=='; form-action 'self';"
+    <<-HTML
+      <!DOCTYPE html>
+      <html lang="en">
+        <head>
+          <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+          <title>CSP</title>
+        </head>
+
+        <body>
+          <div>CSP</div>
+        </body>
+      </html>
+    HTML
+  end
+
   get '/download.csv' do
     content_type 'text/csv'
     'This, is, comma, separated' \

data/lib/capybara/spec/views/with_shadow.erb

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<%# Borrowed from Titus Fortner %>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Shadow DOM</title>
+  </head>
+  <body>
+    <div id="no_host"></div>
+    <div id="shadow_host"></div>
+    <a href="scroll.html">scroll.html</a>
+    <script>
+      let shadowRoot = document.getElementById('shadow_host').attachShadow({mode: 'open'});
+      shadowRoot.innerHTML = `
+              <span class="wrapper" id="shadow_content"><span class="info">some text</span></span>
+              <div id="nested_shadow_host"></div>
+              <a href="scroll.html">scroll.html</a>
+	  		  <div id="controls_wrapper">
+                <input type="text" />
+                <input type="checkbox" id="shadow_checkbox" />
+                <input type="file" />
+	 		  </div>
+            `;
+
+      let nestedShadowRoot = shadowRoot.getElementById('nested_shadow_host').attachShadow({mode: 'open'});
+      nestedShadowRoot.innerHTML = `
+              <div id="nested_shadow_content"><div>nested text</div></div>
+            `;
+    </script>
+  </body>
+</html>

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.36.0'
+  VERSION = '3.37.1'
 end

data/lib/capybara/window.rb

@@ -118,7 +118,7 @@ module Capybara
     alias_method :==, :eql?
 
     def hash
-      @session.hash ^ @handle.hash
+      [@session, @handle].hash
     end
 
     def inspect

data/lib/capybara.rb

@@ -96,6 +96,7 @@ module Capybara
     #   {Capybara::Session#save_and_open_page save_and_open_page}, or {Capybara::Session#save_and_open_screenshot save_and_open_screenshot}.
     # - **server** (Symbol = `:default` (which uses puma)) - The name of the registered server to use when running the app under test.
     # - **server_port** (Integer) - The port Capybara will run the application server on, if not specified a random port will be used.
+    # - **server_host** (String = "127.0.0.1") - The IP address Capybara will bind the application server to. If the test application is to be accessed from an external host, you will want to change this to "0.0.0.0" or to a more specific IP address that your test client can reach.
     # - **server_errors** (Array\<Class> = `[Exception]`) - Error classes that should be raised in the tests if they are raised in the server
     #   and {configure raise_server_errors} is `true`.
     # - **test_id** (Symbol, String, `nil` = `nil`) - Optional attribute to match locator against with built-in selectors along with id.

data/spec/dsl_spec.rb

@@ -115,7 +115,7 @@ RSpec.describe Capybara::DSL do
     it 'should yield the passed block' do
       called = false
       Capybara.using_driver(:selenium) { called = true }
-      expect(called).to eq(true)
+      expect(called).to be(true)
     end
   end
 
@@ -220,7 +220,7 @@ RSpec.describe Capybara::DSL do
     it 'should yield the passed block' do
       called = false
       Capybara.using_session(:administrator) { called = true }
-      expect(called).to eq(true)
+      expect(called).to be(true)
     end
 
     it 'should be nestable' do

data/spec/fixtures/selenium_driver_rspec_failure.rb

@@ -5,9 +5,9 @@ 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 }
+    options = { browser: ENV.fetch('SELENIUM_BROWSER', :firefox).to_sym }
     browser = described_class.new(TestApp, options).browser
     expect(browser).to be_truthy
-    expect(true).to eq(false) # rubocop:disable RSpec/ExpectActual
+    expect(true).to be(false) # rubocop:disable RSpec/ExpectActual
   end
 end

data/spec/fixtures/selenium_driver_rspec_success.rb

@@ -5,9 +5,9 @@ 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 }
+    options = { browser: ENV.fetch('SELENIUM_BROWSER', :firefox).to_sym }
     browser = described_class.new(TestApp, **options).browser
     expect(browser).to be_truthy
-    expect(true).to eq(true) # rubocop:disable RSpec/ExpectActual,RSpec/IdenticalEqualityAssertion
+    expect(true).to be(true) # rubocop:disable RSpec/ExpectActual,RSpec/IdenticalEqualityAssertion
   end
 end

data/spec/rack_test_spec.rb

@@ -216,6 +216,12 @@ RSpec.describe Capybara::RackTest::Driver do
       expect(driver.current_url).to match %r{/landed$}
     end
 
+    it 'should not include fragments in the referer header' do
+      driver.visit('/header_links#an-anchor')
+      driver.find_xpath('.//input').first.click
+      expect(driver.request.get_header('HTTP_REFERER')).to eq('http://www.example.com/header_links')
+    end
+
     it 'is possible to not follow redirects' do
       driver = described_class.new(TestApp, follow_redirects: false)