capybara 2.4.4 → 2.5.0

data/lib/capybara/queries/current_path_query.rb

@@ -0,0 +1,58 @@
+module Capybara
+  # @api private
+  module Queries
+    class CurrentPathQuery < BaseQuery
+      def initialize(expected_path, options = {})
+        @expected_path = expected_path
+        @options = {
+          url: false,
+          only_path: false }.merge(options)
+        assert_valid_keys
+      end
+
+      def resolves_for?(session)
+        @actual_path = if options[:url]
+          session.current_url
+        else
+          if options[:only_path]
+            URI.parse(session.current_url).path
+          else
+            URI.parse(session.current_url).request_uri
+          end
+        end
+
+        if @expected_path.is_a? Regexp
+          @actual_path.match(@expected_path)
+        else
+          @expected_path == @actual_path
+        end
+      end
+
+      def failure_message
+        failure_message_helper
+      end
+
+      def negative_failure_message
+        failure_message_helper(' not')
+      end
+
+      private
+
+      def failure_message_helper(negated = '')
+        verb = (@expected_path.is_a?(Regexp))? 'match' : 'equal'
+        "expected #{@actual_path.inspect}#{negated} to #{verb} #{@expected_path.inspect}"
+      end
+
+      def valid_keys
+        [:wait, :url, :only_path]
+      end
+
+      def assert_valid_keys
+        super
+        if options[:url] && options[:only_path]
+          raise ArgumentError, "the :url and :only_path options cannot both be true"
+        end
+      end
+    end
+  end
+end

data/lib/capybara/queries/text_query.rb

@@ -3,7 +3,7 @@ module Capybara
   module Queries
     class TextQuery < BaseQuery
       def initialize(*args)
-        @type = args.shift if args.first.is_a?(Symbol) || args.first.nil?
+        @type = (args.first.is_a?(Symbol) || args.first.nil?) ? args.shift : nil
         @expected_text, @options = args
         unless @expected_text.is_a?(Regexp)
           @expected_text = Capybara::Helpers.normalize_whitespace(@expected_text)
@@ -11,15 +11,6 @@ module Capybara
         @search_regexp = Capybara::Helpers.to_regexp(@expected_text)
         @options ||= {}
         assert_valid_keys
-
-        # this is needed to not break existing tests that may use keys supported by `Query` but not supported by `TextQuery`
-        # can be removed in next minor version (> 2.4)
-        invalid_keys = @options.keys - (COUNT_KEYS + [:wait])
-        unless invalid_keys.empty?
-          invalid_names = invalid_keys.map(&:inspect).join(", ")
-          valid_names = valid_keys.map(&:inspect).join(", ")
-          warn "invalid keys #{invalid_names}, should be one of #{valid_names}"
-        end
       end
 
       def resolve_for(node)
@@ -49,7 +40,7 @@ module Capybara
       private
 
       def valid_keys
-        Capybara::Query::VALID_KEYS # can be changed to COUNT_KEYS + [:wait] in next minor version (> 2.4)
+        COUNT_KEYS + [:wait]
       end
     end
   end

data/lib/capybara/rack_test/browser.rb

@@ -27,7 +27,7 @@ class Capybara::RackTest::Browser
   end
 
   def follow(method, path, attributes = {})
