capybara 3.35.3 → 3.36.0

data/spec/selenium_spec_firefox.rb

@@ -15,6 +15,7 @@ browser_options.profile = Selenium::WebDriver::Firefox::Profile.new.tap do |prof
   profile['browser.download.folderList'] = 2
   profile['browser.helperApps.neverAsk.saveToDisk'] = 'text/csv'
   profile['browser.startup.homepage'] = 'about:blank' # workaround bug in Selenium 4 alpha4-7
+  profile['accessibility.tabfocus'] = 7 # make tab move over links too
 end
 
 Capybara.register_driver :selenium_firefox do |app|
@@ -59,8 +60,8 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
   when 'Capybara::Session selenium #attach_file with multipart form should fire change once when uploading multiple files from empty'
     pending "FF < 62 doesn't support setting all files at once" if firefox_lt?(62, @session)
   when 'Capybara::Session selenium #accept_confirm should work with nested modals'
-    skip 'Broken in 63 <= FF < 69  - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session) && firefox_lt?(69, @session)
-    skip 'Hangs in 69 <= FF < 71  - Dont know what issue for this - previous issue was closed as fixed but it is not' if firefox_gte?(69, @session) && firefox_lt?(71, @session)
+    skip 'Broken in 63 <= FF < 69 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session) && firefox_lt?(69, @session)
+    skip 'Hangs in 69 <= FF < 71 - Dont know what issue for this - previous issue was closed as fixed but it is not' if firefox_gte?(69, @session) && firefox_lt?(71, @session)
     skip 'Broken again intermittently in FF 71 - jus skip it'
   when 'Capybara::Session selenium #click_link can download a file'
     skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
@@ -102,7 +103,7 @@ RSpec.describe 'Capybara::Session with firefox' do # rubocop:disable RSpec/Multi
     end
 
     it 'should fill in a datetime input with a String' do
-      # FF doesn't currently support datetime-local so this is really just a text input
+      pending "Need to figure out what string format this will actually accept"
       session.fill_in('form_datetime', with: datetime.iso8601)
       session.click_button('awesome')
       expect(Time.parse(extract_results(session)['datetime'])).to eq datetime

data/spec/selenium_spec_firefox_remote.rb

@@ -21,8 +21,8 @@ def ensure_selenium_running!
   rescue StandardError
     if timer.expired?
       raise 'Selenium is not running. ' \
-          "You can run a selenium server easily with: \n" \
-          '  $ docker-compose up -d selenium_firefox'
+            "You can run a selenium server easily with: \n" \
+            '  $ docker-compose up -d selenium_firefox'
     else
       puts 'Waiting for Selenium docker instance...'
       sleep 1

data/spec/selenium_spec_ie.rb

@@ -71,13 +71,10 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, 'selenium', capybara_sk
     pending "IE 11 doesn't support date input types"
   when /#click_link_or_button with :disabled option happily clicks on links which incorrectly have the disabled attribute$/
     skip 'IE 11 obeys non-standard disabled attribute on anchor tag'
-  when /#right_click should allow modifiers$/
-    skip "Windows can't :meta click because :meta triggers start menu"
-  when /#click should allow modifiers$/
+  when /#click should allow modifiers$/, /#double_click should allow modifiers$/
     pending "Doesn't work with IE for some unknown reason$"
-  when /#double_click should allow modifiers$/
     pending "Doesn't work with IE for some unknown reason$"
-  when /#click should allow multiple modifiers$/
+  when /#click should allow multiple modifiers$/, /#right_click should allow modifiers$/
     skip "Windows can't :meta click because :meta triggers start menu"
   when /#double_click should allow multiple modifiers$/
     skip "Windows can't :alt double click due to being properties shortcut"
@@ -91,7 +88,7 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, 'selenium', capybara_sk
     pending "Window 7 and 8.1 don't support 308 http status code"
   when /#scroll_to can scroll an element to the center of the viewport$/,
        /#scroll_to can scroll an element to the center of the scrolling element$/
-    pending " IE doesn't support ScrollToOptions"
+    pending "IE doesn't support ScrollToOptions"
   when /#attach_file with multipart form should fire change once for each set of files uploaded$/,
        /#attach_file with multipart form should fire change once when uploading multiple files from empty$/,
        /#attach_file with multipart form should not break when using HTML5 multiple file input uploading multiple files$/

data/spec/selenium_spec_safari.rb

@@ -8,28 +8,40 @@ require 'rspec/shared_spec_matchers'
 
 SAFARI_DRIVER = :selenium_safari
 
