capybara 1.1.4 → 2.0.0.beta2

data/lib/capybara/selector.rb

@@ -1,13 +1,7 @@
 module Capybara
   class Selector
-    attr_reader :name
+    attr_reader :name, :custom_filters
 
-    class Normalized
-      attr_accessor :selector, :locator, :options, :xpaths
-
-      def failure_message; selector.failure_message; end
-      def name; selector.name; end
-    end
 
     class << self
       def all
@@ -21,32 +15,13 @@ module Capybara
       def remove(name)
         all.delete(name.to_sym)
       end
-
-      def normalize(*args)
-        normalized = Normalized.new
-        normalized.options = if args.last.is_a?(Hash) then args.pop else {} end
-
-        if args[1]
-          normalized.selector = all[args[0]]
-          normalized.locator = args[1]
-        else
-          normalized.selector = all.values.find { |s| s.match?(args[0]) }
-          normalized.locator = args[0]
-        end
-        normalized.selector ||= all[Capybara.default_selector]
-
-        xpath = normalized.selector.call(normalized.locator)
-        if xpath.respond_to?(:to_xpaths)
-          normalized.xpaths = xpath.to_xpaths
-        else
-          normalized.xpaths = [xpath.to_s].flatten
-        end
-        normalized
-      end
     end
 
     def initialize(name, &block)
       @name = name
+      @custom_filters = {}
+      @match = nil
+      @failure_message = nil
       instance_eval(&block)
     end
 
@@ -55,14 +30,22 @@ module Capybara
       @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
+    end
+
     def match(&block)
       @match = block if block
       @match
     end
 
-    def failure_message(&block)
-      @failure_message = block if block
-      @failure_message
+    def label(label=nil)
+      @label = label if label
+      @label
     end
 
     def call(locator)
@@ -72,6 +55,10 @@ module Capybara
     def match?(locator)
       @match and @match.call(locator)
     end
+
+    def filter(name, &block)
+      @custom_filters[name] = block
+    end
   end
 end
 
@@ -80,10 +67,87 @@ Capybara.add_selector(:xpath) do
 end
 
 Capybara.add_selector(:css) do
-  xpath { |css| XPath.css(css) }
+  css { |css| css }
 end
 
 Capybara.add_selector(:id) do
   xpath { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
   match { |value| value.is_a?(Symbol) }
 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(:with) { |node, with| node.value == with }
+  filter(:type) { |node, type| node[:type] == type }
+end
+
+Capybara.add_selector(:fieldset) do
+  xpath { |locator| XPath::HTML.fieldset(locator) }
+end
+
+Capybara.add_selector(:link_or_button) do
+  label "link or button"
+  xpath { |locator| XPath::HTML.link_or_button(locator) }
+end
+
+Capybara.add_selector(:link) do
+  xpath { |locator| XPath::HTML.link(locator) }
+  filter(:href) do |node, href|
+    node.first(:xpath, XPath.axis(:self)[XPath.attr(:href).equals(href)])
+  end
+end
+
+Capybara.add_selector(:button) do
+  xpath { |locator| XPath::HTML.button(locator) }
+end
+
+Capybara.add_selector(:fillable_field) do
+  label "field"
+  xpath { |locator| XPath::HTML.fillable_field(locator) }
+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?) }
+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?) }
+end
+
+Capybara.add_selector(:select) do
+  label "select box"
+  xpath { |locator| XPath::HTML.select(locator) }
+  filter(:options) do |node, options|
+    actual = node.all(:xpath, './/option').map { |option| option.text }
+    options.sort == actual.sort
+  end
+  filter(:with_options) { |node, options| options.all? { |option| node.first(:option, option) } }
+  filter(:selected) do |node, selected|
+    actual = node.all(:xpath, './/option').select { |option| option.selected? }.map { |option| option.text }
+    [selected].flatten.sort == actual.sort
+  end
+end
+
+Capybara.add_selector(:option) do
+  xpath { |locator| XPath::HTML.option(locator) }
+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) }
+end
+
+Capybara.add_selector(:table) do
+  xpath { |locator| XPath::HTML.table(locator) }
+end

