capybara 2.11.0 → 2.12.0

data/lib/capybara/queries/title_query.rb

@@ -9,7 +9,7 @@ module Capybara
         unless @expected_title.is_a?(Regexp)
           @expected_title = Capybara::Helpers.normalize_whitespace(@expected_title)
         end
-        @search_regexp = Capybara::Helpers.to_regexp(@expected_title)
+        @search_regexp = Capybara::Helpers.to_regexp(@expected_title, nil, options.fetch(:exact, false))
         assert_valid_keys
       end
 
@@ -34,7 +34,7 @@ module Capybara
       end
 
       def valid_keys
-        [:wait]
+        [:wait, :exact]
       end
     end
   end

data/lib/capybara/rack_test/form.rb

@@ -65,7 +65,7 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
           merge_param!(params, field['name'].to_s, (option['value'] || option.text).to_s) if option
         end
       when 'textarea'
-        merge_param!(params, field['name'].to_s, field.text.to_s.gsub(/\n/, "\r\n"))
+        merge_param!(params, field['name'].to_s, field['_capybara_raw_value'].to_s.gsub(/\n/, "\r\n"))
       end
     end
     merge_param!(params, button[:name], button[:value] || "") if button[:name]

data/lib/capybara/rack_test/node.rb

@@ -18,7 +18,7 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
 
   def set(value)
     if (Array === value) && !multiple?
-      raise ArgumentError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
+      raise TypeError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
     end
 
     if radio?
@@ -31,7 +31,7 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
       if self[:readonly]
         warn "Attempt to set readonly element with value: #{value} \n * This will raise an exception in a future version of Capybara"
       else
-        native.content = value.to_s
+        native['_capybara_raw_value'] = value.to_s
       end
     end
   end
@@ -91,9 +91,9 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
 
   def disabled?
     if %w(option optgroup).include? tag_name
-      string_node.disabled? || find_xpath("parent::*")[0].disabled?
+      string_node.disabled? || find_xpath("parent::*[self::optgroup or self::select]")[0].disabled?
     else
-      string_node.disabled?
+      string_node.disabled? || !find_xpath("parent::fieldset[@disabled] | ancestor::*[not(self::legend) or preceding-sibling::legend][parent::fieldset[@disabled]]").empty?
     end
   end
 

data/lib/capybara/result.rb

@@ -28,11 +28,11 @@ module Capybara
       @result_cache = []
       @results_enum = lazy_select_elements { |node| query.matches_filters?(node) }
       @query = query
-      # JRuby has an issue with eagerly finding next in lazy enumerators which
+      # JRuby < 9.1.6.0 has an issue with eagerly finding next in lazy enumerators which
       # causes a concurrency issue with network requests here
       # https://github.com/jruby/jruby/issues/4212
       # Just force all the results to be evaluated
-      full_results if RUBY_PLATFORM == 'java'
+      full_results if RUBY_PLATFORM == 'java' && (Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('9.1.6.0'))
     end
 
     def_delegators :full_results, :size, :length, :last, :values_at, :inspect, :sample

data/lib/capybara/selector.rb

@@ -123,11 +123,16 @@ end
 # @filter [String] :title Matches the title attribute
 # @filter [String] :alt Matches the alt attribute of a contained img element
 # @filter [String] :class Matches the class(es) provided
-# @filter [String, Regexp] :href  Matches the normalized href of the link
+# @filter [String, Regexp,nil] :href  Matches the normalized href of the link, if nil will find <a> elements with no href attribute
 #
 Capybara.add_selector(:link) do
   xpath(:title, :alt) do |locator, options={}|
-    xpath = XPath.descendant(:a)[XPath.attr(:href)]
+    xpath = XPath.descendant(:a)
+    xpath = if options.fetch(:href, true).nil?
+      xpath[~XPath.attr(:href)]
+    else
+      xpath[XPath.attr(:href)]
+    end
     unless locator.nil?
       locator = locator.to_s
       matchers = XPath.attr(:id).equals(locator) |