-if ::Selenium::WebDriver::Service.respond_to? :driver_path=
-  ::Selenium::WebDriver::Safari::Service
-else
-  ::Selenium::WebDriver::Safari
-end.driver_path = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver'
+# if ::Selenium::WebDriver::Service.respond_to? :driver_path=
+#   ::Selenium::WebDriver::Safari::Service
+# else
+#   ::Selenium::WebDriver::Safari
+# end.driver_path = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver'
 
 browser_options = ::Selenium::WebDriver::Safari::Options.new
 # browser_options.headless! if ENV['HEADLESS']
-# browser_options.add_option(:w3c, !!ENV['W3C'])
 
 Capybara.register_driver :selenium_safari do |app|
-  Capybara::Selenium::Driver.new(app, browser: :safari, options: browser_options, timeout: 30).tap do |driver|
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  driver_options = { browser: :safari, timeout: 30 }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+
+  Capybara::Selenium::Driver.new(app, **driver_options).tap do |driver|
     # driver.browser.download_path = Capybara.save_path
   end
 end
 
 Capybara.register_driver :selenium_safari_not_clear_storage do |app|
-  safari_options = {
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  driver_options = {
     browser: :safari,
-    options: browser_options
-  }
-  Capybara::Selenium::Driver.new(app, safari_options.merge(clear_local_storage: false, clear_session_storage: false))
+    clear_local_storage: false,
+    clear_session_storage: false,
+    timeout: 30
+  }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+
+  Capybara::Selenium::Driver.new(app, **driver_options)
 end
 
 module TestSessions
@@ -65,16 +77,13 @@ Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybar
   when 'Capybara::Session selenium_safari node #double_click should allow to adjust the offset',
        'Capybara::Session selenium_safari node #double_click should double click an element'
     pending "safardriver doesn't generate a double click event"
-  when 'Capybara::Session selenium_safari node #click should allow multiple modifiers',
-       /Capybara::Session selenium_safari node #(click|right_click|double_click) should allow modifiers/
-    pending "safaridriver doesn't take key state into account when clicking"
-  when 'Capybara::Session selenium_safari #fill_in on a pre-populated textfield with a reformatting onchange should trigger change when clearing field'
-    pending "safardriver clear doesn't generate change event"
+  when 'Capybara::Session selenium_safari node #double_click should allow modifiers'
+    pending "safaridriver doesn't generate double click with key modifiers"
+  when /when w3c_click_offset is true should offset/
+    pending "w3c_click_offset is not currently supported with safaridriver"
   when 'Capybara::Session selenium_safari #go_back should fetch a response from the driver from the previous page',
        'Capybara::Session selenium_safari #go_forward should fetch a response from the driver from the previous page'
     skip 'safaridriver loses the ability to find elements in the document after `go_back`'
-  when /drag_to.*HTML5/
-    pending "Safari doesn't support"
   end
 end
 
@@ -124,7 +133,6 @@ RSpec.describe 'Capybara::Session with safari' do
     end
 
     it 'should fill in a date input with a String' do
-      pending "Safari doesn't support date inputs"
       session.fill_in('form_date', with: '06/19/1983')
       session.click_button('awesome')
       expect(Date.parse(extract_results(session)['date'])).to eq datetime.to_date

data/spec/shared_selenium_node.rb

@@ -61,8 +61,6 @@ RSpec.shared_examples 'Capybara::Node' do |session, _mode|
     end
 
     it 'will use native displayed if told to' do
-      pending "Chromedriver < 76.0.3809.25 doesn't support native displayed in W3C mode" if chrome_lt?(76, session) && (ENV['W3C'] != 'false')
-
       session.driver.options[:native_displayed] = true
       session.visit('/form')
       session.find(:css, '#address1_city', visible: true)
@@ -71,8 +69,6 @@ RSpec.shared_examples 'Capybara::Node' do |session, _mode|
     end
 
     it "won't use native displayed if told not to" do
-      skip 'Non-W3C uses native' if chrome?(session) && (ENV['W3C'] == 'false')
-
       session.driver.options[:native_displayed] = false
       session.visit('/form')
       session.find(:css, '#address1_city', visible: true)

data/spec/shared_selenium_session.rb

@@ -74,7 +74,6 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
 
     describe '#fill_in_with empty string and no options' do
       it 'should trigger change when clearing a field' do
-        pending "safaridriver doesn't trigger change for clear" if safari?(session)
         session.visit('/with_js')
         session.fill_in('with_change_event', with: '')
         # click outside the field to trigger the change event
@@ -188,14 +187,12 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
 
       it 'should generate standard events on changing value' do
         pending "IE 11 doesn't support date input type" if ie?(session)
