capybara 2.15.1 → 2.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eff01a08419c2e76c521c460193065f256f6fe4
-  data.tar.gz: 588eeea7fc4088e2e470bd4d573056be00782248
+  metadata.gz: 4eb9fd96f4bd71cd4b6f610b7dae3d0b6da6fe21
+  data.tar.gz: 615cf0e0fb68f9d6792338470bdd9dd277c4c673
 SHA512:
-  metadata.gz: 1281d86fc6e0ff8533bc4e9d0232adf51b9ce7c33a48a9eba5842e2b24271dbf909efab1c80e9b14ca7ca6861bc1f489d0cb094cce0f8d822f3a387f60c6672f
-  data.tar.gz: d713cafa706d2ddbd23dc05524128fff444a2040d602d8352b23acd0e718c8bb2a844ca36a72d2decc7aa1016aaa8cd75d579754457d5260add9aa797d536c6a
+  metadata.gz: 48a0d0f5c133fbfd57a424410943830b1ce28cfe21784b4e085f9a2cfcf0f6bf207dca0cda824875a140aaf103d54c6e76ed3f821fe3700e33348bf1aaca9e22
+  data.tar.gz: a9b0cbed365316d646d66cce8c11912631bd9c2214e90eea6d81ebec289cec5e5a66428a57a6e85d68ee936e1a9570193fc7982b85e5bb89ac5461812523d631

data/History.md

@@ -1,3 +1,13 @@
+# Version 2.15.2
+Release date: 2017-10-02
+
+### Fixed
+
+*  Include within scope description in element not found/ambiguous errors [Thomas Walpole]
+*  Raise error when no activation block is passed to modal methods if using headless chrome [Thomas Walpole]
+*  Don't retry element access when inspecting [Ivan Neverov]
+*  Don't override a specified port (even if it is default port) in visited url [Thomas Walpole]
+
 # Version 2.15.1
 
 Release date: 2017-08-04

data/README.md

@@ -10,6 +10,12 @@ interact with your app. It is agnostic about the driver running your tests and
 comes with Rack::Test and Selenium support built in. WebKit is supported
 through an external gem.
 
+## Support Capybara
+
+If you and/or your company find value in Capybara and would like to contribute financially to its ongoing maintenance and development, please visit
+<a href="https://www.patreon.com/capybara">Patreon</a>
+
+
 **Need help?** Ask on the mailing list (please do not open an issue on
 GitHub): http://groups.google.com/group/ruby-capybara
 

data/lib/capybara/minitest.rb

@@ -215,7 +215,7 @@ module Capybara
       # Assertion that there is no checked_field
       #
       # @!method assert_no_checked_field
-      # @!method refute_chceked_field
+      # @!method refute_checked_field
 
       ##
       # Assertion that there is unchecked_field

data/lib/capybara/node/element.rb

@@ -371,9 +371,9 @@ module Capybara
       end
 
       def inspect
