capybara 3.19.1 → 3.20.0

data/lib/capybara/version.rb

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

data/spec/sauce_spec_chrome.rb

@@ -5,6 +5,7 @@ require 'selenium-webdriver'
 
 require 'sauce_whisk'
 # require 'shared_selenium_session'
+# require 'shared_selenium_node'
 # require 'rspec/shared_spec_matchers'
 
 Capybara.register_driver :sauce_chrome do |app|

data/spec/selenium_spec_chrome.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
 CHROME_DRIVER = :selenium_chrome
@@ -51,8 +52,9 @@ end
 
 RSpec.describe 'Capybara::Session with chrome' do
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::Chrome, CHROME_DRIVER
-  include_examples  Capybara::RSpecMatchers, TestSessions::Chrome, CHROME_DRIVER
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::Chrome, CHROME_DRIVER
+  end
 
   context 'storage' do
     describe '#reset!' do

data/spec/selenium_spec_chrome_remote.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
 def selenium_host
@@ -72,8 +73,9 @@ end
 
 RSpec.describe 'Capybara::Session with remote Chrome' do
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::Chrome, CHROME_REMOTE_DRIVER
-  include_examples  Capybara::RSpecMatchers, TestSessions::Chrome, CHROME_REMOTE_DRIVER
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::Chrome, CHROME_REMOTE_DRIVER
+  end
 
   it 'is considered to be chrome' do
     expect(session.driver.browser.browser).to eq :chrome

data/spec/selenium_spec_edge.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
 Capybara.register_driver :selenium_edge do |app|
@@ -27,6 +28,7 @@ end
 
 RSpec.describe 'Capybara::Session with Edge', capybara_skip: skipped_tests do
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::SeleniumEdge, :selenium_edge
-  include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumEdge, :selenium_edge
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::SeleniumEdge, :selenium_edge
+  end
 end

data/spec/selenium_spec_firefox.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
 browser_options = ::Selenium::WebDriver::Firefox::Options.new
@@ -68,8 +69,9 @@ end
 
 RSpec.describe 'Capybara::Session with firefox' do # rubocop:disable RSpec/MultipleDescribes
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::SeleniumFirefox, :selenium_firefox
-  include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumFirefox, :selenium_firefox
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::SeleniumFirefox, :selenium_firefox
+  end
 
   describe 'filling in Firefox-specific date and time fields with keystrokes' do
     let(:datetime) { Time.new(1983, 6, 19, 6, 30) }
@@ -198,13 +200,4 @@ RSpec.describe Capybara::Selenium::Node do
       expect(session).to have_link('Has been alt control meta')
     end
   end
-
-  context '#send_keys' do
-    it 'should process space' do
-      session = TestSessions::SeleniumFirefox
-      session.visit('/form')
-      session.find(:css, '#address1_city').send_keys('ocean', [:shift, :space, 'side'])
-      expect(session.find(:css, '#address1_city').value).to eq 'ocean SIDE'
-    end
-  end
 end

data/spec/selenium_spec_firefox_remote.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
 def selenium_host
@@ -77,8 +78,9 @@ end
 
 RSpec.describe 'Capybara::Session with remote firefox' do
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVER
-  include_examples  Capybara::RSpecMatchers, TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVER
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVER
+  end
 
   it 'is considered to be firefox' do
     expect(session.driver.browser.browser).to eq :firefox

data/spec/selenium_spec_ie.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
 if ENV['CI']
@@ -39,7 +40,6 @@ Capybara.register_driver :selenium_ie do |app|
                                    browser: :remote,
                                    options: options,
                                    url: url).tap do |driver|
-      puts driver.browser.capabilities.inspect
       driver.browser.file_detector = lambda do |args|
         str = args.first.to_s
         str if File.exist?(str)
@@ -50,9 +50,7 @@ Capybara.register_driver :selenium_ie do |app|
       app,
       browser: :ie,
       options: options
-    ).tap do |driver|
-      puts driver.browser.capabilities.inspect
-    end
+    )
   end
 end
 
@@ -117,8 +115,9 @@ end
 
 RSpec.describe 'Capybara::Session with Internet Explorer', capybara_skip: skipped_tests do # rubocop:disable RSpec/MultipleDescribes
   include Capybara::SpecHelper
-  include_examples 'Capybara::Session', TestSessions::SeleniumIE, :selenium_ie
-  include_examples Capybara::RSpecMatchers, TestSessions::SeleniumIE, :selenium_ie
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::SeleniumIE, :selenium_ie
+  end
 end
 
 RSpec.describe Capybara::Selenium::Node do

data/spec/selenium_spec_safari.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
 SAFARI_DRIVER = :selenium_safari
@@ -54,13 +55,6 @@ Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybar
     pending 'safaridriver thinks these links are non-interactable for some unknown reason'
   when /Capybara::Session selenium_safari #attach_file with a block can upload by clicking the file input/
     skip "safaridriver doesn't allow clicking on file inputs"
