capybara 2.9.0 → 2.10.0

data/lib/capybara/queries/selector_query.rb

@@ -4,14 +4,18 @@ module Capybara
     class SelectorQuery < Queries::BaseQuery
       attr_accessor :selector, :locator, :options, :expression, :find, :negative
 
-      VALID_KEYS = COUNT_KEYS + [:text, :visible, :exact, :match, :wait, :filter_set]
+      VALID_KEYS = COUNT_KEYS + [:text, :id, :class, :visible, :exact, :match, :wait, :filter_set]
       VALID_MATCH = [:first, :smart, :prefer_exact, :one]
 
-      def initialize(*args)
+      def initialize(*args, &filter_block)
         @options = if args.last.is_a?(Hash) then args.pop.dup else {} end
+        @filter_block = filter_block
 
         if args[0].is_a?(Symbol)
-          @selector = Selector.all[args.shift]
+          @selector = Selector.all.fetch(args.shift) do |selector_type|
+            warn "Unknown selector type (:#{selector_type}), defaulting to :#{Capybara.default_selector} - This will raise an exception in a future version of Capybara"
+            nil
+          end
           @locator = args.shift
         else
           @selector = Selector.all.values.find { |s| s.match?(args[0]) }
@@ -39,7 +43,10 @@ module Capybara
       def description
         @description = String.new("#{label} #{locator.inspect}")
         @description << " with text #{options[:text].inspect}" if options[:text]
+        @description << " with id #{options[:id]}" if options[:id]
+        @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
       end
 
@@ -54,7 +61,7 @@ module Capybara
           when :hidden then return false if node.visible?
         end
 
-        query_filters.all? do |name, filter|
+        res = query_filters.all? do |name, filter|
           if options.has_key?(name)
             filter.matches?(node, options[name])
           elsif filter.default?
@@ -63,21 +70,16 @@ module Capybara
             true
           end
         end
+
+        res &&= @filter_block.call(node) unless @filter_block.nil?
+        res
       end
 
       def visible
-        if options.has_key?(:visible)
-          case @options[:visible]
-            when true then :visible
-            when false then :all
-            else @options[:visible]
-          end
-        else
-          if Capybara.ignore_hidden_elements
-            :visible
-          else
-            :all
-          end
+        case (vis = options.fetch(:visible){ @selector.default_visibility })
+          when true then :visible
+          when false then :all
+          else vis
         end
       end
 
@@ -92,15 +94,16 @@ module Capybara
 
       def xpath(exact=nil)
         exact = self.exact? if exact.nil?
-        if @expression.respond_to?(:to_xpath) and exact
+        expr = if @expression.respond_to?(:to_xpath) and exact
           @expression.to_xpath(:exact)
         else
           @expression.to_s
         end
+        filtered_xpath(expr)
       end
 
       def css
-        @expression
+        filtered_css(@expression)
       end
 
       # @api private
@@ -141,7 +144,7 @@ module Capybara
       end
 
       def custom_keys
-        query_filters.keys + @selector.expression_filters
+        @custom_keys ||= query_filters.keys + @selector.expression_filters
       end
 
       def assert_valid_keys
@@ -151,6 +154,32 @@ module Capybara
         end
       end
 
+      def filtered_xpath(expr)
+        if options.has_key?(:id) || options.has_key?(:class)
+          expr = "(#{expr})"
+          expr = "#{expr}[#{XPath.attr(:id) == options[:id]}]" if options.has_key?(:id) && !custom_keys.include?(:id)
+          if options.has_key?(:class) && !custom_keys.include?(:class)
+            class_xpath = Array(options[:class]).map do |klass|
+              "contains(concat(' ',normalize-space(@class),' '),' #{klass} ')"
+            end.join(" and ")
+            expr = "#{expr}[#{class_xpath}]"
+          end
+        end
+        expr
+      end
+
+      def filtered_css(expr)
+        if options.has_key?(:id) || options.has_key?(:class)
+          css_selectors = expr.split(',').map(&:rstrip)
+          expr = css_selectors.map do |sel|
+           sel += "##{Capybara::Selector::CSS.escape(options[:id])}" if options.has_key?(:id) && !custom_keys.include?(:id)
+           sel += Array(options[:class]).map { |k| ".#{Capybara::Selector::CSS.escape(k)}"}.join if options.has_key?(:class) && !custom_keys.include?(:class)
+           sel
+          end.join(", ")
+        end
+        expr
+      end
+
       def warn_exact_usage
         if options.has_key?(:exact) && !supports_exact?
           warn "The :exact option only has an effect on queries using the XPath#is method. Using it with the query \"#{expression.to_s}\" has no effect."