@@ -143,14 +148,21 @@ Capybara.add_selector(:link) do
   end
 
   filter(:href) do |node, href|
-    if href.is_a? Regexp
+    case href
+    when nil
+      true
+    when 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] }
+  describe do |options|
+    desc = String.new()
+    desc << " with href #{options[:href].inspect}" if options[:href]
+    desc << " with no href attribute" if options.fetch(:href, true).nil?
+  end
 end
 
 ##

data/lib/capybara/selenium/driver.rb

@@ -86,12 +86,12 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   def wait?; true; end
   def needs_server?; true; end
 
-  def execute_script(script)
-    browser.execute_script script
+  def execute_script(script, *args)
+    browser.execute_script(script, *args.map { |arg| arg.is_a?(Capybara::Selenium::Node) ?  arg.native : arg} )
   end
 
-  def evaluate_script(script)
-    browser.execute_script "return #{script}"
+  def evaluate_script(script, *args)
+    browser.execute_script("return #{script}", *args.map { |arg| arg.is_a?(Capybara::Selenium::Node) ?  arg.native : arg} )
   end
 
   def save_screenshot(path, _options={})
@@ -213,24 +213,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.switch_to.window handle
   end
 
-  # @api private
-  def find_window(locator)
-    handles = browser.window_handles
-    return locator if handles.include? locator
-
-    original_handle = browser.window_handle
-    handles.each do |handle|
-      switch_to_window(handle)
-      if (locator == browser.execute_script("return window.name") ||
-          browser.title.include?(locator) ||
-          browser.current_url.include?(locator))
-        switch_to_window(original_handle)
-        return handle
-      end
-    end
-    raise Capybara::ElementNotFound, "Could not find a window identified by #{locator}"
-  end
-
   def within_window(locator)
     handle = find_window(locator)
     browser.switch_to.window(handle) { yield }
@@ -277,6 +259,29 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     Selenium::WebDriver::Error::NoSuchWindowError
   end
 
+  # @api private
+  def find_window(locator)
+    handles = browser.window_handles
+    return locator if handles.include? locator
+
+    original_handle = browser.window_handle
+    handles.each do |handle|
+      switch_to_window(handle)
+      if (locator == browser.execute_script("return window.name") ||
+          browser.title.include?(locator) ||
+          browser.current_url.include?(locator))
+        switch_to_window(original_handle)
+        return handle
+      end
+    end
+    raise Capybara::ElementNotFound, "Could not find a window identified by #{locator}"
+  end
+
+  #@api private
+  def marionette?
+    (options[:browser].to_s == "firefox") && browser.capabilities.is_a?(Selenium::WebDriver::Remote::W3CCapabilities)
+  end
+
   # @deprecated This method is being removed
   def browser_initialized?
     super && !@browser.nil?

data/lib/capybara/selenium/node.rb

@@ -138,7 +138,16 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   alias :checked? :selected?
 
   def disabled?
-    !native.enabled?
+    # workaround for selenium-webdriver/geckodriver reporting elements as enabled when they are nested in disabling elements
+    if driver.marionette?
+      if %w(option optgroup).include? tag_name
+        !native.enabled? || find_xpath("parent::*[self::optgroup or self::select]")[0].disabled?
+      else
+        !native.enabled? || !find_xpath("parent::fieldset[@disabled] | ancestor::*[not(self::legend) or preceding-sibling::legend][parent::fieldset[@disabled]]").empty?
+      end
+    else
+      !native.enabled?
+    end
   end
 
   def readonly?

data/lib/capybara/session.rb

@@ -41,6 +41,7 @@ module Capybara
       :has_no_table?, :has_table?, :unselect, :has_select?, :has_no_select?,
       :has_selector?, :has_no_selector?, :click_on, :has_no_checked_field?,
       :has_no_unchecked_field?, :query, :assert_selector, :assert_no_selector,
+      :assert_all_of_selectors, :assert_none_of_selectors,
       :refute_selector, :assert_text, :assert_no_text
     ]
     # @api private
