capybara 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aa9a8cc20ae71dd404a731f98867ba19be9d4f2
-  data.tar.gz: 58b4097a52c34c878ceca8b9bf8477bc20a6e32a
+  metadata.gz: 4ce3ef92ec26ebbca0d14b7fc5b7b619ce8a59dd
+  data.tar.gz: 5c2d6dde6cd9a0e480769b60b0b0afa54c5dea5a
 SHA512:
-  metadata.gz: 4f49792d051b3a87893c10becbb4866eff4cee8a6e9d146a3adfec388df1373c1fe382c390ac9f982de24845c8ea4297a0f168ade5318c628611d1043752cafb
-  data.tar.gz: c707670017ac8f9b9cd335c1cd006724f84d56747c79f7e4ebf4203b4cdac39fa3e211b11c7c8e2819dbd8556bb2c49876e945c37328c47e84bc465e679aa034
+  metadata.gz: 5afcbe6b66303842f126182db09eacc9bbde7ac3a77db257ed18015a5dda24b6ba47c2b4226a6310f7208740b1d35bfeb5a4460d16e13683796f3cbd4cebfb66
+  data.tar.gz: c39745bcee5996ed04722545461380da5e2f85372c4054bc8c9a739e0a91400be53c9870cb9b6cc488188859df707145936275b992bc35326ad7f773fb0d520a

data/History.md

@@ -1,3 +1,24 @@
+# Unreleased
+
+### Added
+
+* 'assert_text', 'assert_no_text', 'assert_title', 'assert_no_title' methods added [Andrey Botalov]
+* have_title matcher now supports :wait option [Andrey Botalov]
+* More descriptive have_text error messages [Andrey Botalov]
+* New modal API ('accept_alert', 'accept_confirm', 'dismiss_confirm', 'accept_prompt', 'dismiss_prompt') - [Mike Pack, Thomas Walpole]
+* Warning when attempting to set contents of a readonly element 
+* Suport for and/or compounding of Capybara's RSpec matchers for RSpec 3 [Thomas Walpole]
+* :fill_options option for 'fill_in' method that propagates to 'set' to allow for driver specific modification of how fields are filled in [Gabriel Sobrinho, Thomas Walpole]
+* Improved selector/filter description in failure messages [Thomas Walpole]
+
+### Fixed
+
+* HaveText error message now shows the text checked all the time
+* RackTest driver no longer attempts to follow an anchor tag without an href attribute
+* Warnings under RSpec 3
+* Handle URI schemes like about: correctly [Andrey Botalov]
+* RSpecs expose_dsl_globally option is now followed [Myron Marston, Thomas Walpole]
+
 # Version 2.3.0
 
 Release date: 2014-06-02

data/README.md

@@ -60,10 +60,10 @@ You can use the Capybara DSL in your steps, like so:
 ```ruby
 When /I sign in/ do
   within("#session") do
-    fill_in 'Login', :with => 'user@example.com'
+    fill_in 'Email', :with => 'user@example.com'
     fill_in 'Password', :with => 'password'
   end
-  click_link 'Sign in'
+  click_button 'Sign in'
 end
 ```
 
@@ -105,10 +105,10 @@ describe "the signin process", :type => :feature do
   it "signs me in" do
     visit '/sessions/new'
     within("#session") do
-      fill_in 'Login', :with => 'user@example.com'
+      fill_in 'Email', :with => 'user@example.com'
       fill_in 'Password', :with => 'password'
     end
-    click_link 'Sign in'
+    click_button 'Sign in'
     expect(page).to have_content 'Success'
   end
 end
@@ -136,10 +136,10 @@ feature "Signing in" do
   scenario "Signing in with correct credentials" do
     visit '/sessions/new'
     within("#session") do
-      fill_in 'Login', :with => 'user@example.com'
+      fill_in 'Email', :with => 'user@example.com'
       fill_in 'Password', :with => 'caplin'
     end
-    click_link 'Sign in'
+    click_button 'Sign in'
     expect(page).to have_content 'Success'
   end
 
