capybara 3.32.0 → 3.33.0

data/spec/rspec/shared_spec_matchers.rb

@@ -89,29 +89,29 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_css? returns true' do
-          expect(page).to have_css('h1')
+          expect(session).to have_css('h1')
         end
 
         it 'fails if has_css? returns false' do
           expect do
-            expect(page).to have_css('h1#doesnotexist')
+            expect(session).to have_css('h1#doesnotexist')
           end.to raise_error(/expected to find css "h1#doesnotexist" but there were no matches/)
         end
       end
 
       context 'with should_not' do
         it 'passes if has_no_css? returns true' do
-          expect(page).not_to have_css('h1#doesnotexist')
+          expect(session).not_to have_css('h1#doesnotexist')
         end
 
         it 'fails if has_no_css? returns false' do
           expect do
-            expect(page).not_to have_css('h1')
+            expect(session).not_to have_css('h1')
           end.to raise_error(/expected not to find visible css "h1"/)
         end
       end
@@ -158,29 +158,29 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_xpath? returns true' do
-          expect(page).to have_xpath('//h1')
+          expect(session).to have_xpath('//h1')
         end
 
         it 'fails if has_xpath? returns false' do
           expect do
-            expect(page).to have_xpath("//h1[@id='doesnotexist']")
+            expect(session).to have_xpath("//h1[@id='doesnotexist']")
           end.to raise_error(%r{expected to find xpath "//h1\[@id='doesnotexist'\]" but there were no matches})
         end
       end
 
       context 'with should_not' do
         it 'passes if has_no_xpath? returns true' do
-          expect(page).not_to have_xpath('//h1[@id="doesnotexist"]')
+          expect(session).not_to have_xpath('//h1[@id="doesnotexist"]')
         end
 
         it 'fails if has_no_xpath? returns false' do
           expect do
-            expect(page).not_to have_xpath('//h1')
+            expect(session).not_to have_xpath('//h1')
           end.to raise_error(%r{expected not to find visible xpath "//h1"})
         end
       end
@@ -222,35 +222,35 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_selector? returns true' do
-          expect(page).to have_selector('//h1', text: 'test')
+          expect(session).to have_selector('//h1', text: 'test')
         end
 
         it 'fails if has_selector? returns false' do
           expect do
-            expect(page).to have_selector("//h1[@id='doesnotexist']")
+            expect(session).to have_selector("//h1[@id='doesnotexist']")
           end.to raise_error(%r{expected to find xpath "//h1\[@id='doesnotexist'\]" but there were no matches})
         end
 
         it 'includes text in error message' do
           expect do
-            expect(page).to have_selector('//h1', text: 'wrong text')
+            expect(session).to have_selector('//h1', text: 'wrong text')
           end.to raise_error(%r{expected to find visible xpath "//h1" with text "wrong text" but there were no matches})
         end
       end
 
       context 'with should_not' do
         it 'passes if has_no_css? returns true' do
-          expect(page).not_to have_selector(:css, 'h1#doesnotexist')
+          expect(session).not_to have_selector(:css, 'h1#doesnotexist')
         end
 
         it 'fails if has_no_selector? returns false' do
           expect do
-            expect(page).not_to have_selector(:css, 'h1', text: 'test')
+            expect(session).not_to have_selector(:css, 'h1', text: 'test')
           end.to raise_error(/expected not to find visible css "h1" with text "test"/)
         end
       end
@@ -265,7 +265,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
   describe 'have_content matcher' do
     it 'gives proper description' do
-      expect(have_content('Text').description).to eq('text "Text"')
+      expect(have_content('Text').description).to eq('have text "Text"')
     end
 
     context 'on a string' do
@@ -304,21 +304,21 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_content? returns true' do
-          expect(page).to have_content('This is a test')
+          expect(session).to have_content('This is a test')
         end
 
         it 'passes if has_content? returns true using regexp' do
-          expect(page).to have_content(/test/)
+          expect(session).to have_content(/test/)
         end
 
         it 'fails if has_content? returns false' do
           expect do
-            expect(page).to have_content('No such Text')
+            expect(session).to have_content('No such Text')
           end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
         end
 
@@ -329,7 +329,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
           it 'fails if has_content? returns false' do
             expect do
-              expect(page).to have_content('No such Text')
+              expect(session).to have_content('No such Text')
             end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
         end
@@ -337,14 +337,26 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
       context 'with should_not' do
         it 'passes if has_no_content? returns true' do
-          expect(page).not_to have_content('No such Text')
+          expect(session).not_to have_content('No such Text')
         end
 
         it 'fails if has_no_content? returns false' do
           expect do
-            expect(page).not_to have_content('This is a test')
+            expect(session).not_to have_content('This is a test')
           end.to raise_error(/expected not to find text "This is a test"/)
         end