@@ -50,8 +51,8 @@ module Capybara
     SESSION_METHODS = [
       :body, :html, :source, :current_url, :current_host, :current_path,
       :execute_script, :evaluate_script, :visit, :go_back, :go_forward,
-      :within, :within_fieldset, :within_table, :within_frame, :current_window,
-      :windows, :open_new_window, :switch_to_window, :within_window, :window_opened_by,
+      :within, :within_element, :within_fieldset, :within_table, :within_frame, :switch_to_frame,
+      :current_window, :windows, :open_new_window, :switch_to_window, :within_window, :window_opened_by,
       :save_page, :save_and_open_page, :save_screenshot,
       :save_and_open_screenshot, :reset_session!, :response_headers,
       :status_code, :current_scope,
@@ -67,6 +68,7 @@ module Capybara
     attr_accessor :synchronized
 
     def initialize(mode, app=nil)
+      raise TypeError, "The second parameter to Session::new should be a rack app if passed." if app && !app.respond_to?(:call)
       @mode = mode
       @app = app
       if Capybara.run_server and @app and driver.needs_server?
@@ -171,6 +173,10 @@ module Capybara
     def current_path
       # Addressable parsing is more lenient than URI
       uri = Addressable::URI.parse(current_url)
+
+      # If current_url ends up being nil, won't be able to call .path on a NilClass.
+      return nil if uri.nil?
+
       # Addressable doesn't support opaque URIs - we want nil here
       return nil if uri.scheme == "about"
       path = uri.path
@@ -306,6 +312,7 @@ module Capybara
         scopes.pop
       end
     end
+    alias_method :within_element, :within
 
     ##
     #
@@ -331,6 +338,42 @@ module Capybara
       end
     end
 
+    ##
+    #
+    # Switch to the given frame
+    #
+    # If you use this method you are responsible for making sure you switch back to the parent frame when done in the frame changed to.
+    # Capybara::Session#within_frame is preferred over this method and should be used when possible.
+    # May not be supported by all drivers.
+    #
+    # @overload switch_to_frame(element)
+    #   @param [Capybara::Node::Element]  iframe/frame element to switch to
+    # @overload switch_to_frame(:parent)
+    #   Switch to the parent element
+    # @overload switch_to_frame(:top)
+    #   Switch to the top level document
+    #
+    def switch_to_frame(frame)
+      case frame
+      when Capybara::Node::Element
+        driver.switch_to_frame(frame)
+        scopes.push(:frame)
+      when :parent
+        raise Capybara::ScopeError, "`switch_to_frame(:parent)` cannot be called from inside a descendant frame's "\
+                                    "`within` block." if scopes.last() != :frame
+        scopes.pop
+        driver.switch_to_frame(:parent)
+      when :top
+        idx = scopes.index(:frame)
+        if idx
+          raise Capybara::ScopeError, "`switch_to_frame(:top)` cannot be called from inside a descendant frame's "\
+                                      "`within` block." if scopes.slice(idx..-1).any? {|scope| ![:frame, nil].include?(scope)}
+          scopes.slice!(idx..-1)
+          driver.switch_to_frame(:top)
+        end
+      end
+    end
+
     ##
     #
     # Execute the given block within the given iframe using given frame, frame name/id or index.
@@ -338,45 +381,50 @@ module Capybara
     #
     # @overload within_frame(element)
     #   @param [Capybara::Node::Element]  frame element
-    # @overload within_frame(name)
-    #   @param [String] name           name/id of a frame
+    # @overload within_frame([kind = :frame], locator, options = {})
+    #   @param [Symobl] kind      Optional selector type (:css, :xpath, :field, etc.) - Defaults to :frame
+    #   @param [String] locator   The locator for the given selector kind.  For :frame this is the name/id of a frame/iframe element
     # @overload within_frame(index)
-    #   @param [Integer] index         index of a frame
-    #
-    def within_frame(locator)
-      scopes.push(nil)
-
-      #support older driver frame api for now
-      frame = case locator
-      when Capybara::Node::Element
-        locator
-      when String
-        find(:frame, locator)
-      when Integer
-        all(:frame, minimum: locator+1)[locator]
-      else
-        raise ArgumentError
+    #   @param [Integer] index         index of a frame (0 based)
+    def within_frame(*args)
+      frame = within(document) do  # Previous 2.x versions ignored current scope when finding frames - consider changing in 3.0
+        case args[0]
+        when Capybara::Node::Element
+          args[0]
+        when String, Hash
+          find(:frame, *args)
+        when Symbol
+          find(*args)
+        when Integer
+          idx = args[0]
+          all(:frame, minimum: idx+1)[idx]
+        else
+          raise TypeError
+        end
       end
 
       begin
-        driver.switch_to_frame(frame)
+        switch_to_frame(frame)
         begin
           yield
         ensure
-          driver.switch_to_frame(:parent)
+          switch_to_frame(:parent)
         end
       rescue Capybara::NotSupportedByDriverError
         # Support older driver frame API for now
         if driver.respond_to?(:within_frame)
-          driver.within_frame(frame) do
-            yield
+          begin
+            scopes.push(:frame)
+            driver.within_frame(frame) do
+              yield
+            end
+          ensure
+            scopes.pop
           end
         else
           raise
         end
       end
-    ensure
-      scopes.pop
     end
 
     ##
@@ -560,10 +608,16 @@ module Capybara
     # +evaluate_script+ whenever possible.
     #
     # @param [String] script   A string of JavaScript to execute
+    # @param args  Optional arguments that will be passed to the script.  Driver support for this is optional and types of objects supported may differ between drivers
     #
-    def execute_script(script)
+    def execute_script(script, *args)
       @touched = true
-      driver.execute_script(script)
+      if driver.method(:execute_script).arity == 1
+        raise Capybara::NotSupportedByDriverError, "The current driver does not support arguments being passed with execute_script" unless args.empty?
+        driver.execute_script(script)
+      else
+        driver.execute_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ?  arg.base : arg} )
+      end
     end
 
     ##
