capybara 3.15.0 → 3.17.0

data/lib/capybara/spec/session/frame/within_frame_spec.rb

@@ -92,7 +92,18 @@ Capybara::SpecHelper.spec '#within_frame', requires: [:frames] do
   it 'works if the frame is closed', requires: %i[frames js] do
     @session.within_frame 'parentFrame' do
       @session.within_frame 'childFrame' do
-        @session.click_link 'Close Window'
+        @session.click_link 'Close Window Now'
+      end
+      expect(@session).to have_selector(:css, 'body#parentBody')
+      expect(@session).not_to have_selector(:css, '#childFrame')
+    end
+  end
+
+  it 'works if the frame is closed with a slight delay', requires: %i[frames js] do
+    @session.within_frame 'parentFrame' do
+      @session.within_frame 'childFrame' do
+        @session.click_link 'Close Window Soon'
+        sleep 1
       end
       expect(@session).to have_selector(:css, 'body#parentBody')
       expect(@session).not_to have_selector(:css, '#childFrame')

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

@@ -113,13 +113,20 @@ Capybara::SpecHelper.spec '#has_css?' do
   end
 
   context 'with predicates_wait == false' do
-    it 'should not wait for content to appear', requires: [:js] do
+    before do
       Capybara.predicates_wait = false
-      Capybara.default_max_wait_time = 2
+      Capybara.default_max_wait_time = 5
       @session.visit('/with_js')
       @session.click_link('Click me')
+    end
+
+    it 'should not wait for content to appear', requires: [:js] do
       expect(@session.has_css?("input[type='submit'][value='New Here']")).to be false
     end
+
+    it 'should should the default wait time if true is passed for :wait', requires: [:js] do
+      expect(@session.has_css?("input[type='submit'][value='New Here']", wait: true)).to be true
+    end
   end
 
   context 'with between' do

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

@@ -49,8 +49,8 @@ Capybara::SpecHelper.spec '#has_table?' do
         %w[Thomas Walpole Oceanside],
         %w[Danilo Wilkinson Johnsonville],
         %w[Vern Konopelski Everette],
-        ["Ratke", "Lawrence", "East Sorayashire"],
-        ["Palmer", "Sawayn", "West Trinidad"]
+        ['Ratke', 'Lawrence', 'East Sorayashire'],
+        ['Palmer', 'Sawayn', 'West Trinidad']
       ])
   end
 
@@ -84,8 +84,8 @@ Capybara::SpecHelper.spec '#has_table?' do
         %w[Thomas Walpole Oceanside],
         %w[Danilo Wilkinson Johnsonville],
         %w[Vern Konopelski Everette],
-        ["Ratke", "Lawrence", "East Sorayashire"],
-        ["Palmer", "Sawayn", "West Trinidad"]
+        ['Ratke', 'Lawrence', 'East Sorayashire'],
+        ['Palmer', 'Sawayn', 'West Trinidad']
       ])
   end
 

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

@@ -109,12 +109,24 @@ Capybara::SpecHelper.spec 'node' do
       expect(@session.first('//input').value).to eq('')
     end
 
