capybara 2.3.0 → 2.4.0

data/lib/capybara/rack_test/node.rb

@@ -27,7 +27,11 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     elsif input_field?
       set_input(value)
     elsif textarea?
-      native.content = value.to_s unless self[:readonly]
+      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
+      end
     end
   end
 
@@ -46,7 +50,7 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
   end
 
   def click
-    if tag_name == 'a'
+    if tag_name == 'a' && !self[:href].nil?
       method = self["data-method"] if driver.options[:respect_data_method]
       method ||= :get
       driver.follow(method, self[:href].to_s)
@@ -165,7 +169,11 @@ private
       end
       native.remove
     else
-      native['value'] = value.to_s unless self[:readonly]
+      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['value'] = value.to_s
+      end
     end
   end
 

data/lib/capybara/result.rb

@@ -51,7 +51,7 @@ module Capybara
     end
 
     def negative_failure_message
-      failure_message.sub(/(to be found|to find)/, 'not \1')
+      failure_message.sub(/(to find)/, 'not \1')
     end
   end
 end

data/lib/capybara/rspec/features.rb

@@ -1,28 +1,45 @@
-module Capybara
-  module Features
-    def self.included(base)
-      base.instance_eval do
-        alias :background :before
-        alias :scenario :it
-        alias :xscenario :xit
-        alias :given :let
-        alias :given! :let!
-        alias :feature :describe
+if RSpec::Core::Version::STRING.to_f >= 3.0
+  RSpec.shared_context "Capybara Features", :capybara_feature => true do
+    instance_eval do
+      alias background before
+      alias given let
+      alias given! let!
+    end
+  end
+
+  RSpec.configure do |config|
+    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
+  end
+else
+  module Capybara
+    module Features
+      def self.included(base)
+        base.instance_eval do
+          alias :background :before
+          alias :scenario :it
+          alias :xscenario :xit
+          alias :given :let
+          alias :given! :let!
+          alias :feature :describe
+        end
       end
     end
   end
-end
 
 
-def self.feature(*args, &block)
-  options = if args.last.is_a?(Hash) then args.pop else {} end
-  options[:capybara_feature] = true
-  options[:type] = :feature
-  options[:caller] ||= caller
-  args.push(options)
+  def self.feature(*args, &block)
+    options = if args.last.is_a?(Hash) then args.pop else {} end
+    options[:capybara_feature] = true
+    options[:type] = :feature
+    options[:caller] ||= caller
+    args.push(options)
 
-  #call describe on RSpec in case user has expose_dsl_globally set to false
-  RSpec.describe(*args, &block)
-end
+    #call describe on RSpec in case user has expose_dsl_globally set to false
+    RSpec.describe(*args, &block)
+  end
 
-RSpec.configuration.include Capybara::Features, :capybara_feature => true
+  RSpec.configuration.include Capybara::Features, :capybara_feature => true
+end

data/lib/capybara/rspec/matchers.rb

@@ -1,6 +1,8 @@
 module Capybara
   module RSpecMatchers
     class Matcher
+      include ::RSpec::Matchers::Composable if defined?(::RSpec::Version) && ::RSpec::Version::STRING.to_f >= 3.0
+
       def wrap(actual)
         if actual.respond_to?("has_selector?")
           actual
@@ -11,16 +13,24 @@ module Capybara
     end
 
     class HaveSelector < Matcher
+      attr_reader :failure_message, :failure_message_when_negated
+
       def initialize(*args)
         @args = args
       end
 
       def matches?(actual)
         wrap(actual).assert_selector(*@args)
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message = e.message
+        return false
       end
 
       def does_not_match?(actual)
         wrap(actual).assert_no_selector(*@args)
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message_when_negated = e.message
+        return false
       end
 
       def description
@@ -30,41 +40,40 @@ module Capybara
       def query
         @query ||= Capybara::Query.new(*@args)
       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 HaveText < Matcher
       attr_reader :type, :content, :options
 
+      attr_reader :failure_message, :failure_message_when_negated
+
       def initialize(*args)
+        @args = args.dup
+
+        # are set just for backwards compatability
         @type = args.shift if args.first.is_a?(Symbol)
         @content = args.shift
         @options = (args.first.is_a?(Hash))? args.first : {}
       end
 
       def matches?(actual)
-        @actual = wrap(actual)
-        @actual.has_text?(type, content, options)
+        wrap(actual).assert_text(*@args)
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message = e.message
+        return false
       end
 
       def does_not_match?(actual)