-        %(#<Capybara::Node::Element tag="#{tag_name}" path="#{path}">)
+        %(#<Capybara::Node::Element tag="#{base.tag_name}" path="#{base.path}">)
       rescue NotSupportedByDriverError
-        %(#<Capybara::Node::Element tag="#{tag_name}">)
+        %(#<Capybara::Node::Element tag="#{base.tag_name}">)
       rescue => e
         if session.driver.invalid_element_errors.any? { |et| e.is_a?(et)}
           %(Obsolete #<Capybara::Node::Element>)

data/lib/capybara/node/finders.rb

@@ -306,6 +306,7 @@ module Capybara
           else
             result = query.resolve_for(self)
           end
+
           if query.match == :one or query.match == :smart and result.size > 1
             raise Capybara::Ambiguous.new("Ambiguous match, found #{result.size} elements matching #{query.description}")
           end

data/lib/capybara/queries/ancestor_query.rb

@@ -4,7 +4,7 @@ module Capybara
     class AncestorQuery < MatchQuery
       # @api private
       def resolve_for(node, exact = nil)
-        @resolved_node = node
+        @child_node = node
         node.synchronize do
           match_results = super(node.session.current_scope, exact)
           node.all(:xpath, XPath.ancestor) do |el|
@@ -15,7 +15,7 @@ module Capybara
 
       def description
         desc = super
-        if @resolved_node && (child_query = @resolved_node.instance_variable_get(:@query))
+        if @child_node && (child_query = @child_node.instance_variable_get(:@query))
           desc += " that is an ancestor of #{child_query.description}"
         end
         desc

data/lib/capybara/queries/selector_query.rb

@@ -8,6 +8,7 @@ module Capybara
       VALID_MATCH = [:first, :smart, :prefer_exact, :one]
 
       def initialize(*args, &filter_block)
+        @resolved_node = nil
         @options = if args.last.is_a?(Hash) then args.pop.dup else {} end
         super(@options)
 
@@ -53,6 +54,7 @@ module Capybara
         @description << " with classes [#{Array(options[:class]).join(',')}]" if options[:class]
         @description << selector.description(options)
         @description << " that also matches the custom filter block" if @filter_block
+        @description << " within #{@resolved_node.inspect}" if describe_within?
         @description
       end
 
@@ -140,6 +142,7 @@ module Capybara
 
       # @api private
       def resolve_for(node, exact = nil)
+        @resolved_node = node
         node.synchronize do
           children = if selector.format == :css
             node.find_css(self.css)
@@ -239,6 +242,11 @@ module Capybara
       def exact_text
         options.fetch(:exact_text, session_options.exact_text)
       end
+
+      def describe_within?
+        @resolved_node && !(@resolved_node.is_a?(::Capybara::Node::Document) ||
+                            (@resolved_node.is_a?(::Capybara::Node::Simple) && @resolved_node.path == '/'))
+      end
     end
   end
 end

data/lib/capybara/queries/sibling_query.rb

@@ -4,7 +4,7 @@ module Capybara
     class SiblingQuery < MatchQuery
       # @api private
       def resolve_for(node, exact = nil)
-        @resolved_node = node
+        @sibling_node = node
         node.synchronize do
           match_results = super(node.session.current_scope, exact)
           node.all(:xpath, XPath.preceding_sibling.union(XPath.following_sibling)) do |el|
@@ -15,8 +15,8 @@ module Capybara
 
       def description
         desc = super
-        if @resolved_node && (child_query = @resolved_node.instance_variable_get(:@query))
-          desc += " that is a sibling of #{child_query.description}"
+        if @sibling_node && (sibling_query = @sibling_node.instance_variable_get(:@query))
+          desc += " that is a sibling of #{sibling_query.description}"
         end
         desc
       end

data/lib/capybara/selenium/driver.rb

@@ -245,8 +245,9 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   def accept_modal(_type, options={})
     if headless_chrome?
+      raise ArgumentError, "Block that triggers the system modal is missing" unless block_given?
       insert_modal_handlers(true, options[:with], options[:text])
-      yield if block_given?
+      yield
       find_headless_modal(options)
     else
       yield if block_given?
@@ -260,8 +261,9 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   def dismiss_modal(_type, options={})
     if headless_chrome?
+      raise ArgumentError, "Block that triggers the system modal is missing" unless block_given?
       insert_modal_handlers(false, options[:with], options[:text])
-      yield if block_given?
+      yield
       find_headless_modal(options)
     else
       yield if block_given?

data/lib/capybara/selenium/node.rb

@@ -209,7 +209,7 @@ private
   def set_text(value, options)
     if readonly?
       warn "Attempt to set readonly element with value: #{value} \n *This will raise an exception in a future version of Capybara"
-    elsif value.to_s.empty?
+    elsif value.to_s.empty? && options[:clear].nil?
       native.clear
     else
       if options[:clear] == :backspace

data/lib/capybara/session.rb

@@ -247,15 +247,16 @@ module Capybara
       raise_server_error!
       @touched = true
 
-      visit_uri = URI.parse(visit_uri.to_s)
+      visit_uri = ::Addressable::URI.parse(visit_uri.to_s)
 
       uri_base = if @server
-        visit_uri.port = @server.port if config.always_include_port && (visit_uri.port == visit_uri.default_port)
-        URI.parse(config.app_host || "http://#{@server.host}:#{@server.port}")
+        ::Addressable::URI.parse(config.app_host || "http://#{@server.host}:#{@server.port}")
       else
-        config.app_host && URI.parse(config.app_host)
+        config.app_host && ::Addressable::URI.parse(config.app_host)
       end
 
+      uri_base.port ||= @server.port if @server && config.always_include_port
+
       # TODO - this is only for compatability with previous 2.x behavior that concatenated
       # Capybara.app_host and a "relative" path - Consider removing in 3.0
       # @abotalov brought up a good point about this behavior potentially being useful to people
@@ -264,7 +265,9 @@ module Capybara
         visit_uri.path = uri_base.path + visit_uri.path
       end
 
-      visit_uri = uri_base.merge(visit_uri) unless uri_base.nil?
+      if uri_base && [nil, 'http', 'https'].include?(visit_uri.scheme)
+        visit_uri = uri_base.merge(visit_uri.to_hash.delete_if { |k,v| v.nil? })
+      end
 
       driver.visit(visit_uri.to_s)
     end
@@ -640,13 +643,22 @@ module Capybara
     # Execute the block, accepting a alert.
     #
     # @!macro modal_params
+    #   Expects a block whose actions will trigger the display modal to appear
+    #   @example
+    #     $0 do
+    #       click_link('link that triggers appearance of system modal')
+    #     end
     #   @overload $0(text, options = {}, &blk)
     #     @param text [String, Regexp]  Text or regex to match against the text in the modal.  If not provided any modal is matched
+    #     @option options [Numeric] :wait (Capybara.default_max_wait_time) Maximum time to wait for the modal to appear after executing the block.
+    #     @yield Block whose actions will trigger the system modal
     #   @overload $0(options = {}, &blk)
-    #   @option options [Numeric] :wait (Capybara.default_max_wait_time) Maximum time to wait for the modal to appear after executing the block.
+    #     @option options [Numeric] :wait (Capybara.default_max_wait_time) Maximum time to wait for the modal to appear after executing the block.
+    #     @yield Block whose actions will trigger the system modal
     #   @return [String]  the message shown in the modal
     #   @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
     #
+    #
     def accept_alert(text_or_options=nil, options={}, &blk)
       accept_modal(:alert, text_or_options, options, &blk)
     end

data/lib/capybara/spec/public/test.js

@@ -37,6 +37,9 @@ $(function() {
   $('#with_change_event').change(function() {
     $('body').append($('<p class="change_event_triggered"></p>').text(this.value));
   });
+  $('#with_change_event').on('input', function() {
+    $('body').append($('<p class="input_event_triggered"></p>').text(this.value));
+  });
   $('#checkbox_with_event').click(function() {
     $('body').append('<p id="checkbox_event_triggered">Checkbox event triggered</p>');
   });

data/lib/capybara/spec/session/current_url_spec.rb

@@ -3,7 +3,7 @@ require "capybara/spec/test_app"
 
 Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
   before :all do
-    @servers = 2.times.map { Capybara::Server.new(TestApp.clone).boot }
+    @servers = 2.times.map { Capybara::Server.new(TestApp.new).boot }
     # sanity check
     expect(@servers[0].port).not_to eq(@servers[1].port)
     expect(@servers.map { |s| s.port }).not_to include 80
@@ -98,9 +98,9 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
   end
 
   it "doesn't raise exception on a nil current_url" do
+    skip "Only makes sense when there is a real driver" unless @session.respond_to?(:driver)
+    allow(@session.driver).to receive(:current_url) { nil }
     @session.visit("/")
-    allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
-
     expect { @session.current_url }.not_to raise_exception
     expect { @session.current_path }.not_to raise_exception
   end

data/lib/capybara/spec/session/select_spec.rb

@@ -94,7 +94,7 @@ Capybara::SpecHelper.spec "#select" do
 
   context "with an option that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find visible option \"Does not Exist\""
+      msg = /^Unable to find visible option "Does not Exist" within/
       expect do
         @session.select('Does not Exist', from: 'form_locale')
       end.to raise_error(Capybara::ElementNotFound, msg)

data/lib/capybara/spec/session/unselect_spec.rb

@@ -64,7 +64,7 @@ Capybara::SpecHelper.spec "#unselect" do
 
   context "with an option that doesn't exist" do
     it "should raise an error" do
-      msg = 'Unable to find visible option "Does not Exist"'
+      msg = /^Unable to find visible option "Does not Exist" within/
       expect do
         @session.unselect('Does not Exist', from: 'form_underwear')
       end.to raise_error(Capybara::ElementNotFound, msg)

data/lib/capybara/spec/session/visit_spec.rb

@@ -63,6 +63,23 @@ Capybara::SpecHelper.spec '#visit' do
       expect(URI.parse(@session.current_url).port).to eq(root_uri.port)
       expect(@session).to have_content('Another World')
     end
+
+    it "should add the server port to a visited url if no port specified", requires: [:server] do
+      expect(@session.driver).to receive(:visit).with("http://www.example.com:#{@session.server.port}")
+      @session.visit("http://www.example.com")
+    end
+
+    it "should not override the visit specified port even if default for scheme", requires: [:server] do
+      expect(@session.driver).to receive(:visit).with("http://www.example.com:80")
+      @session.visit('http://www.example.com:80')
+    end
+
+    it "should give preference to app_host port if specified", requires: [:server] do
+      Capybara.app_host = "http://www.example.com:6666"
+      expect(@session.driver).to receive(:visit).with("http://www.example.com:6666/random")
+      @session.visit('/random')
+    end
+
   end
 
   context "without a server", requires: [:server] do

data/lib/capybara/spec/session/within_spec.rb

@@ -101,7 +101,7 @@ Capybara::SpecHelper.spec '#within' do
           expect do
             @session.within(".//div[@id='doesnotexist']") do
             end
-          end.to raise_error(Capybara::ElementNotFound)
+          end.to raise_error(Capybara::ElementNotFound, %Q{Unable to find visible xpath ".//div[@id='doesnotexist']" within #<Capybara::Node::Element tag="div" path="/html/body/div[1]">})
         end.to_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(false)
       end
     end.to_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(true)

data/lib/capybara/version.rb

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

data/spec/capybara_spec.rb

@@ -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
 

data/spec/selenium_spec_chrome.rb

@@ -5,9 +5,9 @@ require 'shared_selenium_session'
 
 CHROME_DRIVER = if ENV['HEADLESS'] then :selenium_chrome_headless else :selenium_chrome end
 
-if ENV['HEADLESS'] && ENV['TRAVIS']
-  Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta'
-end
+# 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 = {

data/spec/selenium_spec_marionette.rb

@@ -4,13 +4,20 @@ require "selenium-webdriver"
 require 'shared_selenium_session'
 require 'rspec/shared_spec_matchers'
 
-ENV['MOZ_HEADLESS']='1' if ENV['HEADLESS']
+browser_options = ::Selenium::WebDriver::Firefox::Options.new()
+browser_options.args << '--headless' if ENV['HEADLESS']
+browser_options.add_preference 'dom.file.createInChild', true
+# browser_options.add_option("log", {"level": "trace"})
 
 Capybara.register_driver :selenium_marionette do |app|
+  # ::Selenium::WebDriver.logger.level = "debug"
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    desired_capabilities: {marionette: true}
+    desired_capabilities: {:marionette => true},
+    options: browser_options
+    # Get a trace level log from geckodriver
+    # :driver_opts => { args: ['-vv'] }
   )
 end
 
@@ -20,10 +27,13 @@ Capybara.register_driver :selenium_marionette_clear_storage do |app|
     browser: :firefox,
     desired_capabilities: {marionette: true},
     clear_local_storage: true,
-    clear_session_storage: true
+    clear_session_storage: true,
+    options: browser_options
   )
 end
 
+
+
 module TestSessions
   SeleniumMarionette = Capybara::Session.new(:selenium_marionette, TestApp)
 end

data/spec/shared_selenium_session.rb

@@ -57,12 +57,28 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
 
     describe "#accept_alert" do
       it "supports a blockless mode" do
-        skip "Headless Chrome doesn't support blockless modal methods" if @session.driver.send(:headless_chrome?)
         @session.visit('/with_js')
+        skip "Headless Chrome doesn't support blockless modal methods" if @session.driver.send(:headless_chrome?)
         @session.click_link('Open alert')
         @session.accept_alert
         expect{@session.driver.browser.switch_to.alert}.to raise_error(Selenium::WebDriver::Error::NoAlertPresentError)
       end
+
+      it "raises if block is missing" do
+        @session.visit('/with_js')
+        skip "Only Headless Chrome requires the block due to system modal JS injection" unless @session.driver.send(:headless_chrome?)
+        expect { @session.accept_alert }.to raise_error(ArgumentError)
+      end
+    end
+
+    context '#fill_in_with empty string and no options' do
+      it 'should trigger change when clearing a field' do
+        @session.visit('/with_js')
+        @session.fill_in('with_change_event', with: '')
+        # 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)
+      end
     end
 
     context "#fill_in with { :clear => :backspace } fill_option", requires: [:js] do
@@ -90,6 +106,15 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
         @session.find(:css, 'body').click
         expect(@session).to have_selector(:css, '.change_event_triggered', match: :one)
       end
+
+      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 })
+        # 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)
+      end
     end
 
     context "#fill_in with { clear: :none } fill_options" do
@@ -161,7 +186,8 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       it "outputs obsolete elements" do
         @session.visit('/form')
         el = @session.find(:button, 'Click me!').click
-        sleep 2
+        expect(@session).to have_no_button('Click me!')
+        expect(el).not_to receive(:synchronize)
         expect(el.inspect).to eq "Obsolete #<Capybara::Node::Element>"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.15.2
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -506,7 +506,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,