capybara 2.0.3 → 2.1.0

data/lib/capybara/selector.rb

@@ -1,7 +1,26 @@
 module Capybara
   class Selector
-    attr_reader :name, :custom_filters
+    class Filter
+      def initialize(name, block, options={})
+        @name = name
+        @block = block
+        @options = options
+      end
+
+      def default?
+        @options.has_key?(:default)
+      end
+
+      def default
+        @options[:default]
+      end
+
+      def matches?(node, value)
+        @block.call(node, value)
+      end
+    end
 
+    attr_reader :name, :custom_filters, :format
 
     class << self
       def all
@@ -27,16 +46,16 @@ module Capybara
     end
 
     def xpath(&block)
+      @format = :xpath
       @xpath = block if block
       @xpath
     end
 
     # Same as xpath, but wrap in XPath.css().
     def css(&block)
-      if block
-        @xpath = xpath { |*args| XPath.css(block.call(*args)) }
-      end
-      @xpath
+      @format = :css
+      @css = block if block
+      @css
     end
 
     def match(&block)
@@ -50,15 +69,19 @@ module Capybara
     end
 
     def call(locator)
-      @xpath.call(locator)
+      if @format==:css
+        @css.call(locator)
+      else
+        @xpath.call(locator)
+      end
     end
 
     def match?(locator)
       @match and @match.call(locator)
     end
 
-    def filter(name, &block)
-      @custom_filters[name] = block
+    def filter(name, options={}, &block)
+      @custom_filters[name] = Filter.new(name, block, options)
     end
   end
 end
@@ -79,8 +102,15 @@ 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(:with) { |node, with| node.value == with }
-  filter(:type) { |node, type| node[:type] == type }
+  filter(:type) do |node, type|
+    if ['textarea', 'select'].include?(type)
+      node.tag_name == type
+    else
+      node[:type] == type
+    end
+  end
 end
 
 Capybara.add_selector(:fieldset) do
@@ -90,6 +120,7 @@ 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?) }
 end
 
 Capybara.add_selector(:link) do
@@ -101,11 +132,13 @@ end
 
 Capybara.add_selector(:button) do
   xpath { |locator| XPath::HTML.button(locator) }
+  filter(:disabled, :default => false) { |node, value| not(value ^ node.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?) }
 end
 
 Capybara.add_selector(:radio_button) do
@@ -113,12 +146,14 @@ Capybara.add_selector(:radio_button) do
   xpath { |locator| XPath::HTML.radio_button(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?) }
 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(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
 end
 
 Capybara.add_selector(:select) do
@@ -133,6 +168,7 @@ 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?) }
 end
 
 Capybara.add_selector(:option) do
@@ -142,10 +178,7 @@ end
 Capybara.add_selector(:file_field) do
   label "file field"
   xpath { |locator| XPath::HTML.file_field(locator) }
-end
-
-Capybara.add_selector(:content) do
-  xpath { |content| XPath::HTML.content(content) }
+  filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
 end
 
 Capybara.add_selector(:table) do

data/lib/capybara/selenium/driver.rb