data/lib/capybara/selenium/driver.rb

@@ -2,13 +2,11 @@ require 'selenium-webdriver'
 
 class Capybara::Selenium::Driver < Capybara::Driver::Base
   DEFAULT_OPTIONS = {
-    :resynchronize => false,
-    :resynchronization_timeout => 10,
     :browser => :firefox
   }
-  SPECIAL_OPTIONS = [:browser, :resynchronize, :resynchronization_timeout]
+  SPECIAL_OPTIONS = [:browser]
 
-  attr_reader :app, :rack_server, :options
+  attr_reader :app, :options
 
   def browser
     unless @browser
@@ -27,13 +25,13 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   def initialize(app, options={})
     @app = app
+    @browser = nil
+    @exit_status = nil
     @options = DEFAULT_OPTIONS.merge(options)
-    @rack_server = Capybara::Server.new(@app)
-    @rack_server.boot if Capybara.run_server
   end
 
   def visit(path)
-    browser.navigate.to(url(path))
+    browser.navigate.to(path)
   end
 
   def source
@@ -53,18 +51,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def wait?; true; end
-
-  def resynchronize
-    if options[:resynchronize]
-      load_wait_for_ajax_support
-      yield
-      Capybara.timeout(options[:resynchronization_timeout], self, "failed to resynchronize, ajax request timed out") do
-        evaluate_script("!window.capybaraRequestsOutstanding")
-      end
-    else
-      yield
-    end
-  end
+  def needs_server?; true; end
 
   def execute_script(script)
     browser.execute_script script
@@ -74,12 +61,15 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.execute_script "return #{script}"
   end
 
+  def save_screenshot(path, options={})
+    browser.save_screenshot(path)
+  end
+
   def reset!
     # Use instance variable directly so we avoid starting the browser just to reset the session
     if @browser
-      begin
-        @browser.manage.delete_all_cookies
-      rescue Selenium::WebDriver::Error::UnhandledError => e
+      begin @browser.manage.delete_all_cookies
+      rescue Selenium::WebDriver::Error::UnhandledError
         # delete_all_cookies fails when we've previously gone
         # to about:blank, so we rescue this error and do nothing
         # instead.
@@ -92,6 +82,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     old_window = browser.window_handle
     browser.switch_to.frame(frame_id)
     yield
+  ensure
     browser.switch_to.window old_window
   end
 
@@ -122,44 +113,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def invalid_element_errors
-    [ Selenium::WebDriver::Error::StaleElementReferenceError,
-      Selenium::WebDriver::Error::InvalidSelectorError,
-      Selenium::WebDriver::Error::UnknownError ]
-  end
-
-private
-
-  def load_wait_for_ajax_support
-    browser.execute_script <<-JS
-      window.capybaraRequestsOutstanding = 0;
-      (function() { // Overriding XMLHttpRequest
-          var oldXHR = window.XMLHttpRequest;
-
-          function newXHR() {
-              var realXHR = new oldXHR();
-
-              window.capybaraRequestsOutstanding++;
-              realXHR.addEventListener("readystatechange", function() {
-                  if( realXHR.readyState == 4 ) {
-                    setTimeout( function() {
-                      window.capybaraRequestsOutstanding--;
-                      if(window.capybaraRequestsOutstanding < 0) {
-                        window.capybaraRequestsOutstanding = 0;
-                      }
-                    }, 500 );
-                  }
-              }, false);
-
-              return realXHR;
-          }
-
-          window.XMLHttpRequest = newXHR;
-      })();
-    JS
-  end
-
-  def url(path)
-    rack_server.url(path)
+    [Selenium::WebDriver::Error::ObsoleteElementError, Selenium::WebDriver::Error::UnhandledError]
   end
-
 end

data/lib/capybara/selenium/node.rb

@@ -23,34 +23,29 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     elsif tag_name == 'input' and type == 'checkbox'
       click if value ^ native.attribute('checked').to_s.eql?("true")
     elsif tag_name == 'input' and type == 'file'