data/lib/capybara/rack_test/driver.rb

@@ -7,9 +7,9 @@ require 'cgi'
 
 class Capybara::RackTest::Driver < Capybara::Driver::Base
   DEFAULT_OPTIONS = {
-    :respect_data_method => false,
-    :follow_redirects => true,
-    :redirect_limit => 5
+    respect_data_method: false,
+    follow_redirects: true,
+    redirect_limit: 5
   }
   attr_reader :app, :options
 

data/lib/capybara/rails.rb

@@ -16,5 +16,5 @@ Capybara.save_path = Rails.root.join('tmp/capybara')
 
 # Override default rack_test driver to respect data-method attributes.
 Capybara.register_driver :rack_test do |app|
-  Capybara::RackTest::Driver.new(app, :respect_data_method => true)
+  Capybara::RackTest::Driver.new(app, respect_data_method: true)
 end

data/lib/capybara/rspec/features.rb

@@ -51,6 +51,6 @@ else
   end
 
   RSpec.configure do |config|
-    config.include(Capybara::Features, :capybara_feature => true)
+    config.include(Capybara::Features, capybara_feature: true)
   end
 end

data/lib/capybara/rspec/matchers.rb

@@ -16,8 +16,9 @@ module Capybara
     class HaveSelector < Matcher
       attr_reader :failure_message, :failure_message_when_negated
 
-      def initialize(*args)
+      def initialize(*args, &filter_block)
         @args = args
+        @filter_block = filter_block
       end
 
       def matches?(actual)
@@ -39,7 +40,7 @@ module Capybara
       end
 
       def query
-        @query ||= Capybara::Queries::SelectorQuery.new(*@args)
+        @query ||= Capybara::Queries::SelectorQuery.new(*@args, &@filter_block)
       end
 
       # RSpec 2 compatibility:
@@ -221,8 +222,8 @@ module Capybara
       alias_method :failure_message_for_should_not, :failure_message_when_negated
     end
 
-    def have_selector(*args)
-      HaveSelector.new(*args)
+    def have_selector(*args, &optional_filter_block)
+      HaveSelector.new(*args, &optional_filter_block)
     end
 
     def match_selector(*args)
@@ -233,16 +234,16 @@ module Capybara
     ::RSpec::Matchers.define_negated_matcher :not_match_selector, :match_selector if defined?(::RSpec::Expectations::Version) && (Gem::Version.new(RSpec::Expectations::Version::STRING) >= Gem::Version.new('3.1'))
 
 
-    def have_xpath(xpath, options={})
-      HaveSelector.new(:xpath, xpath, options)
+    def have_xpath(xpath, options={}, &optional_filter_block)
+      HaveSelector.new(:xpath, xpath, options, &optional_filter_block)
     end
 
     def match_xpath(xpath, options={})
       MatchSelector.new(:xpath, xpath, options)
     end
 
-    def have_css(css, options={})
-      HaveSelector.new(:css, css, options)
+    def have_css(css, options={}, &optional_filter_block)
+      HaveSelector.new(:css, css, options, &optional_filter_block)
     end
 
     def match_css(css, options={})
@@ -262,32 +263,39 @@ module Capybara
       HaveCurrentPath.new(path, options)
     end
 
-    def have_link(locator, options={})
-      HaveSelector.new(:link, locator, options)
+    def have_link(locator=nil, options={}, &optional_filter_block)
+      locator, options = nil, locator if locator.is_a? Hash
+      HaveSelector.new(:link, locator, options, &optional_filter_block)
     end
 
-    def have_button(locator, options={})
-      HaveSelector.new(:button, locator, options)
+    def have_button(locator=nil, options={}, &optional_filter_block)
+      locator, options = nil, locator if locator.is_a? Hash
+      HaveSelector.new(:button, locator, options, &optional_filter_block)
     end
 