-        @actual = wrap(actual)
-        @actual.has_no_text?(type, content, options)
-      end
-
-      def failure_message
-        message = Capybara::Helpers.failure_message(description, options)
-        message << " in #{format(@actual.text(type))}"
-        message
-      end
-
-      def failure_message_when_negated
-        failure_message.sub(/(to find)/, 'not \1')
+        wrap(actual).assert_no_text(*@args)
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message_when_negated = e.message
+        return false
       end
 
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
-
       def description
         "text #{format(content)}"
       end
@@ -73,40 +82,45 @@ module Capybara
         content = Capybara::Helpers.normalize_whitespace(content) unless content.is_a? Regexp
         content.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 HaveTitle < Matcher
       attr_reader :title
 
-      def initialize(title)
-        @title = title
+      attr_reader :failure_message, :failure_message_when_negated
+
+      def initialize(*args)
+        @args = args
+
+        # are set just for backwards compatability
+        @title = args.first
       end
 
       def matches?(actual)
-        @actual = wrap(actual)
-        @actual.has_title?(title)
+        wrap(actual).assert_title(*@args)
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message = e.message
+        return false
       end
 
       def does_not_match?(actual)
-        @actual = wrap(actual)
-        @actual.has_no_title?(title)
-      end
-
-      def failure_message
-        "expected there to be title #{title.inspect} in #{@actual.title.inspect}"
+        wrap(actual).assert_no_title(*@args)
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message_when_negated = e.message
+        return false
       end
 
-      def failure_message_when_negated
-        "expected there not to be title #{title.inspect} in #{@actual.title.inspect}"
+      def description
+        "have title #{title.inspect}"
       end
 
       # RSpec 2 compatibility:
       alias_method :failure_message_for_should, :failure_message
       alias_method :failure_message_for_should_not, :failure_message_when_negated
-
-      def description
-        "have title #{title.inspect}"
-      end
     end
 
     class BecomeClosed
@@ -117,10 +131,11 @@ module Capybara
       def matches?(window)
         @window = window
         start_time = Time.now
-        while window.exists? && (Time.now - start_time) < @wait_time
+        while window.exists?
+          return false if (Time.now - start_time) > @wait_time
           sleep 0.05
         end
-        window.closed?
+        true
       end
 
       def failure_message
@@ -153,8 +168,8 @@ module Capybara
     end
     alias_method :have_content, :have_text
 
-    def have_title(title)
-      HaveTitle.new(title)
+    def have_title(title, options = {})
+      HaveTitle.new(title, options)
     end
 
     def have_link(locator, options={})

data/lib/capybara/selector.rb

@@ -5,6 +5,7 @@ module Capybara
         @name = name
         @block = block
         @options = options
+        @options[:valid_values] = [true,false] if options[:boolean]
       end
 
       def default?
@@ -16,6 +17,9 @@ module Capybara
       end
 
       def matches?(node, value)
+        if @options.has_key?(:valid_values) && !Array(@options[:valid_values]).include?(value)
+          warn "Invalid value #{value.inspect} passed to filter #{@name}"
+        end
         @block.call(node, value)
       end
     end
@@ -42,6 +46,7 @@ module Capybara
       @match = nil
       @label = nil
       @failure_message = nil
+      @description = nil
       instance_eval(&block)
     end
 
@@ -68,6 +73,10 @@ module Capybara
       @label
     end
 
+    def description(options={})
+      (@description && @description.call(options)).to_s
+    end
+
     def call(locator)
       if @format==:css
         @css.call(locator)
@@ -83,6 +92,10 @@ module Capybara
     def filter(name, options={}, &block)
       @custom_filters[name] = Filter.new(name, block, options)
     end
+
+    def describe &block
+      @description = block
+    end
   end
 end
 
@@ -100,9 +113,9 @@ end
 
 Capybara.add_selector(:field) do
   xpath { |locator| XPath::HTML.field(locator) }
-  filter(:checked) { |node, value| not(value ^ node.checked?) }
-  filter(:unchecked) { |node, value| (value ^ node.checked?) }
-  filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
+  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(:with) { |node, with| node.value == with.to_s }
   filter(:type) do |node, type|
     if ['textarea', 'select'].include?(type)
@@ -111,6 +124,16 @@ Capybara.add_selector(:field) do
       node[:type] == type
     end
   end
+  describe do |options|
+    desc, states = "", []
+    desc << " of type #{options[:type].inspect}" if options[:type]
+    desc << " with value #{options[:with].to_s.inspect}" if options.has_key?(:with)
+    states << 'checked' if options[:checked] || (options.has_key?(:unchecked) && !options[:unchecked])
+    states << 'not checked' if options[:unchecked] || (options.has_key?(:checked) && !options[:checked])
+    states << 'disabled' if options[:disabled]
+    desc << " that is #{states.join(' and ')}" unless states.empty?
+    desc
+  end
 end
 
 Capybara.add_selector(:fieldset) do