-      resynchronize do
-        native.send_keys(value.to_s)
-      end
+      native.send_keys(value.to_s)
     elsif tag_name == 'textarea' or tag_name == 'input'
-      resynchronize do
-        native.clear
-        native.send_keys(value.to_s)
-      end
+      native.send_keys(("\b" * native[:value].size) + value.to_s)
     end
   end
 
   def select_option
-    resynchronize { native.click } unless selected?
+    native.click unless selected?
   end
 
   def unselect_option
     if select_node['multiple'] != 'multiple' and select_node['multiple'] != 'true'
       raise Capybara::UnselectNotAllowed, "Cannot unselect option from single select box."
     end
-    resynchronize { native.click } if selected?
+    native.click if selected?
   end
 
   def click
-    resynchronize { native.click }
+    native.click
   end
 
   def drag_to(element)
-    resynchronize { driver.browser.action.drag_and_drop(native, element.native).perform }
+    driver.browser.action.drag_and_drop(native, element.native).perform
   end
 
   def tag_name
@@ -75,10 +70,6 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
 
 private
 
-  def resynchronize
-    driver.resynchronize { yield }
-  end
-
   # a reference to the select node if this is an option node
   def select_node
     find('./ancestor::select').first

data/lib/capybara/server.rb

@@ -1,11 +1,12 @@
 require 'uri'
 require 'net/http'
 require 'rack'
-require 'capybara/util/timeout'
 
 module Capybara
   class Server
-    class Identify
+    class Middleware
+      attr_accessor :error
+
       def initialize(app)
         @app = app
       end
@@ -14,7 +15,12 @@ module Capybara
         if env["PATH_INFO"] == "/__identify__"
           [200, {}, [@app.object_id.to_s]]
         else
-          @app.call(env)
+          begin
+            @app.call(env)
+          rescue StandardError => e
+            @error = e unless @error
+            raise e
+          end
         end
       end
     end
@@ -27,23 +33,30 @@ module Capybara
 
     attr_reader :app, :port
 
-    def initialize(app)
+    def initialize(app, port=Capybara.server_port)
       @app = app
+      @middleware = Middleware.new(@app)
+      @server_thread = nil # supress warnings
+      @port = port
+      @port ||= Capybara::Server.ports[@app.object_id]
+      @port ||= find_available_port
     end
 
-    def host
-      "127.0.0.1"
+    def reset_error!
+      @middleware.error = nil
     end
 
-    def url(path)
-      if path =~ /^http/
-        path
-      else
-        (Capybara.app_host || "http://#{host}:#{port}") + path.to_s
-      end
+    def error
+      @middleware.error
+    end
+
+    def host
+      Capybara.server_host || "127.0.0.1"
     end
 
     def responsive?
+      return false if @server_thread && @server_thread.join(0)
+
       res = Net::HTTP.start(host, @port) { |http| http.get('/__identify__') }
 
       if res.is_a?(Net::HTTPSuccess) or res.is_a?(Net::HTTPRedirection)
@@ -54,25 +67,17 @@ module Capybara
     end
 
     def boot
-      if @app
-        @port = Capybara::Server.ports[@app.object_id]
-
-        if not @port or not responsive?
-          @port = Capybara.server_port || find_available_port
-          Capybara::Server.ports[@app.object_id] = @port
-
-          Thread.new do
-            Capybara.server.call(Identify.new(@app), @port)
-          end
+      unless responsive?
+        Capybara::Server.ports[@app.object_id] = @port
 
-          Capybara.timeout(Capybara.server_boot_timeout) do
-            if responsive? then true else sleep(0.5) and false end
-          end
+        @server_thread = Thread.new do
+          Capybara.server.call(@middleware, @port)
         end
+
+        Timeout.timeout(60) { @server_thread.join(0.1) until responsive? }
       end
     rescue TimeoutError
-      puts "Rack application timed out during boot"
-      exit
+      raise "Rack application timed out during boot"
     else
       self
     end