capybara 2.13.0 → 2.18.0

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

@@ -76,6 +76,7 @@
 
     <p>
       <a href="#" id="open-alert">Open alert</a>
+      <a href="/with_html" id="alert-page-change">Alert page change</a>
     </p>
 
     <p>
@@ -95,6 +96,10 @@
       <a href="#" id="open-prompt">Open prompt</a>
     </p>
 
+    <p>
+      <a href="#" id="open-prompt-with-default">Open defaulted prompt</a>
+    </p>
+
     <p>
       <input id="disable-on-click"/>
     </p>
@@ -116,6 +121,13 @@
       <input type="file" id="hidden_file" style="opacity:0; display: none;">
     </p>
 
+    <div id="drag_scroll">
+      <p>This is a draggable element.</p>
+    </div>
+    <div id="drop_scroll">
+      <p>It should be dropped here.</p>
+    </div>
+
     <script type="text/javascript">
       // a javascript comment
       var aVar = 123;

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

@@ -46,5 +46,9 @@
     <button id="doesNotOpenWindows">Does not open windows</button>
 
     <iframe src="/frame_one" id="frameOne"></iframe>
+
+    <div id="scope">
+      <span>My scoped content</span>
+    </div>
   </body>
 </html>

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.13.0'
+  VERSION = '2.18.0'
 end

data/lib/capybara/window.rb

@@ -115,7 +115,7 @@ module Capybara
 
     private
 
-    def wait_for_stable_size(seconds=Capybara.default_max_wait_time)
+    def wait_for_stable_size(seconds=session.config.default_max_wait_time)
       res = yield if block_given?
       prev_size = size
       start_time = Capybara::Helpers.monotonic_time

data/lib/capybara.rb

@@ -2,6 +2,8 @@
 require 'timeout'
 require 'nokogiri'
 require 'xpath'
+require 'forwardable'
+require 'capybara/config'
 
 module Capybara
   class CapybaraError < StandardError; end
@@ -19,18 +21,41 @@ module Capybara
   class WindowError < CapybaraError; end
   class ReadOnlyElementError < CapybaraError; end
 
+
   class << self
-    attr_reader :app_host, :default_host
-    attr_accessor :asset_host, :run_server, :always_include_port
-    attr_accessor :server_port, :exact, :match, :exact_options, :visible_text_only, :enable_aria_label
-    attr_accessor :default_selector, :default_max_wait_time, :ignore_hidden_elements
-    attr_accessor :save_path, :wait_on_first_by_default, :automatic_label_click, :automatic_reload
-    attr_reader :reuse_server
-    attr_accessor :raise_server_errors, :server_errors
-    attr_writer :default_driver, :current_driver, :javascript_driver, :session_name, :server_host
-    attr_reader :save_and_open_page_path
-    attr_accessor :exact_text
-    attr_accessor :app
+    extend Forwardable
+
+    # DelegateCapybara global configurations
+    # @!method app
+    #   See {Capybara.configure}
+    # @!method reuse_server
+    #   See {Capybara.configure}
+    # @!method threadsafe
+    #   See {Capybara.configure}
+    # @!method server
+    #   See {Capybara.configure}
+    # @!method default_driver
+    #   See {Capybara.configure}
+    # @!method javascript_driver
+    #   See {Capybara.configure}
+    Config::OPTIONS.each do |method|
+      def_delegators :config, method, "#{method}="
+    end
+
+    # Delegate Capybara global configurations
+    # @!method default_selector
+    #   See {Capybara.configure}
+    # @!method default_max_wait_time
+    #   See {Capybara.configure}
+    # @!method app_host
+    #   See {Capybara.configure}
+    # @!method always_include_port
+    #   See {Capybara.configure}
+    # @!method wait_on_first_by_default
+    #   See {Capybara.configure}
+    SessionConfig::OPTIONS.each do |method|
+      def_delegators :config, method, "#{method}="
+    end
 
     ##
     #
@@ -44,7 +69,7 @@ module Capybara
     # === Configurable options
     #
     # [app_host = String/nil]             The default host to use when giving a relative URL to visit, must be a valid URL e.g. http://www.example.com
-    # [always_include_port = Boolean]     Whether the Rack server's port should automatically be inserted into every visited URL (Default: false)
+    # [always_include_port = Boolean]     Whether the Rack server's port should automatically be inserted into every visited URL unless another port is explicitly specified (Default: false)
     # [asset_host = String]               Where dynamic assets are hosted - will be prepended to relative asset locations if present (Default: nil)
     # [run_server = Boolean]              Whether to start a Rack server for the given Rack app (Default: true)
     # [raise_server_errors = Boolean]     Should errors raised in the server be raised in the tests? (Default: true)
