capybara 2.14.4 → 2.15.0

data/spec/selenium_spec_chrome.rb

@@ -3,38 +3,34 @@ require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
 
-chrome_options = {
-  browser: :chrome,
-  options: ::Selenium::WebDriver::Chrome::Options.new(args: ENV['TRAVIS'] ? ['no-sandbox' ] : [])
-}
-
-if ENV['CAPYBARA_CHROME_HEADLESS']
-  chrome_options[:options].args << 'headless'
-  Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta' if ENV['TRAVIS']
-end
+CHROME_DRIVER = if ENV['HEADLESS'] then :selenium_chrome_headless else :selenium_chrome end
 
-Capybara.register_driver :selenium_chrome do |app|
-  Capybara::Selenium::Driver.new(app, chrome_options)
+if ENV['HEADLESS'] && ENV['TRAVIS']
+  Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta'
 end
 
 Capybara.register_driver :selenium_chrome_clear_storage do |app|
+  chrome_options = {
+    browser: :chrome,
+    options: ::Selenium::WebDriver::Chrome::Options.new()
+  }
+  chrome_options[:options].args << 'headless' if ENV['HEADLESS']
   Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: true, clear_session_storage: true))
 end
 
 module TestSessions
-  Chrome = Capybara::Session.new(:selenium_chrome, TestApp)
+  Chrome = Capybara::Session.new(CHROME_DRIVER, TestApp)
 end
 
 skipped_tests = [:response_headers, :status_code, :trigger]
-skipped_tests << :windows if ENV['TRAVIS'] && ENV['SKIP_WINDOW']
 # skip window tests when headless for now - closing a window not supported by chromedriver/chrome
-skipped_tests << :windows if ENV['TRAVIS'] && ENV['CAPYBARA_CHROME_HEADLESS']
+skipped_tests << :windows if ENV['TRAVIS']  && (ENV['SKIP_WINDOW'] || ENV['HEADLESS'])
 
-Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", capybara_skip: skipped_tests
+Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests
 
 RSpec.describe "Capybara::Session with chrome" do
   include Capybara::SpecHelper
-  include_examples  "Capybara::Session", TestSessions::Chrome, :selenium_chrome
+  include_examples  "Capybara::Session", TestSessions::Chrome, CHROME_DRIVER
 
   context "storage" do
     describe "#reset!" do

data/spec/selenium_spec_marionette.rb

@@ -4,6 +4,8 @@ require "selenium-webdriver"
 require 'shared_selenium_session'
 require 'rspec/shared_spec_matchers'
 
+ENV['MOZ_HEADLESS']='1' if ENV['HEADLESS']
+
 Capybara.register_driver :selenium_marionette do |app|
   Capybara::Selenium::Driver.new(
     app,

data/spec/shared_selenium_session.rb

@@ -43,11 +43,13 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       end
 
       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)
       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)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.14.4
+  version: 2.15.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -27,19 +27,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: mini_mime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -309,10 +309,12 @@ files:
 - lib/capybara/node/finders.rb
 - lib/capybara/node/matchers.rb
 - lib/capybara/node/simple.rb
+- lib/capybara/queries/ancestor_query.rb
 - lib/capybara/queries/base_query.rb
 - lib/capybara/queries/current_path_query.rb
 - lib/capybara/queries/match_query.rb
 - lib/capybara/queries/selector_query.rb
+- lib/capybara/queries/sibling_query.rb
 - lib/capybara/queries/text_query.rb
 - lib/capybara/queries/title_query.rb
 - lib/capybara/query.rb
@@ -324,14 +326,17 @@ files:
 - lib/capybara/rails.rb
 - lib/capybara/result.rb
 - lib/capybara/rspec.rb
+- lib/capybara/rspec/compound.rb
 - lib/capybara/rspec/features.rb
 - lib/capybara/rspec/matcher_proxies.rb
 - lib/capybara/rspec/matchers.rb
 - lib/capybara/selector.rb
 - lib/capybara/selector/css.rb
-- lib/capybara/selector/expression_filter.rb
 - lib/capybara/selector/filter.rb
 - lib/capybara/selector/filter_set.rb
+- lib/capybara/selector/filters/base.rb
+- lib/capybara/selector/filters/expression_filter.rb
+- lib/capybara/selector/filters/node_filter.rb
 - lib/capybara/selector/selector.rb
 - lib/capybara/selenium/driver.rb
 - lib/capybara/selenium/node.rb
@@ -349,6 +354,7 @@ files:
 - lib/capybara/spec/session/accept_confirm_spec.rb
 - lib/capybara/spec/session/accept_prompt_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
 - lib/capybara/spec/session/assert_current_path.rb
 - lib/capybara/spec/session/assert_selector.rb
@@ -396,6 +402,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/refresh_spec.rb
 - lib/capybara/spec/session/reset_session_spec.rb
 - lib/capybara/spec/session/response_code.rb
 - lib/capybara/spec/session/save_and_open_page_spec.rb
@@ -405,6 +412,7 @@ files:
 - lib/capybara/spec/session/screenshot_spec.rb
 - lib/capybara/spec/session/select_spec.rb
 - lib/capybara/spec/session/selectors_spec.rb
+- lib/capybara/spec/session/sibling_spec.rb
 - lib/capybara/spec/session/source_spec.rb
 - lib/capybara/spec/session/text_spec.rb
 - lib/capybara/spec/session/title_spec.rb

data/lib/capybara/selector/expression_filter.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-require 'capybara/selector/filter'
-
-module Capybara
-  class Selector
-    class ExpressionFilter < Filter
-      undef_method :matches?
-
-      def apply_filter(expr, value)
-        return expr if skip?(value)
-
-        if !valid_value?(value)
-          msg = "Invalid value #{value.inspect} passed to expression filter #{@name} - "
-          if default?
-            warn msg + "defaulting to #{default}"
-            value = default
-          else
-            warn msg + "skipping"
-            return expr
-          end
-        end
-
-        @block.call(expr, value)
-      end
-    end
-
-    class IdentityExpressionFilter < ExpressionFilter
-      def initialize
-      end
-
-      def default?
-        false
-      end
-
-      def apply_filter(expr, _value)
-        return expr
-      end
-    end
-  end
-end