@@ -1,5 +1,3 @@
-require 'selenium-webdriver'
-
 class Capybara::Selenium::Driver < Capybara::Driver::Base
   DEFAULT_OPTIONS = {
     :browser => :firefox
@@ -24,9 +22,20 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def initialize(app, options={})
+    begin
+      require 'selenium-webdriver'
+    rescue LoadError => e
+      if e.message =~ /selenium-webdriver/
+        raise LoadError, "Capybara's selenium driver is unable to load `selenium-webdriver`, please install the gem and add `gem 'selenium-webdriver'` to your Gemfile if you are using bundler."
+      else
+        raise e
+      end
+    end
+
     @app = app
     @browser = nil
     @exit_status = nil
+    @frame_handles = {}
     @options = DEFAULT_OPTIONS.merge(options)
   end
 
@@ -38,14 +47,22 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.page_source
   end
 
+  def title
+    browser.title
+  end
+
   def current_url
     browser.current_url
   end
 
-  def find(selector)
+  def find_xpath(selector)
     browser.find_elements(:xpath, selector).map { |node| Capybara::Selenium::Node.new(self, node) }
   end
 
+  def find_css(selector)
+    browser.find_elements(:css, selector).map { |node| Capybara::Selenium::Node.new(self, node) }
+  end
+
   def wait?; true; end
   def needs_server?; true; end
 
@@ -74,12 +91,29 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     end
   end
 
-  def within_frame(frame_id)
-    old_window = browser.window_handle
-    browser.switch_to.frame(frame_id)
+  ##
+  #
+  # Webdriver supports frame name, id, index(zero-based) or {Capybara::Element} to find iframe
+  #
+  # @overload within_frame(index)
+  #   @param [Integer] index                 index of a frame
+  # @overload within_frame(name_or_id)
+  #   @param [String] name_or_id             name or id of a frame
+  # @overload within_frame(element)
+  #   @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)
     yield
   ensure
-    browser.switch_to.window old_window
+    # 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) }
   end
 
   def find_window( selector )
@@ -111,4 +145,5 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   def invalid_element_errors
     [Selenium::WebDriver::Error::StaleElementReferenceError, Selenium::WebDriver::Error::UnhandledError, Selenium::WebDriver::Error::ElementNotVisibleError]
   end
+
 end

data/lib/capybara/selenium/node.rb

@@ -1,9 +1,14 @@
 class Capybara::Selenium::Node < Capybara::Driver::Node
-  def text
+  def visible_text
     # Selenium doesn't normalize Unicode whitespace.
     Capybara::Helpers.normalize_whitespace(native.text)
   end
 
+  def all_text
+    text = driver.browser.execute_script("return arguments[0].textContent", native)
+    Capybara::Helpers.normalize_whitespace(text)
+  end
+
   def [](name)
     native.attribute(name.to_s)
   rescue Selenium::WebDriver::Error::WebDriverError
@@ -32,7 +37,8 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
       path_names = value.to_s.empty? ? [] : value
       native.send_keys(*path_names)
     elsif tag_name == 'textarea' or tag_name == 'input'
-      driver.browser.execute_script "arguments[0].value = ''", native
+      #script can change a readonly element which user input cannot, so dont execute if readonly
+      driver.browser.execute_script "arguments[0].value = ''", native unless self[:readonly]
       native.send_keys(value.to_s)
     end
   end
@@ -52,6 +58,10 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     native.click
   end
 
+  def hover
+    driver.browser.action.move_to(native).perform
+  end
+  
   def drag_to(element)
     driver.browser.action.drag_and_drop(native, element.native).perform
   end
@@ -70,12 +80,20 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     selected and selected != "false"
   end
 
+  def disabled?
+    !native.enabled?
+  end
+
   alias :checked? :selected?
 
-  def find(locator)
+  def find_xpath(locator)
     native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
   end
-
+  
+  def find_css(locator)
+    native.find_elements(:css, locator).map { |n| self.class.new(driver, n) }
+  end
+  
   def ==(other)
     native == other.native
   end
@@ -84,6 +102,6 @@ private
 
   # a reference to the select node if this is an option node
   def select_node
-    find('./ancestor::select').first
+    find_xpath('./ancestor::select').first
   end
 end

data/lib/capybara/server.rb

@@ -62,7 +62,7 @@ module Capybara
       if res.is_a?(Net::HTTPSuccess) or res.is_a?(Net::HTTPRedirection)
         return res.body == @app.object_id.to_s
       end
-    rescue Errno::ECONNREFUSED, Errno::EBADF
+    rescue SystemCallError
       return false
     end
 

data/lib/capybara/session.rb

@@ -40,11 +40,13 @@ module Capybara
       :body, :html, :current_url, :current_host, :evaluate_script, :source,
       :visit, :within, :within_fieldset, :within_table, :within_frame,
       :within_window, :current_path, :save_page, :save_and_open_page,
-      :save_screenshot, :reset_session!, :response_headers, :status_code
+      :save_screenshot, :reset_session!, :response_headers, :status_code,
+      :title, :has_title?, :has_no_title?, :current_scope
     ]
     DSL_METHODS = NODE_METHODS + SESSION_METHODS
 
     attr_reader :mode, :app, :server
+    attr_accessor :synchronized
 
     def initialize(mode, app=nil)
       @mode = mode
@@ -74,7 +76,7 @@ module Capybara
     def reset!
       driver.reset! if @touched
       @touched = false
-      raise @server.error if @server and @server.error
+      raise @server.error if Capybara.raise_server_errors and @server and @server.error
     ensure
       @server.reset_error! if @server
     end
@@ -137,6 +139,14 @@ module Capybara
       driver.current_url
     end
 
+    ##
+    #
+    # @return [String] Title of the current page
+    #
+    def title
+      driver.title
+    end
+
     ##
     #
     # Navigate to the given URL. The URL can either be a relative URL or an absolute URL
@@ -243,13 +253,16 @@ module Capybara
 
     ##
     #