@@ -58,6 +83,9 @@ module Capybara
     # [automatic_label_click = Boolean]   Whether Node#choose, Node#check, Node#uncheck will attempt to click the associated label element if the checkbox/radio button are non-visible (Default: false)
     # [enable_aria_label = Boolean]  Whether fields, links, and buttons will match against aria-label attribute (Default: false)
     # [reuse_server = Boolean]  Reuse the server thread between multiple sessions using the same app object (Default: true)
+    # [threadsafe = Boolean]  Whether sessions can be configured individually (Default: false)
+    # [server = Symbol]  The name of the registered server to use when running the app under test (Default: :webrick)
+    #
     # === DSL Options
     #
     # when using capybara/dsl, the following options are also available:
@@ -66,7 +94,7 @@ module Capybara
     # [javascript_driver = Symbol]        The name of a driver to use for JavaScript enabled tests. (Default: :selenium)
     #
     def configure
-      yield self
+      yield ConfigureDeprecator.new(config)
     end
 
     ##
@@ -141,13 +169,14 @@ module Capybara
     ##
     #
     # Modify a selector previously created by {Capybara.add_selector}.
-    # For example modifying the :button selector to also find divs styled
-    # to look like buttons might look like this
+    # For example, adding a new filter to the :button selector to filter based on
+    # button style (a class) might look like this
     #
     #     Capybara.modify_selector(:button) do
-    #       xpath { |locator| XPath::HTML.button(locator).or(XPath::css('div.btn')[XPath::string.n.is(locator)]) }
+    #       filter (:style, valid_values: [:primary, :secondary]) { |node, style| node[:class].split.include? "btn-#{style}" }
     #     end
     #
+    #
     # @param [Symbol] name    The name of the selector to modify
     # @yield                  A block executed in the context of the existing {Capybara::Selector}
     #
@@ -163,45 +192,6 @@ module Capybara
       @servers ||= {}
     end
 
-    ##
-    #
-    # Register a proc that Capybara will call to run the Rack application.
-    #
-    #     Capybara.server do |app, port, host|
-    #       require 'rack/handler/mongrel'
-    #       Rack::Handler::Mongrel.run(app, :Port => port)
-    #     end
-    #
-    # By default, Capybara will try to run webrick.
-    #
-    # @yield [app, port, host]      This block receives a rack app, port, and host/ip and should run a Rack handler
-    #
-    def server(&block)
-      if block_given?
-        warn "DEPRECATED: Passing a block to Capybara::server is deprecated, please use Capybara::register_server instead"
-        @server = block
-      else
-        @server
-      end
-    end
-
-    ##
-    #
-    # Set the server to use.
-    #
-    #     Capybara.server = :webrick
-    #
-    # @param [Symbol] name     Name of the server type to use
-    # @see register_server
-    #
-    def server=(name)
-      @server = if name.respond_to? :call
-        name
-      else
-        servers[name.to_sym]
-      end
-    end
-
     ##
     #
     # Wraps the given string, which should contain an HTML document or fragment
@@ -251,29 +241,25 @@ module Capybara
       servers[:webrick].call(app, port, server_host)
     end
 
-    ##
-    #
-    # @return [Symbol]    The name of the driver to use by default
-    #
-    def default_driver
-      @default_driver || :rack_test
-    end
-
     ##
     #
     # @return [Symbol]    The name of the driver currently in use
     #
     def current_driver
-      @current_driver || default_driver
+      if threadsafe
+        Thread.current['capybara_current_driver']
+      else
+        @current_driver
+      end || default_driver
     end
     alias_method :mode, :current_driver
 
-    ##
-    #
-    # @return [Symbol]    The name of the driver used when JavaScript is needed
-    #
-    def javascript_driver
-      @javascript_driver || :selenium
+    def current_driver=(name)
+      if threadsafe
+        Thread.current['capybara_current_driver'] = name
+      else
+        @current_driver = name
+      end
     end
 
     ##
@@ -281,7 +267,7 @@ module Capybara
     # Use the default driver as the current driver
     #
     def use_default_driver
-      @current_driver = nil
+      self.current_driver = nil
     end
 
     ##
@@ -293,15 +279,7 @@ module Capybara
       Capybara.current_driver = driver
       yield
     ensure
