capybara 2.6.0 → 2.7.0

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

@@ -1,7 +1,8 @@
+<%# frozen_string_literal: true %>
 <h1>This page is used for testing number options of has_text?</h1>
 
 <p>count1</p>
 <div>
   <p>2 count</p>
   <p>Count</p>
-</div>
+</div>

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
@@ -14,4 +15,4 @@
       <div class="hidden_until_hover">Here I am</div>
     </div>
   </body>
-</html>
+</html>

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <div id="referrer"><%= referrer %></div>
 <h1>This is a test</h1>
 
@@ -10,6 +11,7 @@
 <h2 class="head">Header Class Test Five</h2>
 
 <span class="number">42</span>
+<span>Other span</span>
 
 <p class="para" id="first">
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
@@ -109,6 +111,7 @@ banana</textarea>
 </div>
 
 <input type="text" disabled="disabled" name="disabled_text" value="This is disabled"/>
+<input type="hidden" id="hidden_input" name="hidden_input" value="This is a hidden input"/>
 
 <div>
   <a id="link_placeholder">No href</a>

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

@@ -1 +1,2 @@
+<%# frozen_string_literal: true %>
 Encoding with &mdash; html entities &raquo;

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
@@ -93,6 +94,10 @@
       <a href="#" id="open-prompt">Open prompt</a>
     </p>
 
+    <p>
+      <input id="disable-on-click"/>
+    </p>
+
     <p>
       <a href="#" id="delayed-page-change">Change page</a>
       <a href="/with_html?options[]=things">Non-escaped query options</a>

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <h1>This page is used for testing various scopes</h1>
 
 <p id="for_foo">

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

@@ -1 +1,2 @@
-Bar
+<%# frozen_string_literal: true %>
+Bar

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

@@ -0,0 +1,17 @@
+<html>
+<head>
+  <script>
+    function delay_unload() {
+      var start = new Date();
+      var i = 0;
+      while ((new Date()) - start < 1000){ i = i + 1; };
+      return null;
+    }
+    window.onbeforeunload = delay_unload;
+    window.onunload = delay_unload;
+  </script>
+</head>
+<body>
+  <div>This delays unload by 2 seconds</div>
+</body>
+</html>

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

@@ -1,4 +1,5 @@
+<%# frozen_string_literal: true %>
 <title>Test Title</title>
 <body>
   <svg><title>abcdefg</title></svg>
-</body>
+</body>

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

@@ -0,0 +1,12 @@
+<html>
+<head>
+  <script>
+      window.onbeforeunload = function(e) {
+        return 'Unload?';
+      };
+  </script>
+</head>
+<body>
+  <div>This triggers an alert on unload</div>
+</body>
+</html>

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html>
   <head>
     <title>With Windows</title>

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

@@ -1,3 +1,4 @@
+<%# frozen_string_literal: true %>
 <html>
     <head>
         <title>With Frames</title>
@@ -8,4 +9,4 @@
     <iframe src="/frame_two" id="frameTwo"></iframe>
     <iframe src="/frame_parent" id="parentFrame"></iframe>
     </body>
-</html>
+</html>

data/lib/capybara/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
-  VERSION = '2.6.0'
+  VERSION = '2.7.0'
 end

data/lib/capybara/window.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Capybara
   ##
   # The Window class represents a browser window.

data/lib/capybara.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'timeout'
 require 'nokogiri'
 require 'xpath'
@@ -22,8 +23,10 @@ module Capybara
     attr_accessor :asset_host, :app_host, :run_server, :default_host, :always_include_port
     attr_accessor :server_port, :exact, :match, :exact_options, :visible_text_only
     attr_accessor :default_selector, :default_max_wait_time, :ignore_hidden_elements
-    attr_accessor :save_and_open_page_path, :wait_on_first_by_default, :automatic_reload, :raise_server_errors, :server_errors
+    attr_accessor :save_path, :wait_on_first_by_default, :automatic_reload
+    attr_accessor :reuse_server, :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 :app
 
     ##
@@ -47,8 +50,9 @@ module Capybara
     # [default_max_wait_time = Numeric]   The maximum number of seconds to wait for asynchronous processes to finish (Default: 2)
     # [ignore_hidden_elements = Boolean]  Whether to ignore hidden elements on the page (Default: true)
     # [automatic_reload = Boolean]        Whether to automatically reload elements as Capybara is waiting (Default: true)
-    # [save_and_open_page_path = String]  Where to put pages saved through save_and_open_page (Default: Dir.pwd)
+    # [save_path = String]  Where to put pages saved through save_(page|screenshot), save_and_open_(page|screenshot) (Default: Dir.pwd)
     # [wait_on_first_by_default = Boolean]   Whether Node#first defaults to Capybara waiting behavior for at least 1 element to match (Default: false)