-    # Execute the given block within the given iframe given the id of that iframe. Only works on
-    # some drivers (e.g. Selenium)
+    # Execute the given block within the given iframe using given frame name or index.
+    # May be supported by not all drivers. Drivers that support it, may provide additional options.
     #
-    # @param [String] frame_id   Id of the frame
+    # @overload within_frame(index)
+    #   @param [Integer] index         index of a frame
+    # @overload within_frame(name)
+    #   @param [String] name           name of a frame
     #
-    def within_frame(frame_id)
-      driver.within_frame(frame_id) do
+    def within_frame(frame_handle)
+      driver.within_frame(frame_handle) do
         yield
       end
     end
@@ -304,7 +317,7 @@ module Capybara
 
       FileUtils.mkdir_p(File.dirname(path))
 
-      File.open(path,'w') { |f| f.write(body) }
+      File.open(path,'w') { |f| f.write(Capybara::Helpers.inject_asset_host(body)) }
       path
     end
 
@@ -312,7 +325,7 @@ module Capybara
     #
     # Save a snapshot of the page and open it in a browser for inspection
     #
-    # @param  [String] path     The path to where it should be saved [optional]
+    # @param  [String] file_name  The path to where it should be saved [optional]
     #
     def save_and_open_page(file_name=nil)
       require "launchy"
@@ -338,7 +351,7 @@ module Capybara
     NODE_METHODS.each do |method|
       define_method method do |*args, &block|
         @touched = true
-        current_node.send(method, *args, &block)
+        current_scope.send(method, *args, &block)
       end
     end
 
@@ -346,12 +359,34 @@ module Capybara
       %(#<Capybara::Session>)
     end
 
-  private
+    def has_title?(content)
+      document.synchronize do
+        unless title.match(Capybara::Helpers.to_regexp(content))
+          raise ExpectationNotMet
+        end
+      end
+      return true
+    rescue Capybara::ExpectationNotMet
+      return false
+    end
+
+    def has_no_title?(content)
+      document.synchronize do
+        if title.match(Capybara::Helpers.to_regexp(content))
+          raise ExpectationNotMet
+        end
+      end
+      return true
+    rescue Capybara::ExpectationNotMet
+      return false
+    end
 
-    def current_node
+    def current_scope
       scopes.last
     end
 
+  private
+
     def scopes
       @scopes ||= [document]
     end

data/lib/capybara/spec/public/test.js

@@ -18,6 +18,13 @@ $(function() {
     }, 500);
     return false;
   });
+  $('#slow-click').click(function() {
+    var link = $(this);
+    setTimeout(function() {
+      $(link).after('<a id="slow-clicked" href="#">Slow link clicked</a>');
+    }, 4000);
+    return false;
+  });
   $('#waiter').change(function() {
     activeRequests = 1;
     setTimeout(function() {
@@ -48,4 +55,9 @@ $(function() {
       $('#the-list').html('<li>Foo</li><li>Bar</li>');
     }, 250)
   });
+  $('#change-title').click(function() {
+    setTimeout(function() {
+      $('title').text('changed title')
+    }, 250)
+  });
 });

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

@@ -48,22 +48,23 @@ Capybara::SpecHelper.spec "#all" do
       @session.all('h1').first.text.should == 'This is a test'
       @session.all("input[id='test_field']").first[:value].should == 'monkey'
     end
-    after { Capybara.default_selector = :xpath }
   end
 
   context "with visible filter" do
-    after { Capybara.ignore_hidden_elements = false }
-    it "should only find visible nodes" do
-      @session.all(:css, "a.simple").should have(2).elements
+    it "should only find visible nodes when true" do
       @session.all(:css, "a.simple", :visible => true).should have(1).elements
-      Capybara.ignore_hidden_elements = true
-      @session.all(:css, "a.simple").should have(1).elements
     end
 
-    it "should only find invisible nodes" do
-      Capybara.ignore_hidden_elements = true
+    it "should find nodes regardless of whether they are invisible when false" do
       @session.all(:css, "a.simple", :visible => false).should have(2).elements
     end
+
+    it "should default to Capybara.ignore_hidden_elements" do
+      Capybara.ignore_hidden_elements = true
+      @session.all(:css, "a.simple").should have(1).elements
+      Capybara.ignore_hidden_elements = false
+      @session.all(:css, "a.simple").should have(2).elements
+    end
   end
 
   context "within a scope" do

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