-    return if path.gsub(/^#{request_path}/, '').start_with?('#')
+    return if path.gsub(/^#{Regexp.escape(request_path)}/, '').start_with?('#') || path.downcase.start_with?('javascript:')
     process_and_follow_redirects(method, path, attributes, {'HTTP_REFERER' => current_url})
   end
 
@@ -96,7 +96,12 @@ class Capybara::RackTest::Browser
   end
 
   def title
-    dom.xpath("//title").text
+    if dom.respond_to? :title
+      dom.title
+    else
+      #old versions of nokogiri don't have #title - remove in 3.0
+      dom.xpath('/html/head/title | /html/title').first.text
+    end
   end
 
 protected

data/lib/capybara/rack_test/driver.rb

@@ -86,6 +86,10 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
     @browser = nil
   end
 
+  def browser_initialized?
+    !@browser.nil?
+  end
+
   def get(*args, &block); browser.get(*args, &block); end
   def post(*args, &block); browser.post(*args, &block); end
   def put(*args, &block); browser.put(*args, &block); end

data/lib/capybara/rack_test/form.rb

@@ -72,7 +72,8 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
 
   def submit(button)
     action = (button && button['formaction']) || native['action']
-    driver.submit(method, action.to_s, params(button))
+    requset_method = (button && button['formmethod']) || method
+    driver.submit(requset_method, action.to_s, params(button))
   end
 
   def multipart?

data/lib/capybara/rack_test/node.rb

@@ -36,6 +36,7 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
   end
 
   def select_option
+    return if disabled?
     if select_node['multiple'] != 'multiple'
       select_node.find_xpath(".//option[@selected]").each { |node| node.native.remove_attribute("selected") }
     end

data/lib/capybara/result.rb

@@ -3,7 +3,7 @@ require 'forwardable'
 module Capybara
 
   ##
-  # A {Capybara::Result} represents a collection of {Capybara::Element} on the page. It is possible to interact with this
+  # A {Capybara::Result} represents a collection of {Capybara::Node::Element} on the page. It is possible to interact with this
   # collection similar to an Array because it implements Enumerable and offers the following Array methods through delegation:
   #
   # * []
@@ -16,7 +16,7 @@ module Capybara
   # * last()
   # * empty?()
   #
-  # @see Capybara::Element
+  # @see Capybara::Node::Element
   #
   class Result
     include Enumerable

data/lib/capybara/rspec.rb

@@ -7,6 +7,7 @@ require 'capybara/rspec/features'
 RSpec.configure do |config|
   config.include Capybara::DSL, :type => :feature
   config.include Capybara::RSpecMatchers, :type => :feature
+  config.include Capybara::RSpecMatchers, :type => :view
 
   # A work-around to support accessing the current example that works in both
   # RSpec 2 and RSpec 3.

data/lib/capybara/rspec/features.rb

@@ -11,7 +11,7 @@ if RSpec::Core::Version::STRING.to_f >= 3.0
     config.alias_example_group_to :feature, :capybara_feature => true, :type => :feature
     config.alias_example_to :scenario
     config.alias_example_to :xscenario, :skip => "Temporarily disabled with xscenario"
-    # config.alias_example_to :fscenario, :focus => true
+    config.alias_example_to :fscenario, :focus => true
   end
 else
   module Capybara

data/lib/capybara/rspec/matchers.rb

@@ -123,6 +123,41 @@ module Capybara
       alias_method :failure_message_for_should_not, :failure_message_when_negated
     end
 
+    class HaveCurrentPath < Matcher
+      attr_reader :current_path
+
+      attr_reader :failure_message, :failure_message_when_negated
+
+      def initialize(*args)
+        @args = args
+
+        # are set just for backwards compatability
+        @current_path = args.first
+      end
+
+      def matches?(actual)
+        wrap(actual).assert_current_path(*@args)
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message = e.message
+        return false
+      end
+
+      def does_not_match?(actual)
+        wrap(actual).assert_no_current_path(*@args)
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message_when_negated = e.message
+        return false
+      end
+
+      def description
+        "have current path #{current_path.inspect}"
+      end
+
+      # RSpec 2 compatibility:
+      alias_method :failure_message_for_should, :failure_message
+      alias_method :failure_message_for_should_not, :failure_message_when_negated
+    end
+
     class BecomeClosed
       def initialize(options)
         @wait_time = Capybara::Query.new(options).wait
@@ -130,9 +165,9 @@ module Capybara
 
       def matches?(window)
         @window = window
-        start_time = Time.now
+        start_time = Capybara::Helpers.monotonic_time
         while window.exists?
-          return false if (Time.now - start_time) > @wait_time
+          return false if (Capybara::Helpers.monotonic_time - start_time) > @wait_time
           sleep 0.05
         end
         true
@@ -172,6 +207,10 @@ module Capybara
       HaveTitle.new(title, options)
     end
 
+    def have_current_path(path, options = {})
+      HaveCurrentPath.new(path, options)
+    end
+
     def have_link(locator, options={})
       HaveSelector.new(:link, locator, options)
     end
@@ -205,7 +244,7 @@ module Capybara
     # @example
     #   expect(window).to become_closed(wait: 0.8)
     # @param options [Hash] optional param
-    # @option options [Numeric] :wait (Capybara.default_wait_time) wait time
+    # @option options [Numeric] :wait (Capybara.default_max_wait_time) Maximum wait time
     def become_closed(options = {})
       BecomeClosed.new(options)
     end

data/lib/capybara/selector.rb

@@ -116,6 +116,7 @@ Capybara.add_selector(:field) do
   filter(:checked, boolean: true) { |node, value| not(value ^ node.checked?) }
   filter(:unchecked, boolean: true) { |node, value| (value ^ node.checked?) }
   filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
+  filter(:readonly, boolean: true) { |node, value| not(value ^ node[:readonly]) }
   filter(:with) { |node, with| node.value == with.to_s }
   filter(:type) do |node, type|
     if ['textarea', 'select'].include?(type)
@@ -150,7 +151,11 @@ end
 Capybara.add_selector(:link) do
   xpath { |locator| XPath::HTML.link(locator) }
   filter(:href) do |node, href|
-    node.first(:xpath, XPath.axis(:self)[XPath.attr(:href).equals(href.to_s)])
+    if href.is_a? Regexp
+      node[:href].match href
+    else
+      node.first(:xpath, XPath.axis(:self)[XPath.attr(:href).equals(href.to_s)], minimum: 0)
+    end
   end
   describe { |options| " with href #{options[:href].inspect}" if options[:href] }
 end
@@ -210,7 +215,7 @@ Capybara.add_selector(:select) do
     actual = node.all(:xpath, './/option').map { |option| option.text }
     options.sort == actual.sort
   end
-  filter(:with_options) { |node, options| options.all? { |option| node.first(:option, option) } }
+  filter(:with_options) { |node, options| options.all? { |option| node.first(:option, option, minimum: 0) } }
   filter(:selected) do |node, selected|
     actual = node.all(:xpath, './/option').select { |option| option.selected? }.map { |option| option.text }
     [selected].flatten.sort == actual.sort

data/lib/capybara/selenium/driver.rb

@@ -116,7 +116,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   ##
   #
-  # Webdriver supports frame name, id, index(zero-based) or {Capybara::Element} to find iframe
+  # Webdriver supports frame name, id, index(zero-based) or {Capybara::Node::Element} to find iframe
   #
   # @overload within_frame(index)
   #   @param [Integer] index                 index of a frame
@@ -126,17 +126,24 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   #   @param [Capybara::Node::Base] a_node   frame element
   #
   def within_frame(frame_handle)
-    @frame_handles[browser.window_handle] ||= []
     frame_handle = frame_handle.native if frame_handle.is_a?(Capybara::Node::Base)
-    @frame_handles[browser.window_handle] << frame_handle
-    a=browser.switch_to.frame(frame_handle)
+    if !browser.switch_to.respond_to?(:parent_frame)
+      # Selenium Webdriver < 2.43 doesnt support moving back to the parent
+      @frame_handles[browser.window_handle] ||= []
+      @frame_handles[browser.window_handle] << frame_handle
+    end
+    browser.switch_to.frame(frame_handle)
     yield
   ensure
-    # There doesnt appear to be any way in Webdriver to move back to a parent frame
-    # other than going back to the root and then reiterating down
-    @frame_handles[browser.window_handle].pop
-    browser.switch_to.default_content
-    @frame_handles[browser.window_handle].each { |fh| browser.switch_to.frame(fh) }
+    if browser.switch_to.respond_to?(:parent_frame)
+      browser.switch_to.parent_frame
+    else
+      # There doesnt appear to be any way in Selenium Webdriver < 2.43 to move back to a parent frame
+      # other than going back to the root and then reiterating down
+      @frame_handles[browser.window_handle].pop
+      browser.switch_to.default_content
+      @frame_handles[browser.window_handle].each { |fh| browser.switch_to.frame(fh) }
+    end
   end
 
   def current_window_handle
@@ -230,13 +237,20 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def invalid_element_errors
-    [Selenium::WebDriver::Error::StaleElementReferenceError, Selenium::WebDriver::Error::UnhandledError, Selenium::WebDriver::Error::ElementNotVisibleError]
+    [Selenium::WebDriver::Error::StaleElementReferenceError,
+     Selenium::WebDriver::Error::UnhandledError,
+     Selenium::WebDriver::Error::ElementNotVisibleError,
+     Selenium::WebDriver::Error::InvalidSelectorError]  # Work around a race condition that can occur with chromedriver and #go_back/#go_forward
   end
 
   def no_such_window_error
     Selenium::WebDriver::Error::NoSuchWindowError
   end
 
+  def browser_initialized?
+    !@browser.nil?
+  end
+
   private
 
   def within_given_window(handle)
@@ -255,10 +269,10 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     # Selenium has its own built in wait (2 seconds)for a modal to show up, so this wait is really the minimum time
     # Actual wait time may be longer than specified
     wait = Selenium::WebDriver::Wait.new(
-      timeout: (options[:wait] || Capybara.default_wait_time),
+      timeout: (options[:wait] || Capybara.default_max_wait_time),
       ignore: Selenium::WebDriver::Error::NoAlertPresentError)
     begin
-      modal = wait.until do
+      wait.until do
         alert = @browser.switch_to.alert
         regexp = options[:text].is_a?(Regexp) ? options[:text] : Regexp.escape(options[:text].to_s)
         alert.text.match(regexp) ? alert : nil

data/lib/capybara/selenium/node.rb

@@ -23,7 +23,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     end
   end
 
-  def set(value)
+  def set(value, fill_options={})
     tag_name = self.tag_name
     type = self[:type]
     if (Array === value) && !self[:multiple]
@@ -42,9 +42,17 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
       elsif value.to_s.empty?
         native.clear
       else
-        #script can change a readonly element which user input cannot, so dont execute if readonly
-        driver.browser.execute_script "arguments[0].value = ''", native
-        native.send_keys(value.to_s)
+        if fill_options[:clear] == :backspace
+          # Clear field by sending the correct number of backspace keys.
+          backspaces = [:backspace] * self.value.to_s.length
+          native.send_keys(*(backspaces + [value.to_s]))
+        else
+          # Clear field by JavaScript assignment of the value property.
+          # Script can change a readonly element which user input cannot, so
+          # don't execute if readonly.
+          driver.browser.execute_script "arguments[0].value = ''", native
+          native.send_keys(value.to_s)
+        end
       end
     elsif native.attribute('isContentEditable')
       #ensure we are focused on the element
@@ -72,15 +80,19 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   def click
     native.click
   end
-  
+
   def right_click
     driver.browser.action.context_click(native).perform
   end
-  
+
   def double_click
     driver.browser.action.double_click(native).perform
   end
 
+  def send_keys(*args)
+    native.send_keys(*args)
+  end
+
   def hover
     driver.browser.action.move_to(native).perform
   end
@@ -121,6 +133,30 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     native == other.native
   end
 
+  def path
+    path = find_xpath('ancestor::*').reverse
+    path.unshift self
+
+    result = []
+    while node = path.shift
+      parent = path.first
+
+      if parent
+        siblings = parent.find_xpath(node.tag_name)
+        if siblings.size == 1
+          result.unshift node.tag_name
+        else
+          index = siblings.index(node)
+          result.unshift "#{node.tag_name}[#{index+1}]"
+        end
+      else
+        result.unshift node.tag_name
+      end
+    end
+
+    '/' + result.join('/')
+  end
+
 private
 
   # a reference to the select node if this is an option node

data/lib/capybara/server.rb

@@ -17,7 +17,7 @@ module Capybara
         else
           begin
             @app.call(env)
-          rescue StandardError => e
+          rescue *Capybara.server_errors => e
             @error = e unless @error
             raise e
           end