-  when /Capybara::Session selenium_safari #attach_file with a block can upload by clicking the label/
-    skip 'hangs tests'
-  when /Capybara::Session selenium_safari #check when checkbox hidden with Capybara.automatic_label_click == false with allow_label_click == true should check via the label if input is visible but blocked by another element/,
-      'Capybara::Session selenium_safari node #click should not retry clicking when wait is disabled',
-      '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 works if the frame is closed/,
        /Capybara::Session selenium_safari #switch_to_frame works if the frame is closed/
     skip 'Safari has a race condition when clicking an element that causes the frame to close. It will sometimes raise a NoSuchFrameError'
@@ -79,15 +73,14 @@ Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybar
   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 'Capybara::Session selenium_safari node #send_keys should hold modifiers at top level'
-    skip 'Need to look into this'
   end
 end
 
 RSpec.describe 'Capybara::Session with safari' do
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::Safari, SAFARI_DRIVER
-  include_examples  Capybara::RSpecMatchers, TestSessions::Safari, SAFARI_DRIVER
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::Safari, SAFARI_DRIVER
+  end
 
   context 'storage' do
     describe '#reset!' do
@@ -125,17 +118,18 @@ RSpec.describe 'Capybara::Session with safari' do
     let(:session) { TestSessions::Safari }
 
     before do
-      skip 'Too many other things broken currently'
       session.visit('/form')
     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
     end
 
     it 'should fill in a time input with a String' do
+      # Safari doesn't support time inputs - so this is just a text input
       session.fill_in('form_time', with: '06:30A')
       session.click_button('awesome')
       results = extract_results(session)['time']
@@ -143,6 +137,7 @@ RSpec.describe 'Capybara::Session with safari' do
     end
 
     it 'should fill in a datetime input with a String' do
+      pending "Safari doesn't support datetime inputs"
       session.fill_in('form_datetime', with: "06/19/1983\t06:30A")
       session.click_button('awesome')
       expect(Time.parse(extract_results(session)['datetime'])).to eq datetime

data/spec/server_spec.rb

@@ -83,8 +83,10 @@ RSpec.describe Capybara::Server do
       server = Capybara::Server.new(app).boot
 
       expect do
-        Net::HTTP.start(server.host, server.port, max_retries: 0) { |http| http.get('/__idntify__') }
-      end.to raise_error(EOFError)
+        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)
 
       res = Net::HTTP.start(server.host, server.port, use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE) do |https|
         https.get('/')

data/spec/shared_selenium_node.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'selenium-webdriver'
+
+RSpec.shared_examples 'Capybara::Node' do |session, _mode|
+  let(:session) { session }
+
+  context '#content_editable?' do
+    it 'returns true when the element is content editable' do
+      session.visit('/with_js')
+      expect(session.find(:css, '#existing_content_editable').base.content_editable?).to be true
+      expect(session.find(:css, '#existing_content_editable_child').base.content_editable?).to be true
+    end
+
+    it 'returns false when the element is not content editable' do
+      session.visit('/with_js')
+      expect(session.find(:css, '#drag').base.content_editable?).to be false
+    end
+  end
+
+  context '#send_keys' do
+    it 'should process space' do
+      session.visit('/form')
+      session.find(:css, '#address1_city').send_keys('ocean', [:shift, :space, 'side'])
+      expect(session.find(:css, '#address1_city').value).to eq 'ocean SIDE'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.19.1
+  version: 3.20.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-05-11 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -96,6 +96,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  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: xpath
   requirement: !ruby/object:Gem::Requirement
@@ -487,6 +501,10 @@ files:
 - lib/capybara/selector/regexp_disassembler.rb
 - lib/capybara/selector/selector.rb
 - lib/capybara/selector/xpath_extensions.rb
+- lib/capybara/selenium/atoms/getAttribute.min.js
+- lib/capybara/selenium/atoms/isDisplayed.min.js
+- lib/capybara/selenium/atoms/src/getAttribute.js
+- lib/capybara/selenium/atoms/src/isDisplayed.js
 - lib/capybara/selenium/driver.rb
 - lib/capybara/selenium/driver_specializations/chrome_driver.rb
 - lib/capybara/selenium/driver_specializations/firefox_driver.rb
@@ -501,6 +519,7 @@ files:
 - lib/capybara/selenium/nodes/firefox_node.rb
 - lib/capybara/selenium/nodes/ie_node.rb
 - lib/capybara/selenium/nodes/safari_node.rb
+- lib/capybara/selenium/patches/atoms.rb
 - lib/capybara/selenium/patches/pause_duration_fix.rb
 - lib/capybara/selenium/patches/persistent_client.rb
 - lib/capybara/server.rb
@@ -607,6 +626,7 @@ files:
 - lib/capybara/spec/session/within_spec.rb
 - lib/capybara/spec/spec_helper.rb
 - lib/capybara/spec/test_app.rb
+- lib/capybara/spec/views/animated.erb
 - lib/capybara/spec/views/buttons.erb
 - lib/capybara/spec/views/fieldsets.erb
 - lib/capybara/spec/views/form.erb
@@ -680,6 +700,7 @@ files:
 - spec/selenium_spec_safari.rb
 - spec/server_spec.rb
 - spec/session_spec.rb
+- spec/shared_selenium_node.rb
 - spec/shared_selenium_session.rb
 - spec/spec_helper.rb
 - spec/xpath_builder_spec.rb