-    def have_field(locator, options={})
-      HaveSelector.new(:field, locator, options)
+    def have_field(locator=nil, options={}, &optional_filter_block)
+      locator, options = nil, locator if locator.is_a? Hash
+      HaveSelector.new(:field, locator, options, &optional_filter_block)
     end
 
-    def have_checked_field(locator, options={})
-      HaveSelector.new(:field, locator, options.merge(:checked => true))
+    def have_checked_field(locator=nil, options={}, &optional_filter_block)
+      locator, options = nil, locator if locator.is_a? Hash
+      HaveSelector.new(:field, locator, options.merge(checked: true), &optional_filter_block)
     end
 
-    def have_unchecked_field(locator, options={})
-      HaveSelector.new(:field, locator, options.merge(:unchecked => true))
+    def have_unchecked_field(locator=nil, options={}, &optional_filter_block)
+      locator, options = nil, locator if locator.is_a? Hash
+      HaveSelector.new(:field, locator, options.merge(unchecked: true), &optional_filter_block)
     end
 
-    def have_select(locator, options={})
-      HaveSelector.new(:select, locator, options)
+    def have_select(locator=nil, options={}, &optional_filter_block)
+      locator, options = nil, locator if locator.is_a? Hash
+      HaveSelector.new(:select, locator, options, &optional_filter_block)
     end
 
-    def have_table(locator, options={})
-      HaveSelector.new(:table, locator, options)
+    def have_table(locator=nil, options={}, &optional_filter_block)
+      locator, options = nil, locator if locator.is_a? Hash
+      HaveSelector.new(:table, locator, options, &optional_filter_block)
     end
 
     ##
@@ -299,5 +307,6 @@ module Capybara
     def become_closed(options = {})
       BecomeClosed.new(options)
     end
+
   end
 end

data/lib/capybara/selector/css.rb