@@ -575,9 +629,14 @@ module Capybara
     # @param  [String] script   A string of JavaScript to evaluate
     # @return [Object]          The result of the evaluated JavaScript (may be driver specific)
     #
-    def evaluate_script(script)
+    def evaluate_script(script, *args)
       @touched = true
-      driver.evaluate_script(script)
+      if driver.method(:evaluate_script).arity == 1
+        raise Capybara::NotSupportedByDriverError, "The current driver does not support arguments being passed with execute_script" unless args.empty?
+        driver.evaluate_script(script)
+      else
+        driver.evaluate_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ?  arg.base : arg} )
+      end
     end
 
     ##
@@ -733,7 +792,9 @@ module Capybara
     end
 
     def current_scope
-      scopes.last || document
+      scope = scopes.last
+      scope = document if [nil, :frame].include? scope
+      scope
     end
 
   private

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

@@ -19,6 +19,7 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
   end
 
   it "should accept the prompt with a response" do
+    pending "selenium-webdriver/geckodriver doesn't support sending a response to prompts" if marionette?(@session)
     @session.accept_prompt with: 'the response' do
       @session.click_link('Open prompt')
     end
@@ -26,6 +27,7 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
   end
 
   it "should accept the prompt if the message matches" do
+    pending "selenium-webdriver/geckodriver doesn't support sending a response to prompts" if marionette?(@session)
     @session.accept_prompt 'Prompt opened', with: 'matched' do
       @session.click_link('Open prompt')
     end
@@ -42,6 +44,7 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
 
 
   it "should return the message presented" do