+
+        it 'not_to have_content behaves the same as to have_no_content' do
+          Capybara.using_wait_time(5) do
+            expect(session).to have_content('This is a test')
+            start = Time.now
+            expect(session).to have_no_content('No such Text')
+            to_time = Time.now
+            expect(session).not_to have_content('No such Text')
+            not_to_time = Time.now
+            expect(not_to_time - to_time).to be_within(0.5).of(to_time - start)
+          end
+        end
       end
     end
 
@@ -357,7 +369,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
   describe 'have_text matcher' do
     it 'gives proper description' do
-      expect(have_text('Text').description).to eq('text "Text"')
+      expect(have_text('Text').description).to eq('have text "Text"')
     end
 
     context 'on a string' do
@@ -432,30 +444,30 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_text? returns true' do
-          expect(page).to have_text('This is a test')
+          expect(session).to have_text('This is a test')
         end
 
         it 'passes if has_text? returns true using regexp' do
-          expect(page).to have_text(/test/)
+          expect(session).to have_text(/test/)
         end
 
         it 'can check for all text' do
-          expect(page).to have_text(:all, 'Some of this text is hidden!')
+          expect(session).to have_text(:all, 'Some of this text is hidden!')
         end
 
         it 'can check for visible text' do
-          expect(page).to have_text(:visible, 'Some of this text is')
-          expect(page).not_to have_text(:visible, 'Some of this text is hidden!')
+          expect(session).to have_text(:visible, 'Some of this text is')
+          expect(session).not_to have_text(:visible, 'Some of this text is hidden!')
         end
 
         it 'fails if has_text? returns false' do
           expect do
-            expect(page).to have_text('No such Text')
+            expect(session).to have_text('No such Text')
           end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
         end
 
@@ -466,7 +478,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
           it 'fails if has_text? returns false' do
             expect do
-              expect(page).to have_text('No such Text')
+              expect(session).to have_text('No such Text')
             end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
         end
@@ -474,12 +486,12 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
       context 'with should_not' do
         it 'passes if has_no_text? returns true' do
-          expect(page).not_to have_text('No such Text')
+          expect(session).not_to have_text('No such Text')
         end
 
         it 'fails if has_no_text? returns false' do
           expect do
-            expect(page).not_to have_text('This is a test')
+            expect(session).not_to have_text('This is a test')
           end.to raise_error(/expected not to find text "This is a test"/)
         end
       end
@@ -542,15 +554,15 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       it 'passes if there is such a title' do
-        visit('/with_js')
-        expect(page).to have_title('with_js')
+        session.visit('/with_js')
+        expect(session).to have_title('with_js')
       end
 
       it 'fails if there is no such title' do
-        visit('/with_js')
+        session.visit('/with_js')
         expect do
-          expect(page).to have_title('No such title')
-        end.to raise_error('expected "with_js" to include "No such title"')
+          expect(session).to have_title('No such title')
+        end.to raise_error(/ to include "No such title"/)
       end
 
       context 'with wait' do
@@ -560,14 +572,14 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
         it 'waits if wait time is more than timeout' do
           session.click_link('Change title')
-          using_wait_time 0 do
+          session.using_wait_time 0 do
             expect(session).to have_title('changed title', wait: 2)
           end
         end
 
         it "doesn't wait if wait time is less than timeout" do
           session.click_link('Change title')
-          using_wait_time 3 do
+          session.using_wait_time 3 do
             expect(session).not_to have_title('changed title', wait: 0)
           end
         end
@@ -586,15 +598,15 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       it 'passes if there is such a current path' do
-        visit('/with_js')
-        expect(page).to have_current_path('/with_js')
+        session.visit('/with_js')
+        expect(session).to have_current_path('/with_js')
       end
 
       it 'fails if there is no such current_path' do
         visit('/with_js')
         expect do
-          expect(page).to have_current_path('/not_with_js')
-        end.to raise_error('expected "/with_js" to equal "/not_with_js"')
+          expect(session).to have_current_path('/not_with_js')
+        end.to raise_error(%r{to equal "/not_with_js"})
       end
 
       context 'with wait' do
@@ -604,14 +616,14 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
         it 'waits if wait time is more than timeout' do
           session.click_link('Change page')
-          using_wait_time 0 do
+          session.using_wait_time 0 do
             expect(session).to have_current_path('/with_html', wait: 2)
           end
         end
 
         it "doesn't wait if wait time is less than timeout" do
           session.click_link('Change page')
-          using_wait_time 0 do
+          session.using_wait_time 0 do
             expect(session).not_to have_current_path('/with_html')
           end
         end
