capybara 3.0.3 → 3.1.0

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#windows', requires: [:windows] do
-  before(:each) do
+  before do
     @window = @session.current_window
     @session.visit('/with_windows')
     @session.find(:css, '#openTwoWindows').click
@@ -10,7 +10,7 @@ Capybara::SpecHelper.spec '#windows', requires: [:windows] do
       raise Capybara::CapybaraError if @session.windows.size != 3
     end
   end
-  after(:each) do
+  after do
     (@session.windows - [@window]).each do |w|
       @session.switch_to_window w
       w.close

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
-  before(:each) do
+  before do
     @window = @session.current_window
     @session.visit('/with_windows')
     @session.find(:css, '#openTwoWindows').click
@@ -10,7 +10,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       raise Capybara::CapybaraError if @session.windows.size != 3
     end
   end
-  after(:each) do
+  after do
     (@session.windows - [@window]).each do |w|
       @session.switch_to_window w
       w.close

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

@@ -7,7 +7,7 @@ Capybara::SpecHelper.spec '#within' do
 
   context "with CSS selector" do
     it "should click links in the given scope" do
-      @session.within(:css, "#for_bar li", text: 'With Simple HTML') do
+      @session.within(:css, "#for_bar li:first-child") do
         @session.click_link('Go')
       end
       expect(@session).to have_content('Bar')
@@ -103,9 +103,9 @@ Capybara::SpecHelper.spec '#within' do
             @session.within(".//div[@id='doesnotexist']") do
             end
           end.to raise_error(Capybara::ElementNotFound)
-        end.to_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(false)
+        end.not_to change { @session.has_xpath?(".//div[@id='another_foo']") }.from(false)
       end
-    end.to_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(true)
+    end.not_to change { @session.has_xpath?(".//div[@id='another_foo']") }.from(true)
   end
 
   it "should fill in a field and click a button" do

data/lib/capybara/spec/spec_helper.rb

@@ -49,31 +49,33 @@ module Capybara
 
       def run_specs(session, name, **options)
         specs = @specs
-        RSpec.describe Capybara::Session, name, options do
+        RSpec.describe Capybara::Session, name, options do # rubocop:disable RSpec/EmptyExampleGroup
           include Capybara::SpecHelper
           include Capybara::RSpecMatchers
+          # rubocop:disable RSpec/ScatteredSetup
           before do
             @session = session
           end
 
           after do
-            @session.reset_session!
+            session.reset_session!
           end
 
           before :each, psc: true do
-            SpecHelper.reset_threadsafe(true, @session)
+            SpecHelper.reset_threadsafe(true, session)
           end
 
           after psc: true do
-            SpecHelper.reset_threadsafe(false, @session)
+            SpecHelper.reset_threadsafe(false, session)
           end
 
           before :each, :exact_false do
             Capybara.exact = false
           end
+          # rubocop:enable RSpec/ScatteredSetup
 
           specs.each do |spec_name, spec_options, block|
-            describe spec_name, *spec_options do
+            describe spec_name, *spec_options do # rubocop:disable RSpec/EmptyExampleGroup
               class_eval(&block)
             end
           end

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

@@ -197,6 +197,15 @@ New line after and before textarea tag
     </label>
   </p>
 
+  <p>
+    <input type="text" name="form[manufacturer]" list="manufacturers" id="manufacturer"/>
+    <datalist id="manufacturers">
+      <option value="Jaguar">J</option>
+      <option value="Audi">
+      <option value="Mercedes" disabled>
+    </datalist>
+  </p>
+
   <p>
     <input type="checkbox" name="form[valueless_checkbox]" id="valueless_checkbox" checked="checked"/>
     <label for="valueless_checkbox">Valueless Checkbox</label>

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.0.3'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/spec/basic_node_spec.rb

@@ -95,7 +95,7 @@ RSpec.describe Capybara do
       expect(string.find('//h1').path).to eq('/html/body/div/div[1]/h1')
     end
 
-    it "allows finding elements and extracting the path" do
+    it "allows finding elements and extracting the value" do
       expect(string.find('//div/input').value).to eq('bar')
       expect(string.find('//select').value).to eq('Capybara')
     end