@@ -148,10 +148,10 @@ feature "Signing in" do
   scenario "Signing in as another user" do
     visit '/sessions/new'
     within("#session") do
-      fill_in 'Login', :with => other_user.email
+      fill_in 'Email', :with => other_user.email
       fill_in 'Password', :with => other_user.password
     end
-    click_link 'Sign in'
+    click_button 'Sign in'
     expect(page).to have_content 'Invalid email or password'
   end
 end
@@ -497,6 +497,44 @@ that this may break with more complicated expressions:
 result = page.evaluate_script('4 + 4');
 ```
 
+### Modals
+
+In drivers which support it, you can accept, dismiss and respond to alerts, confirms and prompts.
+
+You can accept or dismiss alert messages by wrapping the code that produces an alert in a block:
+
+```ruby
+accept_alert do
+  click_link('Show Alert')
+end
+```
+
+You can accept or dismiss a confirmation by wrapping it in a block, as well:
+
+```ruby
+dismiss_confirm do
+  click_link('Show Confirm')
+end
+```
+
+You can accept or dismiss prompts as well, and also provide text to fill in for the response:
+
+```ruby
+accept_prompt(with: 'Linus Torvalds') do
+  click_link('Show Prompt About Linux')
+end
+```
+
+All modal methods return the message that was presented. So, you can access the prompt message
+by assigning the return to a variable:
+
+```ruby
+message = accept_prompt(with: 'Linus Torvalds') do
+  click_link('Show Prompt About Linux')
+end
+expect(message).to eq('Who is the chief architect of Linux?')
+```
+
 ### Debugging
 
 It can be useful to take a snapshot of the page as it currently is and take a
@@ -682,10 +720,10 @@ module MyModule
 
   def login!
     within("//form[@id='session']") do
-      fill_in 'Login', :with => 'user@example.com'
+      fill_in 'Email', :with => 'user@example.com'
       fill_in 'Password', :with => 'password'
     end
-    click_link 'Sign in'
+    click_button 'Sign in'
   end
 end
 ```
@@ -732,10 +770,10 @@ require 'capybara'
 
 session = Capybara::Session.new(:webkit, my_rack_app)
 session.within("//form[@id='session']") do
-  session.fill_in 'Login', :with => 'user@example.com'
+  session.fill_in 'Email', :with => 'user@example.com'
   session.fill_in 'Password', :with => 'password'
 end
