capybara 2.18.0 → 3.0.0.rc1

data/spec/shared_selenium_session.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require "selenium-webdriver"
 
 RSpec.shared_examples "Capybara::Session" do |session, mode|
-  let(:session) {session}
+  let(:session) { session }
 
   context 'with selenium driver' do
     before do
@@ -35,7 +36,6 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
         @current_dir = Dir.getwd
         Dir.chdir(File.join(File.dirname(__FILE__), '..'))
         @env = { 'SELENIUM_BROWSER' => @session.driver.options[:browser].to_s }
-        @env['LEGACY_FIREFOX'] = 'TRUE' if mode == :selenium_firefox
       end
 
       after do
@@ -45,13 +45,13 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       it "should have return code 1 when running selenium_driver_rspec_failure.rb" do
         skip if ENV['HEADLESS']
         system(@env, 'rspec spec/fixtures/selenium_driver_rspec_failure.rb', out: File::NULL, err: File::NULL)
-        expect($?.exitstatus).to eq(1)
+        expect($CHILD_STATUS.exitstatus).to eq(1)
       end
 
       it "should have return code 0 when running selenium_driver_rspec_success.rb" do
         skip if ENV['HEADLESS']
         system(@env, 'rspec spec/fixtures/selenium_driver_rspec_success.rb', out: File::NULL, err: File::NULL)
-        expect($?.exitstatus).to eq(0)
+        expect($CHILD_STATUS.exitstatus).to eq(0)
       end
     end
 
@@ -60,7 +60,7 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
         @session.visit('/with_js')
         @session.click_link('Open alert')
         @session.accept_alert
-        expect{@session.driver.browser.switch_to.alert}.to raise_error(@session.driver.send(:modal_error))
+        expect { @session.driver.browser.switch_to.alert }.to raise_error(@session.driver.send(:modal_error))
       end
 
       it "can be called before visiting" do
@@ -84,15 +84,17 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
     context "#fill_in with { :clear => :backspace } fill_option", requires: [:js] do
       it 'should fill in a field, replacing an existing value' do
         @session.visit('/form')
-        @session.fill_in('form_first_name', with: 'Harry',
-                          fill_options: { clear: :backspace} )
+        @session.fill_in('form_first_name',
+                         with: 'Harry',
+                         fill_options: { clear: :backspace })
         expect(@session.find(:fillable_field, 'form_first_name').value).to eq('Harry')
       end
 
       it 'should only trigger onchange once' do
         @session.visit('/with_js')
-        @session.fill_in('with_change_event', with: 'some value',
-                         fill_options: { :clear => :backspace })
+        @session.fill_in('with_change_event',
+                         with: 'some value',
+                         fill_options: { clear: :backspace })
         # click outside the field to trigger the change event
         @session.find(:css, 'body').click
         expect(@session.find(:css, '.change_event_triggered', match: :one)).to have_text 'some value'
@@ -100,8 +102,9 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
 
       it 'should trigger change when clearing field' do
         @session.visit('/with_js')
-        @session.fill_in('with_change_event', with: '',
-                         fill_options: { :clear => :backspace })
+        @session.fill_in('with_change_event',
+                         with: '',
+                         fill_options: { clear: :backspace })
         # click outside the field to trigger the change event
         @session.find(:css, 'body').click
         expect(@session).to have_selector(:css, '.change_event_triggered', match: :one)
@@ -109,8 +112,9 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
 
       it 'should trigger input event field_value.length times' do
         @session.visit('/with_js')
-        @session.fill_in('with_change_event', with: '',
-                         fill_options: { :clear => :backspace })
+        @session.fill_in('with_change_event',
+                         with: '',
+                         fill_options: { clear: :backspace })
         # click outside the field to trigger the change event
         @session.find(:css, 'body').click
         expect(@session).to have_xpath('//p[@class="input_event_triggered"]', count: 13)
@@ -120,8 +124,9 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
     context "#fill_in with { clear: :none } fill_options" do
       it 'should append to content in a field' do
         @session.visit('/form')
-        @session.fill_in('form_first_name', with: 'Harry',
-                          fill_options: { clear: :none} )
+        @session.fill_in('form_first_name',
+                         with: 'Harry',
+                         fill_options: { clear: :none })
         expect(@session.find(:fillable_field, 'form_first_name').value).to eq('JohnHarry')
       end
     end