@@ -0,0 +1,30 @@
+module Capybara
+  class Selector
+    class CSS
+      def self.escape(str)
+        out = String.new("")
+        value = str.dup
+        out << value.slice!(0...1) if value =~ /^[-_]/
+        out << if value[0] =~ NMSTART
+          value.slice!(0...1)
+        else
+          escape_char(value.slice!(0...1))
+        end
+        out << value.gsub(/[^a-zA-Z0-9_-]/) {|c| escape_char c}
+        out
+      end
+
+      def self.escape_char(c)
+        return "\\%06x" % c.ord() unless c =~ %r{[ -/:-~]}
+        "\\#{c}"
+      end
+
+      S = '\u{80}-\u{D7FF}\u{E000}-\u{FFFD}\u{10000}-\u{10FFFF}'
+      H = /[0-9a-fA-F]/
+      UNICODE  = /\\#{H}{1,6}[ \t\r\n\f]?/
+      NONASCII = /[#{S}]/
+      ESCAPE   = /#{UNICODE}|\\[ -~#{S}]/
+      NMSTART  = /[_a-zA-Z]|#{NONASCII}|#{ESCAPE}/
+    end
+  end
+end

data/lib/capybara/selector/selector.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'capybara/selector/filter_set'
+require 'capybara/selector/css'
 require 'xpath'
 
 #Patch XPath to allow a nil condition in where
@@ -49,6 +50,7 @@ module Capybara
       @format = nil
       @expression = nil
       @expression_filters = []
+      @default_visibility = nil
       instance_eval(&block)
     end
 
@@ -185,6 +187,27 @@ module Capybara
       @filter_set.describe &block
     end
 
+    ##
+    #
+    # Set the default visibility mode that shouble be used if no visibile option is passed when using the selector.
+    # If not specified will default to the behavior indicated by Capybara.ignore_hidden_elements
+    #
+    # @param [Symbol] default_visibility  Only find elements with the specified visibility:
+    #                                              * :all - finds visible and invisible elements.
+    #                                              * :hidden - only finds invisible elements.
+    #                                              * :visible - only finds visible elements.
+    def visible(default_visibility)
+      @default_visibility = default_visibility
+    end
+
+    def default_visibility
+      if @default_visibility.nil?
+        Capybara.ignore_hidden_elements
+      else
+        @default_visibility
+      end
+    end
+
     private
 
     def locate_field(xpath, locator, options={})
@@ -201,7 +224,7 @@ module Capybara
         locate_xpath += XPath.descendant(:label)[XPath.string.n.is(locator)].descendant(xpath)
       end
 
-      locate_xpath = [:id, :name, :placeholder, :class].inject(locate_xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
+      locate_xpath = [:name, :placeholder].inject(locate_xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
       locate_xpath
     end
 

data/lib/capybara/selector.rb

@@ -65,7 +65,7 @@ end
 # @filter [Boolean] :disabled Match disabled field?
 # @filter [Boolean] :multiple Match fields that accept multiple values
 Capybara.add_selector(:field) do
-  xpath(:id, :name, :placeholder, :type, :class) do |locator, options|
+  xpath(:name, :placeholder, :type) do |locator, options|
     xpath = XPath.descendant(:input, :textarea, :select)[~XPath.attr(:type).one_of('submit', 'image', 'hidden')]
     if options[:type]
       type=options[:type].to_s
@@ -105,12 +105,10 @@ end
 # @filter [String, Array<String>] :class Matches the class(es) provided
 #
 Capybara.add_selector(:fieldset) do
-  xpath(:id, :legend, :class) do |locator, options|
+  xpath(:legend) do |locator, options|
     xpath = XPath.descendant(:fieldset)
     xpath = xpath[XPath.attr(:id).equals(locator.to_s) | XPath.child(:legend)[XPath.string.n.is(locator.to_s)]] unless locator.nil?
-    xpath = xpath[XPath.attr(:id).equals(options[:id])] if options[:id]
     xpath = xpath[XPath.child(:legend)[XPath.string.n.is(options[:legend])]] if options[:legend]
-    xpath = xpath[find_by_attr(:class, options[:class])]
     xpath
   end
 end
@@ -128,7 +126,7 @@ end
 # @filter [String, Regexp] :href  Matches the normalized href of the link
 #
 Capybara.add_selector(:link) do
-  xpath(:id, :title, :alt, :class) do |locator, options={}|
+  xpath(:title, :alt) do |locator, options={}|
     xpath = XPath.descendant(:a)[XPath.attr(:href)]
     unless locator.nil?
       locator = locator.to_s
@@ -139,7 +137,7 @@ Capybara.add_selector(:link) do
       matchers |= XPath.attr(:'aria-label').is(locator) if Capybara.enable_aria_label
       xpath = xpath[matchers]
     end
-    xpath = [:id, :title, :class].inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
+    xpath = [:title].inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
     xpath = xpath[XPath.descendant(:img)[XPath.attr(:alt).equals(options[:alt])]] if options[:alt]
     xpath
   end
@@ -159,7 +157,7 @@ end
 #
 #  Find buttons ( input [of type submit, reset, image, button] or button elements )
 #
-# @locator Matches the id, value, or title attributes, string content of a button, or the alt attribute of an image type button
+# @locator Matches the id, value, or title attributes, string content of a button, or the alt attribute of an image type button or of a descendant image of a button
 #
 # @filter [String] :id  Matches the id attribute
 # @filter [String] :title Matches the title attribute
@@ -167,7 +165,7 @@ end
 # @filter [String] :value Matches the value of an input button
 #
 Capybara.add_selector(:button) do
-  xpath(:id, :value, :title, :class) do |locator, options={}|
+  xpath(:value, :title) do |locator, options={}|
     input_btn_xpath = XPath.descendant(:input)[XPath.attr(:type).one_of('submit', 'reset', 'image', 'button')]
     btn_xpath = XPath.descendant(:button)
     image_btn_xpath = XPath.descendant(:input)[XPath.attr(:type).equals('image')]
@@ -179,7 +177,7 @@ Capybara.add_selector(:button) do
 
       input_btn_xpath = input_btn_xpath[locator_matches]
 
-      btn_xpath = btn_xpath[locator_matches | XPath.string.n.is(locator)]
+      btn_xpath = btn_xpath[locator_matches | XPath.string.n.is(locator) | XPath.descendant(:img)[XPath.attr(:alt).is(locator)]]
 
       alt_matches = XPath.attr(:alt).is(locator)
       alt_matches |= XPath.attr(:'aria-label').is(locator) if Capybara.enable_aria_label
@@ -233,7 +231,7 @@ end
 #
 Capybara.add_selector(:fillable_field) do
   label "field"
-  xpath(:id, :name, :placeholder, :class) do |locator, options|
+  xpath(:name, :placeholder) do |locator, options|
     xpath = XPath.descendant(:input, :textarea)[~XPath.attr(:type).one_of('submit', 'image', 'radio', 'checkbox', 'hidden', 'file')]
     locate_field(xpath, locator, options)
   end
@@ -267,7 +265,7 @@ end
 #
 Capybara.add_selector(:radio_button) do
   label "radio button"
-  xpath(:id, :name, :class) do |locator, options|
+  xpath(:name) do |locator, options|
     xpath = XPath.descendant(:input)[XPath.attr(:type).equals('radio')]
     locate_field(xpath, locator, options)
   end
@@ -298,7 +296,7 @@ end
 # @filter [String] :option Match the value
 #
 Capybara.add_selector(:checkbox) do
-  xpath(:id, :name, :class) do |locator, options|
+  xpath(:name) do |locator, options|
     xpath = XPath.descendant(:input)[XPath.attr(:type).equals('checkbox')]
     locate_field(xpath, locator, options)
   end
@@ -332,7 +330,7 @@ end
 #
 Capybara.add_selector(:select) do
   label "select box"
-  xpath(:id, :name, :placeholder, :class) do |locator, options|
+  xpath(:name, :placeholder) do |locator, options|
     xpath = XPath.descendant(:select)
     locate_field(xpath, locator, options)
   end
@@ -408,7 +406,7 @@ end
 #
 Capybara.add_selector(:file_field) do
   label "file field"
-  xpath(:id, :name, :class) do |locator, options|
+  xpath(:name) do |locator, options|
     xpath = XPath.descendant(:input)[XPath.attr(:type).equals('file')]
     locate_field(xpath, locator, options)
   end
@@ -431,21 +429,25 @@ end
 #
 Capybara.add_selector(:label) do
   label "label"
-  xpath do |locator|
+  xpath(:for) do |locator, options|
     xpath = XPath.descendant(:label)
     xpath = xpath[XPath.string.n.is(locator.to_s) | XPath.attr(:id).equals(locator.to_s)] unless locator.nil?
+    if options.has_key?(:for) && !options[:for].is_a?(Capybara::Node::Element)
+      xpath = xpath[XPath.attr(:for).equals(options[:for].to_s).or((~XPath.attr(:for)).and(XPath.descendant()[XPath.attr(:id).equals(options[:for].to_s)]))]
+    end
     xpath
   end
 
   filter(:for) do |node, field_or_value|
     if field_or_value.is_a? Capybara::Node::Element
-      if field_or_value[:id] && (field_or_value[:id] == node[:for])
-        true
+      if node[:for]
+        field_or_value[:id] == node[:for]
       else
         field_or_value.find_xpath('./ancestor::label[1]').include? node.base
       end
     else
-      node[:for] == field_or_value.to_s
+      #Non element values were handled through the expression filter
+      true
     end
   end
 
@@ -466,17 +468,15 @@ end
 # @filter [String, Array<String>] :class  Matches the class(es) provided
 #
 Capybara.add_selector(:table) do
-  xpath(:id, :caption, :class) do |locator, options|
+  xpath(:caption) do |locator, options|
     xpath = XPath.descendant(:table)
     xpath = xpath[XPath.attr(:id).equals(locator.to_s) | XPath.descendant(:caption).is(locator.to_s)] unless locator.nil?
     xpath = xpath[XPath.descendant(:caption).equals(options[:caption])] if options[:caption]
-    xpath = [:id, :class].inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
     xpath
   end
 
   describe do |options|
     desc = String.new
-    desc << " with id #{options[:id]}" if options[:id]
     desc << " with caption #{options[:caption]}" if options[:caption]
     desc
   end
@@ -492,7 +492,7 @@ end
 # @filter [String, Array<String>] :class  Matches the class(es) provided
 #
 Capybara.add_selector(:frame) do
-  xpath(:id, :name, :class) do |locator, options|
+  xpath(:name) do |locator, options|
     xpath = XPath.descendant(:iframe) + XPath.descendant(:frame)
     xpath = xpath[XPath.attr(:id).equals(locator.to_s) | XPath.attr(:name).equals(locator)] unless locator.nil?
     xpath = expression_filters.inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
@@ -501,7 +501,6 @@ Capybara.add_selector(:frame) do
 
   describe do |options|
     desc = String.new
-    desc << " with id #{options[:id]}" if options[:id]
     desc << " with name #{options[:name]}" if options[:name]
     desc
   end

data/lib/capybara/session.rb

@@ -20,7 +20,7 @@ module Capybara
   # +current_path, and so on. It also delegate a number of methods to a Capybara::Document, representing
   # the current HTML document. This allows interaction:
   #
-  #     session.fill_in('q', :with => 'Capybara')
+  #     session.fill_in('q', with: 'Capybara')
   #     session.click_button('Search')
   #     expect(session).to have_content('Capybara')
   #
@@ -264,7 +264,7 @@ module Capybara
     # to the given element.
     #
     #     within(:xpath, '//div[@id="delivery-address"]') do
-    #       fill_in('Street', :with => '12 Main Street')
+    #       fill_in('Street', with: '12 Main Street')
     #     end
     #
     # Just as with `find`, if multiple elements match the selector given to
@@ -275,13 +275,13 @@ module Capybara
     # assumed to be of the type set in Capybara.default_selector.
     #
     #     within('div#delivery-address') do
-    #       fill_in('Street', :with => '12 Main Street')
+    #       fill_in('Street', with: '12 Main Street')
     #     end
     #
     # Note that a lot of uses of `within` can be replaced more succinctly with
     # chaining:
     #
-    #     find('div#delivery-address').fill_in('Street', :with => '12 Main Street')
+    #     find('div#delivery-address').fill_in('Street', with: '12 Main Street')
     #
     # @overload within(*find_args)
     #   @param (see Capybara::Node::Finders#all)

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec '#accept_alert', :requires => [:modals] do
+Capybara::SpecHelper.spec '#accept_alert', requires: [:modals] do
   before do
     @session.visit('/with_js')
   end
@@ -10,14 +10,14 @@ Capybara::SpecHelper.spec '#accept_alert', :requires => [:modals] do
     end
     expect(@session).to have_xpath("//a[@id='open-alert' and @opened='true']")
   end
-  
+
   it "should accept the alert if the text matches" do
     @session.accept_alert 'Alert opened' do
       @session.click_link('Open alert')
     end
     expect(@session).to have_xpath("//a[@id='open-alert' and @opened='true']")
   end
-  
+
   it "should not accept the alert if the text doesnt match" do
     expect do
       @session.accept_alert 'Incorrect Text' do
@@ -47,7 +47,7 @@ Capybara::SpecHelper.spec '#accept_alert', :requires => [:modals] do
       end
       expect(message).to eq('Delayed alert opened')
     end
-    
+
     it "should allow to adjust the delay" do
       @session.accept_alert wait: 4 do
         @session.click_link('Open slow alert')

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec '#accept_confirm', :requires => [:modals] do
+Capybara::SpecHelper.spec '#accept_confirm', requires: [:modals] do
   before do
     @session.visit('/with_js')
   end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec '#accept_prompt', :requires => [:modals] do
+Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
   before do
     @session.visit('/with_js')
   end
@@ -17,21 +17,21 @@ Capybara::SpecHelper.spec '#accept_prompt', :requires => [:modals] do
     end
     expect(message).to eq('Prompt opened')
   end
-  
+
   it "should accept the prompt with a response" do
     @session.accept_prompt with: 'the response' do
       @session.click_link('Open prompt')
     end
     expect(@session).to have_xpath("//a[@id='open-prompt' and @response='the response']")
   end
-  
+
   it "should accept the prompt if the message matches" do
     @session.accept_prompt 'Prompt opened', with: 'matched' do
       @session.click_link('Open prompt')
     end
     expect(@session).to have_xpath("//a[@id='open-prompt' and @response='matched']")
   end
-  
+
   it "should not accept the prompt if the message doesn't match" do
     expect do
       @session.accept_prompt 'Incorrect Text', with: 'not matched' do
@@ -39,7 +39,7 @@ Capybara::SpecHelper.spec '#accept_prompt', :requires => [:modals] do
       end
     end.to raise_error(Capybara::ModalNotFound)
   end
-  
+
 
   it "should return the message presented" do
     message = @session.accept_prompt with: 'the response' do