-      @current_driver = previous_driver
-    end
-
-    ##
-    #
-    # @return [String]    The IP address bound by default server
-    #
-    def server_host
-      @server_host || '127.0.0.1'
+      self.current_driver = previous_driver
     end
 
     ##
@@ -344,7 +322,19 @@ module Capybara
     # @return [Symbol]    The name of the currently used session.
     #
     def session_name
-      @session_name ||= :default
+      if threadsafe
+        Thread.current['capybara_session_name'] ||= :default
+      else
+        @session_name ||= :default
+      end
+    end
+
+    def session_name=(name)
+      if threadsafe
+        Thread.current['capybara_session_name'] = name
+      else
+        @session_name = name
+      end
     end
 
     ##
@@ -352,11 +342,19 @@ module Capybara
     # Yield a block using a specific session name.
     #
     def using_session(name)
-      previous_session_name = self.session_name
+      previous_session_info = {
+        session_name: session_name,
+        current_driver: current_driver,
+        app: app
+      }
       self.session_name = name
       yield
     ensure
-      self.session_name = previous_session_name
+      self.session_name = previous_session_info[:session_name]
+      if threadsafe
+        self.current_driver = previous_session_info[:current_driver]
+        self.app = previous_session_info[:app]
+      end
     end
 
     ##
@@ -374,32 +372,8 @@ module Capybara
       end
     end
 
-    # @deprecated Use default_max_wait_time instead
-    def default_wait_time
-      deprecate('default_wait_time', 'default_max_wait_time', true)
-      default_max_wait_time
-    end
-
-    # @deprecated Use default_max_wait_time= instead
-    def default_wait_time=(t)
-      deprecate('default_wait_time=', 'default_max_wait_time=')
-      self.default_max_wait_time = t
-    end
-
-    def save_and_open_page_path=(path)
-      warn "DEPRECATED: #save_and_open_page_path is deprecated, please use #save_path instead. \n"\
-           "Note: Behavior is slightly different with relative paths - see documentation" unless path.nil?
-      @save_and_open_page_path = path
-    end
-
-    def app_host=(url)
-      raise ArgumentError.new("Capybara.app_host should be set to a url (http://www.example.com)") unless url.nil? || (url =~ URI::Parser.new.make_regexp)
-      @app_host = url
-    end
-
-    def default_host=(url)
-      raise ArgumentError.new("Capybara.default_host should be set to a url (http://www.example.com)") unless url.nil? || (url =~ URI::Parser.new.make_regexp)
-      @default_host = url
+    def session_options
+      config.session_options
     end
 
     def included(base)
@@ -407,18 +381,10 @@ module Capybara
       warn "`include Capybara` is deprecated. Please use `include Capybara::DSL` instead."
     end
 
-    def reuse_server=(bool)
-      warn "Capybara.reuse_server == false is a BETA feature and may change in a future version" unless bool
-      @reuse_server = bool
-    end
-
-    def deprecate(method, alternate_method, once=false)
-      @deprecation_notified ||= {}
-      warn "DEPRECATED: ##{method} is deprecated, please use ##{alternate_method} instead" unless once and @deprecation_notified[method]
-      @deprecation_notified[method]=true
-    end
-
   private
+    def config
+      @config ||= Capybara::Config.new
+    end
 
     def session_pool
       @session_pool ||= {}
@@ -447,6 +413,8 @@ module Capybara
   require 'capybara/queries/title_query'
   require 'capybara/queries/current_path_query'
   require 'capybara/queries/match_query'
+  require 'capybara/queries/ancestor_query'
+  require 'capybara/queries/sibling_query'
   require 'capybara/query'
 
   require 'capybara/node/finders'
@@ -475,14 +443,14 @@ Capybara.register_server :default do |app, port, _host|
   Capybara.run_default_server(app, port)
 end
 
-Capybara.register_server :webrick do |app, port, host|
+Capybara.register_server :webrick do |app, port, host, options={}|
   require 'rack/handler/webrick'
-  Rack::Handler::WEBrick.run(app, Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0))
+  Rack::Handler::WEBrick.run(app, {Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0)}.merge(options))
 end
 
-Capybara.register_server :puma do |app, port, host|
+Capybara.register_server :puma do |app, port, host, options={}|
   require 'rack/handler/puma'
-  Rack::Handler::Puma.run(app, Host: host, Port: port, Threads: "0:4")
+  Rack::Handler::Puma.run(app, {Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false}.merge(options))
 end
 
 Capybara.configure do |config|