data/spec/capybara_spec.rb

@@ -28,9 +28,8 @@ RSpec.describe Capybara do
 
   describe '.register_server' do
     it "should add a new server" do
-      handler = double("handler")
       Capybara.register_server :blob do |_app, _port, _host|
-        handler.run
+        # do nothing
       end
 
       expect(Capybara.servers).to have_key(:blob)
@@ -43,9 +42,10 @@ RSpec.describe Capybara do
     end
 
     it "should default to a proc that calls run_default_server" do
-      mock_app = double('app')
-      expect(Capybara).to receive(:run_default_server).with(mock_app, 8000)
+      mock_app = Object.new
+      allow(Capybara).to receive(:run_default_server).and_return(true)
       Capybara.server.call(mock_app, 8000)
+      expect(Capybara).to have_received(:run_default_server).with(mock_app, 8000)
     end
 
     it "should return a custom server proc" do
@@ -110,13 +110,3 @@ RSpec.describe Capybara do
     end
   end
 end
-
-RSpec.describe Capybara::Session do
-  context 'with nonexistent driver' do
-    it "should raise an error" do
-      expect do
-        Capybara::Session.new(:quox, TestApp).driver
-      end.to raise_error(Capybara::DriverNotFoundError)
-    end
-  end
-end

data/spec/dsl_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe Capybara::DSL do
 
   describe '#using_driver' do
     before do
-      expect(Capybara.current_driver).not_to eq(:selenium)
+      expect(Capybara.current_driver).not_to eq(:selenium) # rubocop:disable RSpec/ExpectInHook
     end
 
     it 'should set the driver using Capybara.current_driver=' do
@@ -250,13 +250,15 @@ RSpec.describe Capybara::DSL do
     end
 
     it "should provide an 'using_session' shortcut" do
-      expect(Capybara).to receive(:using_session).with(:name)
+      allow(Capybara).to receive(:using_session)
       @session.using_session(:name)
+      expect(Capybara).to have_received(:using_session).with(:name)
     end
 
     it "should provide a 'using_wait_time' shortcut" do
-      expect(Capybara).to receive(:using_wait_time).with(6)
+      allow(Capybara).to receive(:using_wait_time)
       @session.using_wait_time(6)
+      expect(Capybara).to have_received(:using_wait_time).with(6)
     end
   end
 end

data/spec/fixtures/certificate.pem

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEITCCAwmgAwIBAgIJALROkwd1gZHQMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJDQTERMA8GA1UEChMIQ2FweWJhcmExFjAUBgNVBAMT
+DWNhcHliYXJhLnRlc3QxITAfBgkqhkiG9w0BCQEWEnR3YWxwb2xlQGdtYWlsLmNv
+bTAeFw0xODA1MDEyMDI5NDVaFw0yODA0MjgyMDI5NDVaMGgxCzAJBgNVBAYTAlVT
+MQswCQYDVQQIEwJDQTERMA8GA1UEChMIQ2FweWJhcmExFjAUBgNVBAMTDWNhcHli
+YXJhLnRlc3QxITAfBgkqhkiG9w0BCQEWEnR3YWxwb2xlQGdtYWlsLmNvbTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7icqMv9uApxRXlcIQ3hSEfmULk
+7CLT1aUAjEmTiqy8TkFqOeSuA3elnbVBhOW+emrb1uUyje20LvEOHbqYYw90ezlV
+jqNWUapawqjxb+q7KVNpA5uDCtOHIC/1Z1kxQ+yZP/8St4SvnLGUMsUhu0h+ywJa
+iGZ2xy8wdfjABUiUImRESdNkT7Xs0wxQGY0/FZ4K5Sec4kroOuvdxKKhyf5Js5xS
+NRv2tXSMWlKHbYEvYzsVtFgv/4GjqN4wVvbfJmsS8thcyrSYSMN7eE0R6dcbJaLM
+P/GTiw669zPJP164K84QoabLClgwyG+7mqjm7jutq9qXipwyrGsf/WR5fkUCAwEA
+AaOBzTCByjAdBgNVHQ4EFgQU4ut9c0oB2OGMlN/nvn0Y7twBzJowgZoGA1UdIwSB
+kjCBj4AU4ut9c0oB2OGMlN/nvn0Y7twBzJqhbKRqMGgxCzAJBgNVBAYTAlVTMQsw
+CQYDVQQIEwJDQTERMA8GA1UEChMIQ2FweWJhcmExFjAUBgNVBAMTDWNhcHliYXJh
+LnRlc3QxITAfBgkqhkiG9w0BCQEWEnR3YWxwb2xlQGdtYWlsLmNvbYIJALROkwd1
+gZHQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAANtqdDrdehBt20s
+IVOsVzOp+tJI8pn6G62WJcZWGsvLLfx6Y6eJSP24r5NW4v39cqCgE76J2znzKxeo
+VIShAJ1SLodR0GwzFGsl3TVKVoce6gBWZNXgkZyJTNqKGWeme8CH1EG3TqYlcybt
+EXWLQ6wKndD+uHJIfqUy7HfaUv+TghJGLkv8QYqcAWILQko4xqZ1NULDQ2uhjxei
+oaQlK9teHlVaH87dONesAg3f5rh9j6nvzGiC/T8ycdEhn/DxJMxRS2+mVZqKkk7U
+60+e9Foc6qTW8UaMShIFYMspoRnr9baBxzxh9V9LZznwqVTf3vuEIck2l2j2KL/R
+SOBenCM=
+-----END CERTIFICATE-----