@@ -120,7 +143,8 @@ end
 Capybara.add_selector(:link_or_button) do
   label "link or button"
   xpath { |locator| XPath::HTML.link_or_button(locator) }
-  filter(:disabled, :default => false) { |node, value| node.tag_name == "a" or not(value ^ node.disabled?) }
+  filter(:disabled, default: false, boolean: true) { |node, value| node.tag_name == "a" or not(value ^ node.disabled?) }
+  describe { |options| " that is disabled" if options[:disabled] }
 end
 
 Capybara.add_selector(:link) do
@@ -128,34 +152,55 @@ Capybara.add_selector(:link) do
   filter(:href) do |node, href|
     node.first(:xpath, XPath.axis(:self)[XPath.attr(:href).equals(href.to_s)])
   end
+  describe { |options| " with href #{options[:href].inspect}" if options[:href] }
 end
 
 Capybara.add_selector(:button) do
   xpath { |locator| XPath::HTML.button(locator) }
-  filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
+  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
+  describe { |options| " that is disabled" if options[:disabled] }
 end
 
 Capybara.add_selector(:fillable_field) do
   label "field"
   xpath { |locator| XPath::HTML.fillable_field(locator) }
-  filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
+  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
+  describe { |options| " that is disabled" if options[:disabled] }
 end
 
 Capybara.add_selector(:radio_button) do
   label "radio button"
   xpath { |locator| XPath::HTML.radio_button(locator) }
-  filter(:checked) { |node, value| not(value ^ node.checked?) }
-  filter(:unchecked) { |node, value| (value ^ node.checked?) }
+  filter(:checked, boolean: true) { |node, value| not(value ^ node.checked?) }
+  filter(:unchecked, boolean: true) { |node, value| (value ^ node.checked?) }
   filter(:option)  { |node, value|  node.value == value.to_s }
-  filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
+  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
+  describe do |options|
+    desc, states = "", []
+    desc << " with value #{options[:option].inspect}" if options[:option]
+    states << 'checked' if options[:checked] || (options.has_key?(:unchecked) && !options[:unchecked])
+    states << 'not checked' if options[:unchecked] || (options.has_key?(:checked) && !options[:checked])
+    states << 'disabled' if options[:disabled]
+    desc << " that is #{states.join(' and ')}" unless states.empty?
+    desc
+  end
 end
 
 Capybara.add_selector(:checkbox) do
   xpath { |locator| XPath::HTML.checkbox(locator) }
-  filter(:checked) { |node, value| not(value ^ node.checked?) }
-  filter(:unchecked) { |node, value| (value ^ node.checked?) }
+  filter(:checked, boolean: true) { |node, value| not(value ^ node.checked?) }
+  filter(:unchecked, boolean: true) { |node, value| (value ^ node.checked?) }
   filter(:option)  { |node, value|  node.value == value.to_s }
-  filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
+  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
+  describe do |options|
+    desc, states = "", []
+    desc << " with value #{options[:option].inspect}" if options[:option]
+    states << 'checked' if options[:checked] || (options.has_key?(:unchecked) && !options[:unchecked])
+    states << 'not checked' if options[:unchecked] || (options.has_key?(:checked) && !options[:checked])
+    states << 'disabled' if options[:disabled]
+    desc << " that is #{states.join(' and ')}" unless states.empty?
+    desc
+  end
 end
 
 Capybara.add_selector(:select) do
@@ -170,7 +215,15 @@ Capybara.add_selector(:select) do
     actual = node.all(:xpath, './/option').select { |option| option.selected? }.map { |option| option.text }
     [selected].flatten.sort == actual.sort
   end
-  filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
+  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
+  describe do |options|
+    desc = ""
+    desc << " with options #{options[:options].inspect}" if options[:options]
+    desc << " with at least options #{options[:with_options].inspect}" if options[:with_options]
+    desc << " with #{options[:selected].inspect} selected" if options[:selected]
+    desc << " that is disabled" if options[:disabled]
+    desc
+  end
 end
 
 Capybara.add_selector(:option) do
@@ -180,7 +233,8 @@ end
 Capybara.add_selector(:file_field) do
   label "file field"
   xpath { |locator| XPath::HTML.file_field(locator) }
-  filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
+  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
+  describe { |options| " that is disabled" if options[:disabled] }
 end
 
 Capybara.add_selector(:table) do