@@ -619,8 +631,8 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'supports compounding' do
-      visit('/with_html')
-      expect(page).to have_current_path('/not_with_html').or have_current_path('/with_html')
+      session.visit('/with_html')
+      expect(session).to have_current_path('/not_with_html').or have_current_path('/with_html')
     end
   end
 
@@ -828,10 +840,10 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'gives proper description when :visible option passed' do
-      expect(have_table('Lovely table', visible: true).description).to eq('have visible table "Lovely table"')
+      expect(have_table('Lovely table', visible: true).description).to eq('have visible table "Lovely table"') # rubocop:disable Capybara/VisibilityMatcher
       expect(have_table('Lovely table', visible: :hidden).description).to eq('have non-visible table "Lovely table"')
       expect(have_table('Lovely table', visible: :all).description).to eq('have table "Lovely table"')
-      expect(have_table('Lovely table', visible: false).description).to eq('have table "Lovely table"')
+      expect(have_table('Lovely table', visible: false).description).to eq('have table "Lovely table"') # rubocop:disable Capybara/VisibilityMatcher
     end
 
     it 'passes if there is such a table' do
@@ -859,7 +871,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     describe '#and' do
       it "should run 'concurrently'" do
-        Capybara.using_wait_time(2) do
+        session.using_wait_time(2) do
           matcher = have_text('this is not there').and have_text('neither is this')
           expect(Benchmark.realtime do
             expect do

data/spec/selector_spec.rb

@@ -476,7 +476,7 @@ RSpec.describe Capybara do
       end
 
       describe ':link_or_button selector' do
-        around(:all) do |example|
+        around do |example|
           described_class.modify_selector(:link_or_button) do
             expression_filter(:random) { |xpath, _| xpath } # do nothing filter
           end

data/spec/selenium_spec_chrome.rb

@@ -70,8 +70,6 @@ Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybar
     pending "Chrome headless doesn't support maximize" if ENV['HEADLESS']
   when /Capybara::Window#fullscreen should be able to fullscreen the window/
     skip 'Chromedriver hangs on attempts to fullscreen in headless mode' 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'
   when /node #right_click delay should delay the mouse up/
     skip "Legacy selenium doesn't support separate right button down/up" if ENV['W3C'] == 'false'
   end

data/spec/server_spec.rb

@@ -75,25 +75,21 @@ RSpec.describe Capybara::Server do
   end
 
   it 'should handle that getting available ports fails randomly' do
-    begin
-      # 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)
-      call_count = 0
-      allow(TCPServer).to receive(:new).and_wrap_original do |m, *args|
-        begin
-          call_count.zero? ? d_server : m.call(*args)
-        ensure
-          call_count += 1
-        end
-      end
-
-      port = described_class.new(Object.new, host: '0.0.0.0').port
-      expect(port).not_to eq(server_port)
+    # 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)
+    call_count = 0
+    allow(TCPServer).to receive(:new).and_wrap_original do |m, *args|
+      call_count.zero? ? d_server : m.call(*args)
     ensure
-      server&.close
+      call_count += 1
     end
+
+    port = described_class.new(Object.new, host: '0.0.0.0').port
+    expect(port).not_to eq(server_port)
+  ensure
+    server&.close
   end
 
   it 'should return its #base_url' do
@@ -104,29 +100,27 @@ RSpec.describe Capybara::Server do
   end
 
   it 'should support SSL' do
-    begin
-      key = File.join(Dir.pwd, 'spec', 'fixtures', 'key.pem')
-      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 = described_class.new(app).boot
-
-      expect do
-        Net::HTTP.start(server.host, server.port, max_retries: 0) { |http| http.get('/__identify__') }
-      end.to(raise_error do |e|
-        expect(e.is_a?(EOFError) || e.is_a?(Net::ReadTimeout)).to be true
-      end)
+    key = File.join(Dir.pwd, 'spec', 'fixtures', 'key.pem')
+    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 = described_class.new(app).boot
 
-      res = Net::HTTP.start(server.host, server.port, use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE) do |https|
-        https.get('/')
-      end
+    expect do
+      Net::HTTP.start(server.host, server.port, max_retries: 0) { |http| http.get('/__identify__') }
+    end.to(raise_error do |e|
+      expect(e.is_a?(EOFError) || e.is_a?(Net::ReadTimeout)).to be true
+    end)
 
-      expect(res.body).to include('Hello SSL Server!')
-      uri = ::Addressable::URI.parse(server.base_url)
-      expect(uri.to_hash).to include(scheme: 'https', host: server.host, port: server.port)
-    ensure
-      Capybara.server = :default
+    res = Net::HTTP.start(server.host, server.port, use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE) do |https|
+      https.get('/')
     end
+
+    expect(res.body).to include('Hello SSL Server!')
+    uri = ::Addressable::URI.parse(server.base_url)
+    expect(uri.to_hash).to include(scheme: 'https', host: server.host, port: server.port)
+  ensure
+    Capybara.server = :default
   end
 
   context 'When Capybara.reuse_server is true' do
@@ -224,19 +218,17 @@ RSpec.describe Capybara::Server do
   end
 
   it 'should raise server errors when the server errors before the timeout' do
-    begin
-      Capybara.register_server :kaboom do
-        sleep 0.1
-        raise 'kaboom'
-      end
-      Capybara.server = :kaboom
-
-      expect do
-        described_class.new(proc { |e| }).boot
-      end.to raise_error(RuntimeError, 'kaboom')
-    ensure
-      Capybara.server = :default
+    Capybara.register_server :kaboom do
+      sleep 0.1
+      raise 'kaboom'
     end
+    Capybara.server = :kaboom
+
+    expect do
+      described_class.new(proc { |e| }).boot
+    end.to raise_error(RuntimeError, 'kaboom')
+  ensure
+    Capybara.server = :default
   end
 
   it 'should raise an error when there are pending requests' do

data/spec/shared_selenium_node.rb

@@ -35,6 +35,16 @@ RSpec.shared_examples 'Capybara::Node' do |session, _mode|
     end
   end
 
+  describe '#set' do
+    it 'respects maxlength when using rapid set' do
+      session.visit('/form')
+      inp = session.find(:css, '#long_length')
+      value = (0...50).map { |i| ((i % 26) + 65).chr }.join
+      inp.set(value, rapid: true)
+      expect(inp.value).to eq value[0...35]
+    end
+  end
+
   describe '#visible?' do
     let(:bridge) do
       session.driver.browser.send(:bridge)

data/spec/shared_selenium_session.rb

@@ -160,6 +160,15 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
                         fill_options: { clear: :none })
         expect(session.find(:fillable_field, 'form_first_name').value).to eq('JohnHarry')
       end