data/spec/fixtures/key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAvuJyoy/24CnFFeVwhDeFIR+ZQuTsItPVpQCMSZOKrLxOQWo5
+5K4Dd6WdtUGE5b56atvW5TKN7bQu8Q4duphjD3R7OVWOo1ZRqlrCqPFv6rspU2kD
+m4MK04cgL/VnWTFD7Jk//xK3hK+csZQyxSG7SH7LAlqIZnbHLzB1+MAFSJQiZERJ
+02RPtezTDFAZjT8VngrlJ5ziSug6693EoqHJ/kmznFI1G/a1dIxaUodtgS9jOxW0
+WC//gaOo3jBW9t8maxLy2FzKtJhIw3t4TRHp1xslosw/8ZOLDrr3M8k/XrgrzhCh
+pssKWDDIb7uaqObuO62r2peKnDKsax/9ZHl+RQIDAQABAoIBABhZepYmgC+IJIPu
+iLPVAT6AcWR/H0AyFYa+0yZvk7kFLFZb3pa1O+v/TGbavMEx0xvef0Mtd71ixrop
+OtGarshB65Ycu91KHZDFkx9J7STcSyFAvB0SUkc5bXmwrEZMaoW75tX65T4fyLU+
+WlubOfC9e9gJBG1NqYrze5kHpaTkR8pBaSxECns5y2HLaMvs1t1kK7snqtGHFRAb
+deAUl0ONENaO6PF797yM3bsIEgnljdKvaVP3kYq/eAzH4jyw+qG/xq0bZ+nalJzM
+IL7xRSR/Yak7WZ3QUh99t3dng/z3De4yvhBLq/mc2mIVvt7aERPo/aDG4SrmQ9Jw
+f1GUT+ECgYEA+i96w2zPHkq0djuuhNaa/R0vybD9hVCdB7enQ8skBzQAQyhp9X9W
+by38VAbFRVIMrzdfbvwSFrE3Nd9BvyLWl16G+MVu+hq0jhM9p44a62vXvfgQmfFh
+iXyGkzCTufeLEzOFnP8S+ezacodK1hbQTjllUndn6NUhXcbfozTPfx8CgYEAw1Il
+xqfU7NkVX6UP/FvTx9aBKqwrD8YOPn9nj26Q45zVbmHJZZIvywlsMDCiJ6JJawEa
+GSkiZTDpypEvS/2UtLEY0zfbSbQGkBTnagHIFAuVh0AD1EP+kCcnrxA5Vjr8v0WE
+B0HBfMgoZxa8rmHMpPhrlCCo1ectRgu+dgzEKhsCgYAQ17lwBpc69tSHUSVClCAD
+AkABWAT5QKARsO91xOs8AOgznTjk6hmrinD+RyZosEliUlv+YMHm/S82VT1b3MCN
+mDOF8+SwubOGDQ2NhieRycTQaS7U7kcetl9o8VBAqMWYGVPZaeKhKKzcIPeMyiRj
+38FOd/Nq3U5NveG4XwnJCQKBgGrzmnfTAsbGf+uliMFYzviIPqZNLC8w9i/Gt8BU
+fMYF5ODSbuNNTxpQiItCtigZtzX+nnnUil76j6o6IbnsmvbuWneeCFetWkKfD7B+
+VT6UsUYkCXS73rK0nghATAUpu6hIumj22qonN+hrDNo390UGOnIcCBdIxQOr/pjJ
+mMitAoGAB3tFzlzZHpCE38IqdHL7CKIML9cYJSOm07nFIEUAKN2bUHGsvMH/tMS1
+I3hyeHxMmYCrOLn7xLqiOVgRjbYS9JiQVdDojqeSvvnLCtY9/lHWi50pqbPfwyfK
+Og6QoFyxjBEsoSilc6dai58VTO6ufhoJXbXX9PcIl7le4dVPnzE=
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/selenium_driver_rspec_failure.rb