+    pending "selenium-webdriver/geckodriver doesn't support sending a response to prompts" if marionette?(@session)
     message = @session.accept_prompt with: 'the response' do
       @session.click_link('Open prompt')
     end

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

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+Capybara::SpecHelper.spec '#assert_all_of_selectors' do
+  before do
+    @session.visit('/with_html')
+  end
+
+  it "should be true if the given selectors are on the page" do
+    @session.assert_all_of_selectors(:css, "p a#foo", "h2#h2one", "h2#h2two" )
+  end
+
+  it "should be false if any of the given selectors are not on the page" do
+    expect { @session.assert_all_of_selectors(:css, "p a#foo", "h2#h2three", "h2#h2one")}.to raise_error(Capybara::ElementNotFound)
+  end
+
+  it "should use default selector" do
+    Capybara.default_selector = :css
+    expect { @session.assert_all_of_selectors("p a#foo", "h2#h2three", "h2#h2one")}.to raise_error(Capybara::ElementNotFound)
+    @session.assert_all_of_selectors("p a#foo", "h2#h2two", "h2#h2one" )
+  end
+
+  it "should respect scopes" do
+    @session.within "//p[@id='first']" do
+      @session.assert_all_of_selectors(".//a[@id='foo']")
+      expect { @session.assert_all_of_selectors(".//a[@id='red']") }.to raise_error(Capybara::ElementNotFound)
+    end
+  end
+
+  context "with options" do
+    it "should apply options to all locators" do
+      @session.assert_all_of_selectors(:field, 'normal', 'additional_newline', type: :textarea)
+      expect { @session.assert_all_of_selectors(:field, 'normal', 'test_field', 'additional_newline', type: :textarea) }.to raise_error(Capybara::ElementNotFound)
+    end
+  end
+
+  context "with wait", requires: [:js] do
+    it "should not raise error if all the elements appear before given wait duration" do
+      Capybara.using_wait_time(0.1) do
+        @session.visit('/with_js')
+        @session.click_link('Click me')
+        @session.assert_all_of_selectors(:css, "a#clickable", "a#has-been-clicked", '#drag', wait: 0.9)
+      end
+    end
+  end
+end
+
+Capybara::SpecHelper.spec '#assert_none_of_selectors' do
+  before do
+    @session.visit('/with_html')
+  end
+
+  it "should be false if any of the given locators are on the page" do
+    expect { @session.assert_none_of_selectors(:xpath, "//p", "//a") }.to raise_error(Capybara::ElementNotFound)
+    expect { @session.assert_none_of_selectors(:xpath, "//abbr", "//a") }.to raise_error(Capybara::ElementNotFound)
+    expect { @session.assert_none_of_selectors(:css, "p a#foo") }.to raise_error(Capybara::ElementNotFound)
+  end
+
+  it "should be true if none of the given locators are on the page" do
+    @session.assert_none_of_selectors(:xpath, "//abbr", "//td" )
+    @session.assert_none_of_selectors(:css, "p a#doesnotexist", "abbr")
+  end
+
+  it "should use default selector" do
+    Capybara.default_selector = :css
+    @session.assert_none_of_selectors("p a#doesnotexist", "abbr")
+    expect { @session.assert_none_of_selectors("abbr", "p a#foo") }.to raise_error(Capybara::ElementNotFound)
+  end
+
+  it "should respect scopes" do
+    @session.within "//p[@id='first']" do
+      expect { @session.assert_none_of_selectors(".//a[@id='foo']") }.to raise_error(Capybara::ElementNotFound)
+      @session.assert_none_of_selectors(".//a[@id='red']")
+    end
+  end
+
+  context "with options" do
+    it "should apply the options to all locators" do
+      expect { @session.assert_none_of_selectors("//p//a", text: "Redirect") }.to raise_error(Capybara::ElementNotFound)
+      @session.assert_none_of_selectors("//p", text: "Doesnotexist")
+    end
+
+    it "should discard all matches where the given regexp is matched" do
+      expect { @session.assert_none_of_selectors("//p//a", text: /re[dab]i/i, count: 1) }.to raise_error(Capybara::ElementNotFound)
+      @session.assert_none_of_selectors("//p//a", text: /Red$/)
+    end
+  end
+
+  context "with wait", requires: [:js] do
+    it "should not find elements if they appear after given wait duration" do
+      @session.visit('/with_js')
+      @session.click_link('Click me')
+      @session.assert_none_of_selectors(:css, "#new_field", "a#has-been-clicked", wait: 0.1)
+    end
+  end
+end