@@ -514,3 +482,13 @@ Capybara.register_driver :selenium do |app|
   Capybara::Selenium::Driver.new(app)
 end
 
+Capybara.register_driver :selenium_chrome do |app|
+  Capybara::Selenium::Driver.new(app, :browser => :chrome)
+end
+
+Capybara.register_driver :selenium_chrome_headless do |app|
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new()
+  browser_options.args << '--headless'
+  browser_options.args << '--disable-gpu'
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
+end

data/spec/capybara_spec.rb

@@ -14,8 +14,8 @@ RSpec.describe Capybara do
     end
 
     it "should be accesible as the deprecated default_wait_time" do
-      expect(Capybara).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time= is deprecated, please use #default_max_wait_time= instead')
-      expect(Capybara).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time is deprecated, please use #default_max_wait_time instead')
+      expect(Capybara.send(:config)).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time= is deprecated, please use #default_max_wait_time= instead')
+      expect(Capybara.send(:config)).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time is deprecated, please use #default_max_wait_time instead')
       @previous_default_time = Capybara.default_max_wait_time
       Capybara.default_wait_time = 5
       expect(Capybara.default_wait_time).to eq(5)
@@ -35,27 +35,13 @@ RSpec.describe Capybara do
   end
 
   describe '.register_server' do
-    before do
-      Capybara.reuse_server = false
-      @old_server = Capybara.server
-    end
-
-    after do
-      Capybara.server(&@old_server)
-      Capybara.reuse_server = true
-    end
-
     it "should add a new server" do
-      skip "JRuby fails this because of path issues to geckodriver I think. Its tested in other runs - not worth figuring out at this time" if RUBY_PLATFORM == 'java'
-
-      require 'rack/handler/webrick'
+      handler = double("handler")
       Capybara.register_server :blob do |app, port, host|
-        Rack::Handler::WEBrick.run(app, Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0))
+        handler.run
       end
-      Capybara.server = :blob
-      session = Capybara::Session.new(:selenium, TestApp.new)
-      session.visit('/')
-      expect(session.body).to include("Hello world!")
+
+      expect(Capybara.servers).to have_key(:blob)
     end
   end
 
@@ -79,6 +65,30 @@ RSpec.describe Capybara do
       Capybara.server(&server)
       expect(Capybara.server).to eq(server)
     end
+
+    it "should have :webrick registered" do
+      require 'rack/handler/webrick'
+      mock_app = double('app')
+      Capybara.server = :webrick
+      expect(Rack::Handler::WEBrick).to receive(:run)
+      Capybara.server.call(mock_app, 8000)
+    end
+
+    it "should have :puma registered" do
+      require 'rack/handler/puma'
+      mock_app = double('app')
+      Capybara.server = :puma
+      expect(Rack::Handler::Puma).to receive(:run).with(mock_app, hash_including(Host: nil, Port: 8000))
+      Capybara.server.call(mock_app, 8000)
+    end
+
+    it "should pass options to server" do
+      require 'rack/handler/puma'
+      mock_app = double('app')
+      Capybara.server = :puma, { Silent: true }
+      expect(Rack::Handler::Puma).to receive(:run).with(mock_app, hash_including(Host: nil, Port: 9000, Silent: true))
+      Capybara.server.call(mock_app, 9000)
+    end
   end
 
   describe 'app_host' do
@@ -114,10 +124,22 @@ RSpec.describe Capybara do
       expect { Capybara.default_host = "http://www.example.com" }.not_to raise_error
     end
   end
+
+  describe "configure" do
+    it 'deprecates calling non configuration option methods in configure' do
+      expect_any_instance_of(Kernel).to receive(:warn).
+        with('Calling register_driver from Capybara.configure is deprecated - please call it on Capybara directly ( Capybara.register_driver(...) )')
+      Capybara.configure do |config|
+        config.register_driver(:random_name) do
+          #just a random block
+        end
+      end
+    end
+  end
 end
 
 RSpec.describe Capybara::Session do