@@ -87,4 +87,18 @@ Capybara::SpecHelper.spec "#attach_file" do
       expect { @session.attach_file('Image', '/no_such_file.png') }.to raise_error(Capybara::FileNotFound)
     end
   end
+
+  context "with :exact option" do
+    it "should set a file path by partial label when false" do
+      @session.attach_file "Imag", __FILE__, :exact => false
+      @session.click_button('awesome')
+      extract_results(@session)['image'].should == File.basename(__FILE__)
+    end
+
+    it "not allow partial matches when true" do
+      expect do
+        @session.attach_file "Imag", __FILE__, :exact => true
+      end.to raise_error(Capybara::ElementNotFound)
+    end
+  end
 end

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

@@ -82,4 +82,18 @@ Capybara::SpecHelper.spec "#check" do
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
+
+  context "with :exact option" do
+    it "should accept partial matches when false" do
+      @session.check('Ham', :exact => false)
+      @session.click_button('awesome')
+      extract_results(@session)['pets'].should include('hamster')
+    end
+
+    it "should not accept partial matches when true" do
+      expect do
+        @session.check('Ham', :exact => true)
+      end.to raise_error(Capybara::ElementNotFound)
+    end
+  end
 end

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

@@ -37,4 +37,18 @@ Capybara::SpecHelper.spec "#choose" do
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
+
+  context "with :exact option" do
+    it "should accept partial matches when false" do
+      @session.choose("Mal", :exact => false)
+      @session.click_button('awesome')
+      extract_results(@session)['gender'].should == 'male'
+    end
+
+    it "should not accept partial matches when true" do
+      expect do
+        @session.choose("Mal", :exact => true)
+      end.to raise_error(Capybara::ElementNotFound)
+    end
+  end
 end

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

@@ -63,7 +63,7 @@ Capybara::SpecHelper.spec '#click_button' do
       end
 
       it "should serialise and submit color fields" do
-        @results['html5_color'].should == '#FFFFFF'
+        @results['html5_color'].upcase.should == '#FFFFFF'
       end
     end
 
@@ -162,6 +162,69 @@ Capybara::SpecHelper.spec '#click_button' do
     end
   end
 
+  context "with fields associated with the form using the form attribute" do
+    before do
+      @session.click_button('submit_form1')
+      @results = extract_results(@session)
+    end
+
+    it "should serialize and submit text fields" do
+      @results['outside_input'].should == 'outside_input'
+    end
+
+    it "should serialize text areas" do
+      @results['outside_textarea'].should == 'Some text here'
+    end
+
+    it "should serialize select tags" do
+      @results['outside_select'].should == 'Ruby'
+    end
+
+    it "should not serliaze fields associated with a different form" do
+      @results['for_form2'].should be_nil
+    end
+  end
+
+
+  context "with submit button outside the form defined by <button> tag" do
+    before do
+      @session.click_button('outside_button')
+      @results = extract_results(@session)
+    end
+
+    it "should submit the associated form" do
+      @results['which_form'].should == 'form2'
+    end
+
+    it "should submit the button that was clicked, but not other buttons" do
+      @results['outside_button'].should == 'outside_button'
+      @results['unused'].should be_nil
+    end
+  end
+
+  context "with submit button outside the form defined by <input type='submit'> tag" do
+    before do
+      @session.click_button('outside_submit')
+      @results = extract_results(@session)
+    end
+
+    it "should submit the associated form" do
+      @results['which_form'].should == 'form1'
+    end
+
+    it "should submit the button that was clicked, but not other buttons" do
+      @results['outside_submit'].should == 'outside_submit'
+      @results['submit_form1'].should be_nil
+    end
+  end
+
+  context "with submit button for form1 located within form2" do
+    it "should submit the form associated with the button" do
+      @session.click_button('other_form_button')
+      extract_results(@session)['which_form'].should == "form1"
+    end
+  end
+
   context "with alt given on an image button" do
     it "should submit the associated form" do
       @session.click_button('oh hai thar')
@@ -332,4 +395,17 @@ Capybara::SpecHelper.spec '#click_button' do
     addresses[1]["city"].should     == 'Mikolaiv'
     addresses[1]["country"].should  == 'Ukraine'
   end
+
+  context "with :exact option" do
+    it "should accept partial matches when false" do
+      @session.click_button('What an Awesome', :exact => false)
+      extract_results(@session)['first_name'].should == 'John'
+    end
+
+    it "should not accept partial matches when true" do
+      expect do
+        @session.click_button('What an Awesome', :exact => true)
+      end.to raise_error(Capybara::ElementNotFound)
+    end
+  end
 end