@@ -7,7 +7,7 @@ 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
-    expect(browser).to be
-    expect(true).to eq(false)
+    expect(browser).to be_truthy
+    expect(true).to eq(false) # rubocop:disable RSpec/ExpectActual
   end
 end

data/spec/fixtures/selenium_driver_rspec_success.rb

@@ -7,7 +7,7 @@ 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
-    expect(browser).to be
-    expect(true).to eq(true)
+    expect(browser).to be_truthy
+    expect(true).to eq(true) # rubocop:disable RSpec/ExpectActual
   end
 end

data/spec/rack_test_spec.rb

@@ -6,7 +6,7 @@ module TestSessions
   RackTest = Capybara::Session.new(:rack_test, TestApp)
 end
 
-Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", capybara_skip: %i[
+skipped_tests = %i[
   js
   modals
   screenshot
@@ -17,8 +17,9 @@ Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", capybara_skip
   hover
   about_scheme
 ]
+Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", capybara_skip: skipped_tests
 
-RSpec.describe Capybara::Session do
+RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
   context 'with rack test driver' do
     before do
       @session = TestSessions::RackTest
@@ -65,11 +66,11 @@ RSpec.describe Capybara::Session do
 
     describe "#fill_in" do
       it "should warn that :fill_options are not supported" do
-        expect_any_instance_of(Capybara::RackTest::Node).to receive(:warn)
-          .with("Options passed to Node#set but the RackTest driver doesn't support any - ignoring")
+        allow_any_instance_of(Capybara::RackTest::Node).to receive(:warn)
         @session.visit "/with_html"
-        @session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true }
+        field = @session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true }
         expect(@session).to have_field('test_field', with: 'not_monkey')
+        expect(field.base).to have_received(:warn).with("Options passed to Node#set but the RackTest driver doesn't support any - ignoring")
       end
     end
 
@@ -220,9 +221,10 @@ module CSSHandlerIncludeTester
     raise 'should never be called'
   end
 end
-include CSSHandlerIncludeTester # rubocop:disable Style/MixinUsage
 
 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)
   end

data/spec/result_spec.rb

@@ -79,14 +79,18 @@ RSpec.describe Capybara::Result do
 
   it 'should catch invalid element errors during filtering' do
     allow_any_instance_of(Capybara::Node::Simple).to receive(:text).and_raise(StandardError)
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(double("session", driver: double("driver", invalid_element_errors: [StandardError])))
+    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(
+      instance_double("Capybara::Session", driver: instance_double("Capybara::Driver::Base", invalid_element_errors: [StandardError]))
+    )
     result = string.all('//li', text: 'Alpha')
     expect(result.size).to eq 0
   end
 
   it 'should return non-invalid element errors during filtering' do
     allow_any_instance_of(Capybara::Node::Simple).to receive(:text).and_raise(StandardError)
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(double("session", driver: double("driver", invalid_element_errors: [ArgumentError])))
+    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(
+      instance_double("Capybara::Session", driver: instance_double("Capybara::Driver::Base", invalid_element_errors: [ArgumentError]))
+    )
     expect do
       string.all('//li', text: 'Alpha').to_a
     end.to raise_error(StandardError)