-  context 'with non-existant driver' do
+  context 'with nonexistent driver' do
     it "should raise an error" do
       expect {
         Capybara::Session.new(:quox, TestApp).driver

data/spec/dsl_spec.rb

@@ -16,6 +16,7 @@ Capybara::SpecHelper.run_specs TestClass.new, "DSL", capybara_skip: [
   :server,
   :hover,
   :about_scheme,
+  :psc
 ]
 
 RSpec.describe Capybara::DSL do

data/spec/filter_set_spec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Capybara::Selector::FilterSet do
+  after do
+    Capybara::Selector::FilterSet.remove(:test)
+  end
+
+  it "allows node filters" do
+    fs = Capybara::Selector::FilterSet.add(:test) do
+      filter(:node_test, :boolean) { |node, value| true }
+      expression_filter(:expression_test, :boolean) { |expr, value| true }
+    end
+
+    expect(fs.node_filters.keys).to include(:node_test)
+    expect(fs.node_filters.keys).not_to include(:expression_test)
+  end
+
+  it "allows expression filters" do
+    fs = Capybara::Selector::FilterSet.add(:test) do
+      filter(:node_test, :boolean) { |node, value| true }
+      expression_filter(:expression_test, :boolean) { |expr, value| true }
+    end
+
+    expect(fs.expression_filters.keys).to include(:expression_test)
+    expect(fs.expression_filters.keys).not_to include(:node_test)
+  end
+end

data/spec/minitest_spec.rb

@@ -88,6 +88,14 @@ class MinitestTest < Minitest::Test
     refute_table('not_on_form')
   end
 
+  def test_assert_all_of_selectors
+    assert_all_of_selectors(:css, 'select#form_other_title', 'input#form_last_name')
+  end
+
+  def test_assert_none_of_selectors
+    assert_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
+  end
+
   def test_assert_matches_selector
     assert_matches_selector(find(:field, 'customer_email'), :field, 'customer_email')
     assert_not_matches_selector(find(:select, 'form_title'), :field, 'customer_email')
@@ -117,6 +125,6 @@ RSpec.describe 'capybara/minitest' do
     reporter.start
     MinitestTest.run reporter, {}
     reporter.report
-    expect(output.string).to include("15 runs, 42 assertions, 0 failures, 0 errors, 0 skips")
+    expect(output.string).to include("17 runs, 44 assertions, 0 failures, 0 errors, 0 skips")
   end
 end

data/spec/minitest_spec_spec.rb

@@ -37,10 +37,10 @@ class MinitestSpecTest < Minitest::Spec
     page.must_have_xpath('.//input[@id="customer_email"]')
     page.wont_have_xpath('.//select[@id="not_form_title"]')
     page.wont_have_xpath('.//input[@id="customer_email"]') { |el| el[:id] == "not_customer_email" }
-    el = find(:select, 'form_title')
-    el.must_have_xpath('.//option[@class="title"]')
-    el.must_have_xpath('.//option', count: 1) { |el| el[:class] != 'title' && !el.disabled?}
-    el.wont_have_xpath('.//input[@id="customer_email"]')
+    select = find(:select, 'form_title')
+    select.must_have_xpath('.//option[@class="title"]')
+    select.must_have_xpath('.//option', count: 1) { |option| option[:class] != 'title' && !option.disabled?}
+    select.wont_have_xpath('.//input[@id="customer_email"]')
   end
 
   it "support css expectations" do
@@ -88,6 +88,14 @@ class MinitestSpecTest < Minitest::Spec
     page.wont_have_table('not_on_form')
   end
 
+  it "supports all_of_selectors expectations" do
+    page.must_have_all_of_selectors(:css, 'select#form_other_title', 'input#form_last_name')
+  end
+
+  it "supports none_of_selectors expectations" do
+    page.must_have_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
+  end
+
   it "supports match_selector expectations" do
     find(:field, 'customer_email').must_match_selector(:field, 'customer_email')
     find(:select, 'form_title').wont_match_selector(:field, 'customer_email')
@@ -102,6 +110,10 @@ class MinitestSpecTest < Minitest::Spec
     find(:select, 'form_title').must_match_xpath('.//select[@id="form_title"]')
     find(:select, 'form_title').wont_match_xpath('.//select[@id="not_on_page"]')
   end
+
+  it "handles failures" do
+    page.must_have_select('non_existing_form_title')
+  end
 end
 
 RSpec.describe 'capybara/minitest/spec' do
@@ -116,6 +128,8 @@ RSpec.describe 'capybara/minitest/spec' do
     reporter.start
     MinitestSpecTest.run reporter, {}
     reporter.report
-    expect(output.string).to include("15 runs, 38 assertions, 0 failures, 0 errors, 0 skips")
+    expect(output.string).to include("18 runs, 41 assertions, 1 failures, 0 errors, 0 skips")
+    #Make sure error messages are displayed
+    expect(output.string).to include('expected to find visible select box "non_existing_form_title" that is not disabled but there were no matches')
   end
 end