-        pending "Safari doesn't support date input type" if safari?(session)
         session.fill_in('form_date', with: Date.today)
         expect(session.evaluate_script('window.capybara_formDateFiredEvents')).to eq %w[focus input change]
       end
 
       it 'should not generate input and change events if the value is not changed' do
         pending "IE 11 doesn't support date input type" if ie?(session)
-        pending "Safari doesn't support date input type" if safari?(session)
         session.fill_in('form_date', with: Date.today)
         session.fill_in('form_date', with: Date.today)
         # Chrome adds an extra focus for some reason - ok for now
@@ -223,14 +220,14 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
     end
 
     describe '#send_keys' do
-      it 'defaults to sending keys to the document.activeElement' do
+      it 'defaults to sending keys to the active_element' do
         session.visit('/form')
 
-        expect(session.evaluate_script('document.activeElement')).to eq(session.find('//body'))
+        expect(session.active_element).to match_selector(:css, 'body')
 
         session.send_keys(:tab)
 
-        expect(session.evaluate_script('document.activeElement')).to eq(session.first(:field))
+        expect(session.active_element).to match_selector(:css, '[tabindex="1"]')
       end
     end
 
@@ -381,6 +378,12 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
           @animation_session = Capybara::Session.new(session.mode, TestApp.new)
         end
 
+        it 'should add CSS to the <head> element' do
+          @animation_session.visit('with_animation')
+
+          expect(@animation_session).to have_selector(:css, 'head > style', text: 'transition: none', visible: :hidden)
+        end
+
         it 'should disable CSS transitions' do
           @animation_session.visit('with_animation')
           @animation_session.click_link('transition me away')
@@ -514,8 +517,8 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
 
       it 'can query attributes with strange characters' do
         session.visit('/form')
-        expect(session).to have_selector(:element, "{custom}": true)
-        expect(session).to have_selector(:element, "{custom}": 'abcdef')
+        expect(session).to have_selector(:element, '{custom}': true)
+        expect(session).to have_selector(:element, '{custom}': 'abcdef')
       end
     end
 

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.35.3
+  version: 3.36.0
 platform: ruby
 authors:
 - Thomas Walpole
 - Jonas Nicklas
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain:
-- gem-public_cert.pem
-date: 2021-01-30 00:00:00.000000000 Z
+cert_chain: []
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -26,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_mime
   requirement: !ruby/object:Gem::Requirement
@@ -372,16 +385,22 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.142.7
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.142.7
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -468,6 +487,7 @@ files:
 - lib/capybara/node/finders.rb
 - lib/capybara/node/matchers.rb
 - lib/capybara/node/simple.rb
+- lib/capybara/queries/active_element_query.rb
 - lib/capybara/queries/ancestor_query.rb
 - lib/capybara/queries/base_query.rb
 - lib/capybara/queries/current_path_query.rb
@@ -587,6 +607,7 @@ files:
 - lib/capybara/spec/session/accept_alert_spec.rb
 - lib/capybara/spec/session/accept_confirm_spec.rb
 - lib/capybara/spec/session/accept_prompt_spec.rb
+- lib/capybara/spec/session/active_element_spec.rb
 - lib/capybara/spec/session/all_spec.rb
 - lib/capybara/spec/session/ancestor_spec.rb
 - lib/capybara/spec/session/assert_all_of_selectors_spec.rb
@@ -686,6 +707,7 @@ files:
 - lib/capybara/spec/views/header_links.erb
 - lib/capybara/spec/views/host_links.erb
 - lib/capybara/spec/views/initial_alert.erb
+- lib/capybara/spec/views/layout.erb
 - lib/capybara/spec/views/obscured.erb
 - lib/capybara/spec/views/offset.erb
 - lib/capybara/spec/views/path.erb
@@ -715,7 +737,6 @@ files:
 - lib/capybara/spec/views/with_simple_html.erb
 - lib/capybara/spec/views/with_slow_unload.erb
 - lib/capybara/spec/views/with_sortable_js.erb
-- lib/capybara/spec/views/with_title.erb
 - lib/capybara/spec/views/with_unload_alert.erb
 - lib/capybara/spec/views/with_windows.erb
 - lib/capybara/spec/views/within_frames.erb
@@ -765,7 +786,7 @@ licenses:
 metadata:
   changelog_uri: https://github.com/teamcapybara/capybara/blob/master/History.md
   source_code_uri: https://github.com/teamcapybara/capybara
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -773,15 +794,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.29
+signing_key:
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,
   such as Rails, Sinatra or Merb

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

@@ -1,5 +0,0 @@
-
-<title>Test Title</title>
-<body>
-  <svg><title>abcdefg</title></svg>
-</body>