@@ -139,4 +143,20 @@ RSpec.describe Capybara::Result do
       end
     end
   end
+
+  context 'lazy select' do
+    it 'is compatible' do
+      # This test will let us know when JRuby fixes lazy select so we can re-enable it in Result
+      pending 'JRuby has an issue with lazy enumberator evaluation' if RUBY_PLATFORM == 'java'
+      eval_count = 0
+      enum = %w[Text1 Text2 Text3].lazy.select do
+        eval_count += 1
+        true
+      end
+      expect(eval_count).to eq 0
+      enum.next
+      sleep 1
+      expect(eval_count).to eq 1
+    end
+  end
 end

data/spec/rspec/features_spec.rb

@@ -39,7 +39,7 @@ feature "Capybara's feature DSL" do
   end
 
   scenario "doesn't pollute the Object namespace" do
-    expect(Object.new.respond_to?(:feature, true)).to be_falsey
+    expect(Object.new).not_to respond_to(:feature)
   end
 
   feature 'nested features' do
@@ -78,6 +78,7 @@ feature "Capybara's feature DSL with driver", driver: :culerity do
   end
 end
 
+# rubocop:disable RSpec/RepeatedExample
 xfeature "if xfeature aliases to pending then" do
   scenario "this should be 'temporarily disabled with xfeature'" do
     # dummy
@@ -87,7 +88,7 @@ xfeature "if xfeature aliases to pending then" do
   end
 end
 
-ffeature "if ffeature aliases focused tag then" do
+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
   end
@@ -96,3 +97,4 @@ ffeature "if ffeature aliases focused tag then" do
     expect(example.metadata[:focus]).to eq true
   end
 end
+# rubocop:enable RSpec/RepeatedExample

data/spec/rspec/scenarios_spec.rb

@@ -8,7 +8,7 @@ RSpec.configuration.before(:each, file_path: "./spec/rspec/scenarios_spec.rb") d
 end
 
 feature "if fscenario aliases focused tag then" do
-  fscenario "scenario should have focused meta tag" do |example|
+  fscenario "scenario should have focused meta tag" do |example| # rubocop:disable RSpec/Focus
     expect(example.metadata[:focus]).to eq true
   end
 end

data/spec/rspec/shared_spec_matchers.rb

@@ -5,6 +5,8 @@ require 'capybara/dsl'
 require 'capybara/rspec/matchers'
 require 'benchmark'
 
+# rubocop:disable RSpec/ExpectActual
+
 RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
   include Capybara::DSL
   include Capybara::RSpecMatchers
@@ -548,7 +550,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
       end
 
       context 'with wait' do
-        before(:each) do
+        before do
           @session = session
           @session.visit('/with_js')
         end
@@ -593,7 +595,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
       end
 
       context 'with wait' do
-        before(:each) do
+        before do
           @session = session
           @session.visit('/with_js')
         end
@@ -840,8 +842,8 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
   end
 
-  context "compounding", requires: [:js] do
-    before(:each) do
+  context "compounding timing" do
+    before do
       @session = session
       @session.visit('/with_js')
       @el = @session.find(:css, '#reload-me')
@@ -934,3 +936,4 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
   end
 end
+# rubocop:enable RSpec/ExpectActual

data/spec/rspec/views_spec.rb

@@ -4,7 +4,8 @@ require 'spec_helper'
 
 RSpec.describe "capybara/rspec", type: :view do
   it "allows matchers to be used on strings" do
-    expect(%(<h1>Test header</h1>)).to have_css("h1", text: "Test header")
+    html = %(<h1>Test header</h1>)
+    expect(html).to have_css("h1", text: "Test header")
   end
 
   it "doesn't include RSpecMatcherProxies" do