+    # [reuse_server = Boolean]  Reuse the server thread between multiple sessions using the same app object (Default: true)
     # === DSL Options
     #
     # when using capybara/dsl, the following options are also available:
@@ -77,6 +81,26 @@ module Capybara
       drivers[name] = block
     end
 
+    ##
+    #
+    # Register a new server for Capybara.
+    #
+    #     Capybara.register_server :webrick do |app, port, host|
+    #       require 'rack/handler/webrick'
+    #       Rack::Handler::WEBrick.run(app, ...)
+    #     end
+    #
+    # @param [Symbol] name                    The name of the new driver
+    # @yield [app, port, host]                This block takes a rack app and a port and returns a rack server listening on that port
+    # @yieldparam [<Rack>] app                The rack application that this server will contain.
+    # @yieldparam port                        The port number the server should listen on
+    # @yieldparam host                        The host/ip to bind to
+    # @yieldreturn [Capybara::Driver::Base]   A Capybara driver instance
+    #
+    def register_server(name, &block)
+      servers[name.to_sym] = block
+    end
+
     ##
     #
     # Add a new selector to Capybara. Selectors can be used by various methods in Capybara
@@ -111,11 +135,11 @@ module Capybara
 
     ##
     #
-    # Modify a selector previously craeated by {Capybara.add_selector}.
+    # 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
     #
-    #     Capybara.modfiy_selector(:button) do
+    #     Capybara.modify_selector(:button) do
     #       xpath { |locator| XPath::HTML.button(locator).or(XPath::css('div.btn')[XPath::string.n.is(locator)]) }
     #     end
     #
@@ -130,27 +154,49 @@ module Capybara
       @drivers ||= {}
     end
 
+    def servers
+      @servers ||= {}
+    end
+
     ##
     #
     # Register a proc that Capybara will call to run the Rack application.
     #
-    #     Capybara.server do |app, port|
+    #     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]                      This block receives a rack app and port and should run a Rack handler
+    # @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
@@ -197,8 +243,7 @@ module Capybara
     # @param [Fixnum] port              The port to run the application on
     #
     def run_default_server(app, port)
-      require 'rack/handler/webrick'
-      Rack::Handler::WEBrick.run(app, :Host => server_host, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+      servers[:webrick].call(app, port, server_host)
     end
 
     ##
@@ -335,11 +380,22 @@ module Capybara
       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 included(base)
       base.send(:include, Capybara::DSL)
       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]
@@ -370,10 +426,12 @@ module Capybara
   require 'capybara/version'
 
   require 'capybara/queries/base_query'
-  require 'capybara/query'
+  require 'capybara/queries/selector_query'
   require 'capybara/queries/text_query'
   require 'capybara/queries/title_query'
   require 'capybara/queries/current_path_query'
+  require 'capybara/queries/match_query'
+  require 'capybara/query'
 
   require 'capybara/node/finders'
   require 'capybara/node/matchers'
@@ -397,10 +455,26 @@ module Capybara
   require 'capybara/selenium/driver'
 end
 