-session.click_link 'Sign in'
+session.click_button 'Sign in'
 ```
 
 ## XPath, CSS and selectors

data/lib/capybara.rb

@@ -7,6 +7,7 @@ module Capybara
   class DriverNotFoundError < CapybaraError; end
   class FrozenInTime < CapybaraError; end
   class ElementNotFound < CapybaraError; end
+  class ModalNotFound < CapybaraError; end
   class Ambiguous < ElementNotFound; end
   class ExpectationNotMet < ElementNotFound; end
   class FileNotFound < CapybaraError; end
@@ -15,6 +16,7 @@ module Capybara
   class InfiniteRedirectError < CapybaraError; end
   class ScopeError < CapybaraError; end
   class WindowError < CapybaraError; end
+  class ReadOnlyElementError < CapybaraError; end
 
   class << self
     attr_accessor :asset_host, :app_host, :run_server, :default_host, :always_include_port
@@ -321,13 +323,18 @@ module Capybara
   require 'capybara/window'
   require 'capybara/server'
   require 'capybara/selector'
-  require 'capybara/query'
   require 'capybara/result'
   require 'capybara/version'
 
+  require 'capybara/queries/base_query'
+  require 'capybara/query'
+  require 'capybara/queries/text_query'
+  require 'capybara/queries/title_query'
+
   require 'capybara/node/finders'
   require 'capybara/node/matchers'
   require 'capybara/node/actions'
+  require 'capybara/node/document_matchers'
   require 'capybara/node/simple'
   require 'capybara/node/base'
   require 'capybara/node/element'

data/lib/capybara/driver/base.rb

@@ -90,6 +90,34 @@ class Capybara::Driver::Base
   def no_such_window_error
     raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#no_such_window_error'
   end
+  
+  
+  ##
+  #
+  # Execute the block, and then accept the modal opened.
+  # @param type [:alert, :confirm, :prompt]
+  # @option options [Numeric] :wait  How long to wait for the modal to appear after executing the block.
+  # @option options [String, Regexp] :text  Text to verify is in the message shown in the modal
+  # @option options [String] :with  Text to fill in in the case of a prompt
+  # @return [String]  the message shown in the modal
+  # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
+  #
+  def accept_modal(type, options={}, &blk)
+    raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#accept_modal'
+  end
+
+  ##
+  #
+  # Execute the block, and then dismiss the modal opened.
+  # @param type [:alert, :confirm, :prompt]
+  # @option options [Numeric] :wait  How long to wait for the modal to appear after executing the block.
+  # @option options [String, Regexp] :text  Text to verify is in the message shown in the modal
+  # @return [String]  the message shown in the modal
+  # @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
+  #
+  def dismiss_modal(type, options={}, &blk)
+    raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#dismiss_modal'
+  end
 
   def invalid_element_errors
     []

data/lib/capybara/driver/node.rb

@@ -25,7 +25,8 @@ module Capybara
       end
 
       # @param value String or Array. Array is only allowed if node has 'multiple' attribute
-      def set(value)
+      # @param options [Hash{}] Driver specific options for how to set a value on a node
+      def set(value, options={})
         raise NotImplementedError
       end
 
@@ -42,7 +43,7 @@ module Capybara
       end
       
       def right_click
-        raise NotImplmentedError
+        raise NotImplementedError
       end
       
       def double_click

data/lib/capybara/helpers.rb

@@ -40,10 +40,9 @@ module Capybara
     # @return [String]         The modified HTML code
     #
     def inject_asset_host(html)
-      if Capybara.asset_host
-        if Nokogiri::HTML(html).css("base").empty? and match = html.match(/<head[^<]*?>/)
+      if Capybara.asset_host && Nokogiri::HTML(html).css("base").empty? 
+         match = html.match(/<head[^<]*?>/)
           html.clone.insert match.end(0), "<base href='#{Capybara.asset_host}' />"
-        end
       else
         html
       end

data/lib/capybara/node/actions.rb

@@ -45,12 +45,15 @@ module Capybara
       #     page.fill_in 'Name', :with => 'Bob'
       #
       # @param [String] locator                 Which field to fill in
-      # @param [Hash{:with => String}] options  The value to fill in
+      # @param [Hash] options
+      # @option options [String] :with     The value to fill in - required
+      # @option options [Hash] :fill_options Driver specific options regarding how to fill fields
       #
       def fill_in(locator, options={})
         raise "Must pass a hash containing 'with'" if not options.is_a?(Hash) or not options.has_key?(:with)
         with = options.delete(:with)
-        find(:fillable_field, locator, options).set(with)
+        fill_options = options.delete(:fill_options)
+        find(:fillable_field, locator, options).set(with, fill_options)
       end
 
       ##

data/lib/capybara/node/base.rb

@@ -97,6 +97,16 @@ module Capybara
         end
       end
 
+      # @api private
+      def find_css(css)
+        base.find_css(css)
+      end
+
+      # @api private
+      def find_xpath(xpath)
+        base.find_xpath(xpath)
+      end
+
     protected
 
       def catch_error?(error, errors = nil)

data/lib/capybara/node/document.rb

@@ -9,6 +9,8 @@ module Capybara
     # @see Capybara::Node
     #
     class Document < Base
+      include Capybara::Node::DocumentMatchers
+
       def inspect
         %(#<Capybara::Document>)
       end

data/lib/capybara/node/document_matchers.rb

@@ -0,0 +1,68 @@
+module Capybara
+  module Node
+    module DocumentMatchers
+      ##
+      # Asserts that the page has the given title.
+      #
+      # @!macro title_query_params
+      #   @overload $0(string, options = {})
+      #     @param string [String]           The string that title should include
+      #   @overload $0(regexp, options = {})
+      #     @param regexp [Regexp]           The regexp that title should match to
+      #   @option options [Numeric] :wait (Capybara.default_wait_time) Time that Capybara will wait for title to eq/match given string/regexp argument
+      # @raise [Capybara::ExpectationNotMet] if the assertion hasn't succeeded during wait time
+      # @return [true]
+      #
+      def assert_title(title, options = {})
+        query = Capybara::Queries::TitleQuery.new(title, options)
+        synchronize(query.wait) do
+          unless query.resolves_for?(self)
+            raise Capybara::ExpectationNotMet, query.failure_message
+          end
+        end
+        return true
+      end
+
+      ##
+      # Asserts that the page doesn't have the given title.
+      #
+      # @macro title_query_params
+      # @raise [Capybara::ExpectationNotMet] if the assertion hasn't succeeded during wait time
+      # @return [true]
+      #
+      def assert_no_title(title, options = {})
+        query = Capybara::Queries::TitleQuery.new(title, options)
+        synchronize(query.wait) do
+          if query.resolves_for?(self)
+            raise Capybara::ExpectationNotMet, query.negative_failure_message
+          end
+        end
+        return true
+      end
+
+      ##
+      # Checks if the page has the given title.
+      #
+      # @macro title_query_params
+      # @return [Boolean]
+      #
+      def has_title?(title, options = {})
+        assert_title(title, options)
+      rescue Capybara::ExpectationNotMet
+        return false
+      end
+
+      ##
+      # Checks if the page doesn't have the given title.
+      #
+      # @macro title_query_params
+      # @return [Boolean]
+      #
+      def has_no_title?(title, options = {})
+        assert_no_title(title, options)
+      rescue Capybara::ExpectationNotMet
+        return false
+      end
+    end
+  end
+end

data/lib/capybara/node/element.rb

@@ -89,9 +89,24 @@ module Capybara
       # Set the value of the form element to the given value.
       #
       # @param [String] value    The new value
+      # @param [Hash{}] options  Driver specific options for how to set the value
       #
-      def set(value)
-        synchronize { base.set(value) }
+      def set(value, options={})
+        options ||= {}
+        
+        driver_supports_options = (base.method(:set).arity != 1)
+
+        unless options.empty? || driver_supports_options 
+          warn "Options passed to Capybara::Node#set but the driver doesn't support them"
+        end
+
+        synchronize do
+          if driver_supports_options
+            base.set(value, options)
+          else
+            base.set(value)
+          end
+        end
       end
 
       ##

data/lib/capybara/node/finders.rb

@@ -29,10 +29,10 @@ module Capybara
         query = Capybara::Query.new(*args)
         synchronize(query.wait) do
           if query.match == :smart or query.match == :prefer_exact
-            result = resolve_query(query, true)
-            result = resolve_query(query, false) if result.size == 0 and not query.exact?
+            result = query.resolve_for(self, true)
+            result = query.resolve_for(self, false) if result.size == 0 && !query.exact?
           else
-            result = resolve_query(query)
+            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}")
@@ -144,8 +144,8 @@ module Capybara
       def all(*args)
         query = Capybara::Query.new(*args)
         synchronize(query.wait) do
-          result = resolve_query(query)
-          raise(Capybara::ExpectationNotMet, result.failure_message) unless result.matches_count?
+          result = query.resolve_for(self)
+          raise Capybara::ExpectationNotMet, result.failure_message unless result.matches_count?
           result
         end
       end
@@ -164,21 +164,6 @@ module Capybara
       def first(*args)
         all(*args).first
       end
-
-    private
-
-      def resolve_query(query, exact=nil)
-        synchronize do
-          elements = if query.selector.format==:css
-            base.find_css(query.css)
-          else
-            base.find_xpath(query.xpath(exact))
-          end.map do |node|
-            Capybara::Node::Element.new(session, node, self, query)
-          end
-          Capybara::Result.new(elements, query)
-        end
-      end
     end
   end
 end