capybara 3.16.0 → 3.17.0

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/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,18 +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
-          session.within_frame(:css, 'iframe.result-iframe[src^="https://s.codepen.io"]', 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
+          # 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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.17.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -152,20 +152,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement
@@ -407,6 +393,8 @@ files:
 - lib/capybara/rack_test/form.rb
 - lib/capybara/rack_test/node.rb
 - lib/capybara/rails.rb
+- lib/capybara/registrations/drivers.rb
+- lib/capybara/registrations/servers.rb
 - lib/capybara/result.rb
 - lib/capybara/rspec.rb
 - lib/capybara/rspec/features.rb
@@ -442,6 +430,7 @@ files:
 - lib/capybara/selenium/extensions/find.rb
 - lib/capybara/selenium/extensions/html5_drag.rb
 - lib/capybara/selenium/extensions/scroll.rb
+- lib/capybara/selenium/logger_suppressor.rb
 - lib/capybara/selenium/node.rb
 - lib/capybara/selenium/nodes/chrome_node.rb
 - lib/capybara/selenium/nodes/firefox_node.rb
@@ -567,6 +556,7 @@ files:
 - lib/capybara/spec/views/popup_one.erb
 - lib/capybara/spec/views/popup_two.erb
 - lib/capybara/spec/views/postback.erb
+- lib/capybara/spec/views/react.erb
 - lib/capybara/spec/views/scroll.erb
 - lib/capybara/spec/views/tables.erb
 - lib/capybara/spec/views/with_animation.erb