+Capybara.register_server :default do |app, port, host|
+  Capybara.run_default_server(app, port)
+end
+
+Capybara.register_server :webrick do |app, port, host|
+  require 'rack/handler/webrick'
+  Rack::Handler::WEBrick.run(app, :Host => host, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+end
+
+Capybara.register_server :puma do |app, port, host|
+  require 'puma'
+  Puma::Server.new(app).tap do |s|
+    s.add_tcp_listener host, port
+  end.run.join
+end
+
 Capybara.configure do |config|
   config.always_include_port = false
   config.run_server = true
-  config.server {|app, port| Capybara.run_default_server(app, port)}
+  config.server = :default
   config.default_selector = :css
   config.default_max_wait_time = 2
   config.ignore_hidden_elements = true
@@ -412,6 +486,7 @@ Capybara.configure do |config|
   config.server_errors = [StandardError]
   config.visible_text_only = false
   config.wait_on_first_by_default = false
+  config.reuse_server = true
 end
 
 Capybara.register_driver :rack_test do |app|
@@ -421,3 +496,4 @@ end
 Capybara.register_driver :selenium do |app|
   Capybara::Selenium::Driver.new(app)
 end
+

data/spec/basic_node_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe Capybara do

data/spec/capybara_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe Capybara do
@@ -33,9 +34,35 @@ RSpec.describe Capybara do
     end
   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
+      Capybara.register_server :blob do |app, port, host|
+        Rack::Handler::WEBrick.run(app, :Host => host, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+      end
+      Capybara.server = :blob
+      session = Capybara::Session.new(:selenium, TestApp.dup)
+      session.visit('/')
+      expect(session.body).to include("Hello world!")
+    end
+  end
+
   describe ".server" do
+    before do
+      @old_server = Capybara.server
+    end
+
     after do
-      Capybara.server {|app, port| Capybara.run_default_server(app, port)}
+      Capybara.server(&@old_server)
     end
 
     it "should default to a proc that calls run_default_server" do

data/spec/dsl_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'capybara/dsl'
 

data/spec/fixtures/selenium_driver_rspec_failure.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe Capybara::Selenium::Driver do

data/spec/fixtures/selenium_driver_rspec_success.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe Capybara::Selenium::Driver do

data/spec/rack_test_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 module TestSessions

data/spec/result_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe Capybara::Result do

data/spec/rspec/features_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'capybara/rspec'
 

data/spec/rspec/matchers_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'capybara/dsl'
 require 'capybara/rspec/matchers'

data/spec/rspec/scenarios_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'capybara/rspec'
 

data/spec/rspec/views_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe "capybara/rspec", type: :view do

data/spec/rspec_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe 'capybara/rspec', :type => :feature do

data/spec/selector_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe Capybara do
@@ -17,6 +18,20 @@ RSpec.describe Capybara do
               <p class="b">Some Content</p>
               <p class="b"></p>
             </div>
+            <input type="checkbox"/>
+            <input type="radio"/>
+            <input type="text"/>
+            <input type="file"/>
+            <a href="#">link</a>
+            <fieldset></fieldset>
+            <select>
+              <option value="a">A</option>
+              <option value="b" disabled>B</option>
+              <option value="c" selected>C</option>
+            </select>
+            <table>
+              <tr><td></td></tr>
+            </table
           </body>
         </html>
       STRING
@@ -29,7 +44,7 @@ RSpec.describe Capybara do
       end
     end
 
-    describe "modfiy_selector" do
+    describe "modify_selector" do
       it "allows modifying a selector" do
         el = string.find(:custom_selector, 'a')
         expect(el.tag_name).to eq 'div'
@@ -49,5 +64,44 @@ RSpec.describe Capybara do
         expect(string).to have_selector(:custom_selector, 'b', not_empty: :all, count: 2)
       end
     end
+
+    describe "builtin selectors" do
+      context "when locator is nil" do
+        it "devolves to just finding element types" do
+          selectors = {
+            field: ".//*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]",
+            fieldset: ".//fieldset",
+            link: ".//a[./@href]",
+            link_or_button: ".//a[./@href] | .//input[./@type = 'submit' or ./@type = 'reset' or ./@type = 'image' or ./@type = 'button'] | .//button" ,
+            fillable_field: ".//*[self::input | self::textarea][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'radio' or ./@type = 'checkbox' or ./@type = 'hidden' or ./@type = 'file')]",
+            radio_button: ".//input[./@type = 'radio']",
+            checkbox: ".//input[./@type = 'checkbox']",
+            select: ".//select",
+            option: ".//option",
+            file_field: ".//input[./@type = 'file']",
+            table: ".//table"
+          }
+          selectors.each do |selector, xpath|
+            results = string.all(selector,nil).to_a.map &:native
+            expect(results.size).to be > 0
+            expect(results).to eq string.all(:xpath, xpath).to_a.map(&:native)
+          end
+        end
+      end
+
+      describe ":option selector" do
+        it "finds disabled options" do
+          expect(string.find(:option, disabled: true).value).to eq 'b'
+        end
+
+        it "finds selected options" do
+          expect(string.find(:option, selected: true).value).to eq 'c'
+        end
+
+        it "finds not selected and not disabled options" do
+          expect(string.find(:option, disabled: false, selected: false).value).to eq 'a'
+        end
+      end
+    end
   end
 end

data/spec/selenium_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require "selenium-webdriver"
 
@@ -11,11 +12,14 @@ module TestSessions
   Selenium = Capybara::Session.new(:selenium_focus, TestApp)
 end
 
-Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :capybara_skip => [
+skipped_tests = [
   :response_headers,
   :status_code,
   :trigger
 ]
+skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
+
+Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :capybara_skip => skipped_tests
 
 RSpec.describe Capybara::Session do
   context 'with selenium driver' do
@@ -110,7 +114,7 @@ RSpec.describe Capybara::Session do
     end
 
     context "#fill_in with { clear: Array } fill_options" do
-      it 'should pass the array through to the element', tw: true do
+      it 'should pass the array through to the element' do
         #this is mainly for use with [[:ctrl, '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',

data/spec/selenium_spec_chrome.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'selenium-webdriver'