@@ -129,10 +134,11 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
     context "#fill_in with { clear: Array } fill_options" do
       it 'should pass the array through to the element' do
         pending "selenium-webdriver/geckodriver doesn't support complex sets of characters" if marionette?(@session)
-        #this is mainly for use with [[:control, 'a'], :backspace] - however since that is platform dependant I'm testing with something less useful
+        # this is mainly for use with [[:control, 'a'], :backspace] - however since that is platform dependant I'm testing with something less useful
         @session.visit('/form')
-        @session.fill_in('form_first_name', with: 'Harry',
-                          fill_options: { clear: [[:shift, 'abc'], :backspace] } )
+        @session.fill_in('form_first_name',
+                         with: 'Harry',
+                         fill_options: { clear: [[:shift, 'abc'], :backspace] })
         expect(@session.find(:fillable_field, 'form_first_name').value).to eq('JohnABHarry')
       end
     end
@@ -149,7 +155,7 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
     describe "all with disappearing elements" do
       it "ignores stale elements in results" do
         @session.visit('/path')
-        elements = @session.all(:link) { |node| raise Selenium::WebDriver::Error::StaleElementReferenceError }
+        elements = @session.all(:link) { |_node| raise Selenium::WebDriver::Error::StaleElementReferenceError }
         expect(elements.size).to eq 0
       end
     end
@@ -173,12 +179,12 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       it "can return hashes with elements" do
         @session.visit('/form')
         result = @session.evaluate_script("{ a: document.getElementById('form_title'), b: {c: document.querySelectorAll('#form_city option')}}")
-        expect(result).to eq({
+        expect(result).to eq(
           'a' => @session.find(:id, 'form_title'),
           'b' => {
             'c' => @session.find(:css, '#form_city').all(:css, 'option').to_a
           }
-        })
+        )
       end
 
       describe "#evaluate_async_script" do

data/spec/spec_helper.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
+
 require 'rspec/expectations'
 require "capybara/spec/spec_helper"
-require "pry"
+require 'webdrivers' if ENV['TRAVIS']
 
 RSpec.configure do |config|
   Capybara::SpecHelper.configure(config)
   config.filter_run_including focus_: true unless ENV['TRAVIS']
   config.run_all_when_everything_filtered = true
 end
-
-def rspec2?
-  !defined?(::RSpec::Expectations::Version) || (Gem::Version.new(RSpec::Expectations::Version::STRING) < Gem::Version.new('3.0'))
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,22 +10,22 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_mime
   requirement: !ruby/object:Gem::Requirement
@@ -41,121 +41,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: xpath
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: xpath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -171,49 +153,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.4
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.8
-- !ruby/object:Gem::Dependency
-  name: fuubar
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -227,61 +195,73 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: erubi
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 description: Capybara is an integration testing tool for rack based web applications.
   It simulates how a user would interact with a website
 email:
@@ -323,7 +303,6 @@ files:
 - lib/capybara/queries/sibling_query.rb
 - lib/capybara/queries/text_query.rb
 - lib/capybara/queries/title_query.rb
-- lib/capybara/query.rb
 - lib/capybara/rack_test/browser.rb
 - lib/capybara/rack_test/css_handlers.rb
 - lib/capybara/rack_test/driver.rb
@@ -412,6 +391,7 @@ files:
 - lib/capybara/spec/session/headers.rb
 - lib/capybara/spec/session/html_spec.rb
 - lib/capybara/spec/session/node_spec.rb
+- lib/capybara/spec/session/node_wrapper_spec.rb
 - lib/capybara/spec/session/refresh_spec.rb
 - lib/capybara/spec/session/reset_session_spec.rb
 - lib/capybara/spec/session/response_code.rb
@@ -491,7 +471,6 @@ files:
 - spec/rspec_spec.rb
 - spec/selector_spec.rb
 - spec/selenium_spec_chrome.rb
-- spec/selenium_spec_firefox.rb
 - spec/selenium_spec_marionette.rb
 - spec/server_spec.rb
 - spec/session_spec.rb
@@ -509,15 +488,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,