+
+      it 'works with rapid fill' do
+        pending 'Safari overwrites by default - need to figure out a workaround' if safari?(session)
+
+        long_string = (0...60).map { |i| ((i % 26) + 65).chr }.join
+        session.visit('/form')
+        session.fill_in('form_first_name', with: long_string, fill_options: { clear: :none })
+        expect(session.find(:fillable_field, 'form_first_name').value).to eq('John' + long_string)
+      end
     end
 
     describe '#fill_in with Date' do
@@ -425,7 +434,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       it 'can find html5 svg elements' do
         session.visit('with_html5_svg')
         expect(session).to have_selector(:element, :svg)
-        expect(session).to have_selector(:element, :rect, visible: true)
+        expect(session).to have_selector(:element, :rect, visible: :visible)
         expect(session).to have_selector(:element, :circle)
         expect(session).to have_selector(:element, :linearGradient, visible: :all)
       end
@@ -441,21 +450,30 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       context 'controlled components' do
         it 'can set and clear a text field' do
           skip "This test doesn't support older browsers" if ie?(session)
-          # session.visit 'https://reactjs.org/docs/forms.html'
-          # session.all(:css, 'h2#controlled-components ~ p a', text: 'Try it on CodePen')[0].click
-          # copied into local view
+
           session.visit 'react'
-          # Not necessary when accessed locally
-          # session.within_frame(:css, 'iframe.result-iframe:not([src=""])', wait: 10) do
+
           session.fill_in('Name:', with: 'abc')
           session.accept_prompt 'A name was submitted: abc' do
             session.click_button('Submit')
           end
+
           session.fill_in('Name:', with: '')
           session.accept_prompt(/A name was submitted: $/) do
             session.click_button('Submit')
           end
-          # end
+        end
+
+        it 'works with rapid fill' do
+          skip "This test doesn't support older browsers" if ie?(session)
+
+          session.visit 'react'
+          long_string = (0...60).map { |i| ((i % 26) + 65).chr }.join
+
+          session.fill_in('Name:', with: long_string)
+          session.accept_prompt "A name was submitted: #{long_string}" do
+            session.click_button('Submit')
+          end
         end
       end
     end

data/spec/spec_helper.rb

@@ -46,7 +46,7 @@ module Capybara
     end
 
     def edge?(session)
-      browser_name(session).match?(/^edge/)
+      browser_name(session).to_s.start_with?('edge')
     end
 
     def legacy_edge?(session)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.32.0
+  version: 3.33.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -450,6 +450,7 @@ files:
 - lib/capybara/rack_test/form.rb
 - lib/capybara/rack_test/node.rb
 - lib/capybara/rails.rb
+- lib/capybara/registration_container.rb
 - lib/capybara/registrations/drivers.rb
 - lib/capybara/registrations/patches/puma_ssl.rb
 - lib/capybara/registrations/servers.rb
@@ -738,7 +739,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="