-    it 'should raise if the text field is readonly' do
-      expect { @session.first('//input[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
-    end
+    if ENV['CAPYBARA_THOROUGH']
+      it 'should raise if the text field is readonly' do
+        expect { @session.first('//input[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
+      end
+
+      it 'should raise if the textarea is readonly' do
+        expect { @session.first('//textarea[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
+      end
+    else
+      it 'should not change if the text field is readonly' do
+        @session.first('//input[@readonly]').set('changed')
+        expect(@session.first('//input[@readonly]').value).to eq 'should not change'
+      end
 
-    it 'should raise if the textarea is readonly' do
-      expect { @session.first('//textarea[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
+      it 'should not change if the textarea is readonly' do
+        @session.first('//textarea[@readonly]').set('changed')
+        expect(@session.first('//textarea[@readonly]').value).to eq 'textarea should not change'
+      end
     end
 
     it 'should use global default options' do
@@ -183,7 +195,7 @@ Capybara::SpecHelper.spec 'node' do
 
     it 'should see a disabled fieldset as disabled' do
       @session.visit('/form')
-      expect(@session.find(:css, '#form_disabled_fieldset')).to be_disabled
+      expect(@session.find(:xpath, './/fieldset[@id="form_disabled_fieldset"]')).to be_disabled
     end
 
     context 'in a disabled fieldset' do

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

@@ -85,11 +85,11 @@ Capybara::SpecHelper.spec '#uncheck' do
       end
 
       it 'should raise original error when no label available' do
-        expect { @session.uncheck('form_cars_porsche') }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_porsche"')
+        expect { @session.uncheck('form_cars_porsche') }.to raise_error(Capybara::ElementNotFound, /Unable to find visible checkbox "form_cars_porsche"/)
       end
 
       it 'should raise error if not allowed to click label' do
-        expect { @session.uncheck('form_cars_jaguar', allow_label_click: false) }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_jaguar"')
+        expect { @session.uncheck('form_cars_jaguar', allow_label_click: false) }.to raise_error(Capybara::ElementNotFound, /Unable to find visible checkbox "form_cars_jaguar"/)
       end
 
       it 'should include node filter description in error if necessary' do

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

@@ -56,7 +56,7 @@ Capybara::SpecHelper.spec '#unselect' do
 
   context "with a locator that doesn't exist" do
     it 'should raise an error' do
-      msg = 'Unable to find select box "does not exist"'
+      msg = /Unable to find select box "does not exist"/
       expect do
         @session.unselect('foo', from: 'does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)

data/lib/capybara/spec/spec_helper.rb

@@ -100,7 +100,7 @@ module Capybara
 
     def silence_stream(stream)
       old_stream = stream.dup
-      stream.reopen(RbConfig::CONFIG['host_os'] =~ /rmswin|mingw/ ? 'NUL:' : '/dev/null')
+      stream.reopen(RbConfig::CONFIG['host_os'].match?(/rmswin|mingw/) ? 'NUL:' : '/dev/null')
       stream.sync = true
       yield
     ensure

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

@@ -10,7 +10,8 @@
         </script>
     </head>
     <body id="childBody">
-      <a href="javascript:void(0)" onClick="closeWin()">Close Window</a>
+      <a href="javascript:void(0)" onClick="closeWin()">Close Window Now</a>
+      <a href="javascript:void(0)" onClick="setTimeout(function(){closeWin()}, 10)">Close Window Soon</a>
       <iframe src="/frame_one" id="grandchildFrame1"></iframe>
       <iframe src="/frame_two" id="grandchildFrame2"></iframe>
     </body>

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

@@ -0,0 +1,45 @@
+<!doctype html>
+<html>
+  <head>
+    <script src="https://unpkg.com/react/umd/react.development.js"></script>
+    <script src="https://unpkg.com/react-dom/umd/react-dom.development.js"></script>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script>
+      // https://codepen.io/gaearon/pen/VmmPgp?editors=0010
+      class NameForm extends React.Component {
+        constructor(props) {
+          super(props);
+          this.state = { value: '' };
+
+          this.handleChange = this.handleChange.bind(this);
+          this.handleSubmit = this.handleSubmit.bind(this);
+        }
+
+        handleChange(event) {
+          this.setState({ value: event.target.value });
+        }
+
+        handleSubmit(event) {
+          alert('A name was submitted: ' + this.state.value);
+          event.preventDefault();
+        }
+
+        render() {
+          return (
+            React.createElement("form", { onSubmit: this.handleSubmit },
+            React.createElement("label", null, "Name:",
+
+            React.createElement("input", { type: "text", value: this.state.value, onChange: this.handleChange })),
+
+            React.createElement("input", { type: "submit", value: "Submit" })));
+        }}
+
+
+        ReactDOM.render(
+        React.createElement(NameForm, null),
+        document.getElementById('root'));
+    </script>
+  </body>
+</html>

data/lib/capybara/version.rb

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

data/lib/capybara/window.rb

@@ -49,7 +49,7 @@ module Capybara
     # @return [Boolean] whether this window is the window in which commands are being executed
     def current?
       @driver.current_window_handle == @handle
-    rescue @driver.no_such_window_error
+    rescue @driver.no_such_window_error # rubocop:disable Naming/RescuedExceptionsVariableName
       false
     end
 

data/lib/capybara.rb

@@ -466,42 +466,8 @@ module Capybara
   require 'capybara/selenium/driver'
 end
 
-Capybara.register_server :default do |app, port, _host|
-  Capybara.run_default_server(app, port)
-end
-
-Capybara.register_server :webrick do |app, port, host, **options|
-  require 'rack/handler/webrick'
-  options = { Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log.new(nil, 0) }.merge(options)
-  Rack::Handler::WEBrick.run(app, options)
-end
-
-Capybara.register_server :puma do |app, port, host, **options|
-  begin
-    require 'rack/handler/puma'
-  rescue LoadError
-    raise LoadError, 'Capybara is unable to load `puma` for its server, please add `puma` to your project or specify a different server via something like `Capybara.server = :webrick`.'
-  else
-    unless Rack::Handler::Puma.respond_to?(:config)
-      raise LoadError, 'Capybara requires `puma` version 3.8.0 or higher, please upgrade `puma` or register and specify your own server block'
-    end
-  end
-  # If we just run the Puma Rack handler it installs signal handlers which prevent us from being able to interrupt tests.
-  # Therefore construct and run the Server instance ourselves.
-  # Rack::Handler::Puma.run(app, { Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false }.merge(options))
-  options = { Host: host, Port: port, Threads: '0:4', workers: 0, daemon: false }.merge(options)
-  conf = Rack::Handler::Puma.config(app, options)
-  events = conf.options[:Silent] ? ::Puma::Events.strings : ::Puma::Events.stdio
-
-  events.log 'Capybara starting Puma...'
-  events.log "* Version #{Puma::Const::PUMA_VERSION} , codename: #{Puma::Const::CODE_NAME}"
-  events.log "* Min threads: #{conf.options[:min_threads]}, max threads: #{conf.options[:max_threads]}"
-
-  Puma::Server.new(conf.app, events, conf.options).tap do |s|
-    s.binder.parse conf.options[:binds], s.events
-    s.min_threads, s.max_threads = conf.options[:min_threads], conf.options[:max_threads]
-  end.run.join
-end
+require 'capybara/registrations/servers'
+require 'capybara/registrations/drivers'
 
 Capybara.configure do |config|
   config.always_include_port = false
@@ -527,37 +493,3 @@ Capybara.configure do |config|
   config.default_normalize_ws = false
   config.allow_gumbo = false
 end
-
-Capybara.register_driver :rack_test do |app|
-  Capybara::RackTest::Driver.new(app)
-end
-
-Capybara.register_driver :selenium do |app|
-  Capybara::Selenium::Driver.new(app)
-end
-
-Capybara.register_driver :selenium_headless do |app|
-  Capybara::Selenium::Driver.load_selenium
-  browser_options = ::Selenium::WebDriver::Firefox::Options.new
-  browser_options.args << '-headless'
-  Capybara::Selenium::Driver.new(app, browser: :firefox, options: browser_options)
-end
-
-Capybara.register_driver :selenium_chrome do |app|
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
-    # Workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2650&q=load&sort=-id&colspec=ID%20Status%20Pri%20Owner%20Summary
-    opts.args << '--disable-site-isolation-trials'
-  end
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
-end
-
-Capybara.register_driver :selenium_chrome_headless do |app|
-  Capybara::Selenium::Driver.load_selenium
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
-    opts.args << '--headless'
-    opts.args << '--disable-gpu' if Gem.win_platform?
-    # Workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2650&q=load&sort=-id&colspec=ID%20Status%20Pri%20Owner%20Summary
-    opts.args << '--disable-site-isolation-trials'
-  end
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
-end

data/spec/minitest_spec_spec.rb

@@ -146,6 +146,6 @@ RSpec.describe 'capybara/minitest/spec' do
     reporter.report
     expect(output.string).to include('20 runs, 42 assertions, 1 failures, 0 errors, 1 skips')
     # Make sure error messages are displayed
-    expect(output.string).to include('expected to find select box "non_existing_form_title" but there were no matches')
+    expect(output.string).to match(/expected to find select box "non_existing_form_title" .*but there were no matches/)
   end
 end

data/spec/result_spec.rb

@@ -106,7 +106,7 @@ RSpec.describe Capybara::Result do
 
   # Not a great test but it indirectly tests what is needed
   it 'should evaluate filters lazily for idx' do
-    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    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
 
@@ -127,7 +127,7 @@ RSpec.describe Capybara::Result do
   end
 
   it 'should evaluate filters lazily for range' do
-    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    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
 
@@ -136,7 +136,7 @@ RSpec.describe Capybara::Result do
   end
 
   it 'should evaluate filters lazily for idx and length' do
-    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    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
 
@@ -145,7 +145,7 @@ RSpec.describe Capybara::Result do
   end
 
   it 'should only need to evaluate one result for any?' do
-    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    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
   end
@@ -158,7 +158,7 @@ RSpec.describe Capybara::Result do
 
   context '#each' do
     it 'lazily evaluates' do
-      skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+      skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
       results = []
       result.each do |el|
         results << el
@@ -174,7 +174,7 @@ RSpec.describe Capybara::Result do
       end
 
       it 'lazily evaluates' do
-        skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+        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
         end
@@ -197,4 +197,8 @@ RSpec.describe Capybara::Result do
       expect(eval_count).to eq 1
     end
   end
+
+  def jruby_lazy_enumerator_workaround?
+    (RUBY_PLATFORM == 'java') && (Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('9.2.8.0'))
+  end
 end

data/spec/rspec/shared_spec_matchers.rb

@@ -627,8 +627,12 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
   describe 'have_button matcher' do
     let(:html) { '<button>A button</button><input type="submit" value="Another button"/>' }
 
-    it 'gives proper description' do
-      expect(have_button('A button').description).to eq('have visible button "A button"')
+    it 'gives proper description with no options' do
+      expect(have_button('A button').description).to eq('have visible button "A button" that is not disabled')
+    end
+
+    it 'gives proper description with disabled :any option' do
+      expect(have_button('A button', disabled: :all).description).to eq('have visible button "A button"')
     end
 
     it 'passes if there is such a button' do
@@ -698,7 +702,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'gives proper description' do
-      expect(have_checked_field('it is checked').description).to eq('have visible field "it is checked" that is checked and not disabled')
+      expect(have_checked_field('it is checked').description).to eq('have visible field "it is checked" that is not disabled that is checked')
     end
 
     context 'with should' do
@@ -747,7 +751,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'gives proper description' do
-      expect(have_unchecked_field('unchecked field').description).to eq('have visible field "unchecked field" that is not checked and not disabled')
+      expect(have_unchecked_field('unchecked field').description).to eq('have visible field "unchecked field" that is not disabled that is not checked')
     end
 
     context 'with should' do

data/spec/sauce_spec_chrome.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'selenium-webdriver'
+
+require 'sauce_whisk'
+# require 'shared_selenium_session'
+# require 'rspec/shared_spec_matchers'
+
+Capybara.register_driver :sauce_chrome do |app|
+  options = {
+    selenium_version: '3.141.59',
+    platform: 'macOS 10.12',
+    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']
+  }
+
+  options.delete(:browser_name)
+
+  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(options)
+  url = 'https://ondemand.saucelabs.com:443/wd/hub'
+
+  Capybara::Selenium::Driver.new(app,
+                                 browser: :remote, url: url,
+                                 desired_capabilities: capabilities,
+                                 options: Selenium::WebDriver::Chrome::Options.new(args: ['']))
+end
+
+CHROME_REMOTE_DRIVER = :sauce_chrome
+
+module TestSessions
+  Chrome = Capybara::Session.new(CHROME_REMOTE_DRIVER, TestApp)
+end
+
+skipped_tests = %i[response_headers status_code trigger download]
+
+Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_REMOTE_DRIVER.to_s, capybara_skip: skipped_tests do |example|
+end

data/spec/selector_spec.rb

@@ -478,6 +478,10 @@ RSpec.describe Capybara do
           Capybara::Selector[:link_or_button].expression_filters.delete(:random)
         end
 
+        it 'should not find links when disabled == true' do
+          expect(string.all(:link_or_button, disabled: true).size).to eq 0
+        end
+
         context 'when modified' do
           it 'should still work' do
             filter = Capybara::Selector[:link_or_button].expression_filters[:random]

data/spec/selenium_spec_safari.rb

@@ -57,10 +57,9 @@ Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybar
       'Capybara::Session selenium_safari node #click should allow to retry longer',
       'Capybara::Session selenium_safari node #click should retry clicking'
     pending "safaridriver doesn't return a specific enough error to deal with this"
-  when /Capybara::Session selenium_safari #within_frame should find multiple nested frames/,
-       /Capybara::Session selenium_safari #within_frame works if the frame is closed/,
+  when /Capybara::Session selenium_safari #within_frame works if the frame is closed/,
        /Capybara::Session selenium_safari #switch_to_frame works if the frame is closed/
-    skip 'switch_to_frame(:parent) appears to go to the root in Safari rather than parent'
+    skip 'Safari has a race condition when clicking an element that causes the frame to close. It will sometimes raise a NoSuchFrameError'
   when /Capybara::Session selenium_safari #reset_session! removes ALL cookies/
     skip 'Safari webdriver can only remove cookies for the current domain'
   when /Capybara::Session selenium_safari #refresh it reposts/

data/spec/session_spec.rb

@@ -80,5 +80,12 @@ RSpec.describe Capybara::Session do
       session.quit
       expect(session.driver).not_to eql driver
     end
+
+    it 'resets the document' do
+      session = Capybara::Session.new(:rack_test, TestApp)
+      document = session.document
+      session.quit
+      expect(session.document.base).not_to eql document.base
+    end
   end
 end

data/spec/shared_selenium_session.rb

@@ -472,19 +472,21 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
     describe 'with react' do
       context 'controlled components' do
         it 'can set and clear a text field' do
-          session.visit 'https://reactjs.org/docs/forms.html'
-          session.all(:css, 'h2#controlled-components ~ p a', text: 'Try it on CodePen')[0].click
-          sleep 2 # give codepen a chance to stabilize result frame
-          session.within_frame(:css, 'iframe.result-iframe') 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
+          # 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
       end
     end

data/spec/spec_helper.rb

@@ -9,7 +9,8 @@ module Capybara
   module SpecHelper
     def firefox?(session)
       browser_name(session) == :firefox &&
-        session.driver.browser.capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities)
+        ((defined?(::Selenium::WebDriver::VERSION) && (::Selenium::WebDriver::VERSION.to_f >= 4)) ||
+         session.driver.browser.capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities))
     end
 
     def firefox_lt?(version, session)