capybara 0.4.0 → 0.4.1.rc

data/lib/capybara/node/matchers.rb

@@ -1,5 +1,5 @@
 module Capybara
-  class Node
+  module Node
     module Matchers
 
       ##
@@ -37,8 +37,17 @@ module Capybara
         wait_conditionally_until do
           results = all(*args)
 
-          if options[:count]
-            results.size == options[:count]
+          case
+          when results.empty?
+            false
+          when options[:between]
+            options[:between] === results.size
+          when options[:count]
+            options[:count] == results.size
+          when options[:maximum]
+            options[:maximum] >= results.size
+          when options[:minimum]
+            options[:minimum] <= results.size
           else
             results.size > 0
           end
@@ -60,8 +69,17 @@ module Capybara
         wait_conditionally_until do
           results = all(*args)
 
-          if options[:count]
-            results.size != options[:count]
+          case
+          when results.empty?
+            true
+          when options[:between]
+            not(options[:between] === results.size)
+          when options[:count]
+            not(options[:count] == results.size)
+          when options[:maximum]
+            not(options[:maximum] >= results.size)
+          when options[:minimum]
+            not(options[:minimum] <= results.size)
           else
             results.empty?
           end
@@ -242,7 +260,8 @@ module Capybara
       # @return [Boolean]                 Whether it exists
       #
       def has_field?(locator, options={})
-        has_xpath?(XPath::HTML.field(locator, options))
+        options, with = split_options(options, :with)
+        has_xpath?(XPath::HTML.field(locator, options), with)
       end
 
       ##
@@ -255,7 +274,8 @@ module Capybara
       # @return [Boolean]                 Whether it doesn't exist
       #
       def has_no_field?(locator, options={})
-        has_no_xpath?(XPath::HTML.field(locator, options))
+        options, with = split_options(options, :with)
+        has_no_xpath?(XPath::HTML.field(locator, options), with)
       end
 
       ##
@@ -268,7 +288,7 @@ module Capybara
       # @return [Boolean]                 Whether it exists
       #
       def has_checked_field?(locator)
-        has_xpath?(XPath::HTML.field(locator, :checked => true))
+        has_xpath?(XPath::HTML.field(locator), :checked => true)
       end
 
       ##
@@ -281,7 +301,7 @@ module Capybara
       # @return [Boolean]                 Whether it exists
       #
       def has_unchecked_field?(locator)
-        has_xpath?(XPath::HTML.field(locator, :unchecked => true))
+        has_xpath?(XPath::HTML.field(locator), :unchecked => true)
       end
 
       ##
@@ -308,7 +328,8 @@ module Capybara
       # @return [Boolean]                            Whether it exists
       #
       def has_select?(locator, options={})
-        has_xpath?(XPath::HTML.select(locator, options))
+        options, selected = split_options(options, :selected)
+        has_xpath?(XPath::HTML.select(locator, options), selected)
       end
 
       ##
@@ -320,7 +341,8 @@ module Capybara
       # @return [Boolean]     Whether it doesn't exist
       #
       def has_no_select?(locator, options={})
-        has_no_xpath?(XPath::HTML.select(locator, options))
+        options, selected = split_options(options, :selected)
+        has_no_xpath?(XPath::HTML.select(locator, options), selected)
       end
 
       ##
@@ -355,6 +377,13 @@ module Capybara
       def has_no_table?(locator, options={})
         has_no_xpath?(XPath::HTML.table(locator, options))
       end
+
+      protected
+
+      def split_options(options, key)
+        options = options.dup
+        [options, if options.has_key?(key) then {key => options.delete(key)} else {} end]
+      end
     end
   end
 end

data/lib/capybara/node/simple.rb

@@ -0,0 +1,116 @@
+module Capybara
+  module Node
+
+    ##
+    #
+    # A {Capybara::Node::Simple} is a simpler version of {Capybara::Node::Base} which
+    # includes only {Capybara::Node::Finders} and {Capybara::Node::Matchers} and does
+    # not include {Capybara::Node::Actions}. This type of node is returned when
+    # using {Capybara.string}.
+    #
+    # It is useful in that it does not require a session, an application or a driver,
+    # but can still use Capybara's finders and matchers on any string that contains HTML.
+    #
+    class Simple
+      include Capybara::Node::Finders
+      include Capybara::Node::Matchers
+
+      attr_reader :native
+
+      def initialize(native)
+        native = Nokogiri::HTML(native) if native.is_a?(String)
+        @native = native
+      end
+
+      ##
+      #
+      # @return [String]    The text of the element
+      #
+      def text
+        native.text
+      end
+
+      ##
+      #
+      # Retrieve the given attribute
+      #
+      #     element[:title] # => HTML title attribute
+      #
+      # @param  [Symbol] attribute     The attribute to retrieve
+      # @return [String]               The value of the attribute
+      #
+      def [](name)
+        attr_name = name.to_s
+        if attr_name == 'value'
+          value
+        elsif 'input' == tag_name and 'checkbox' == native[:type] and 'checked' == attr_name
+          native['checked'] == 'checked'
+        else
+          native[attr_name]
+        end
+      end
+
+      ##
+      #
+      # @return [String]      The tag name of the element
+      #
+      def tag_name
+        native.node_name
+      end
+
+      ##
+      #
+      # An XPath expression describing where on the page the element can be found
+      #
+      # @return [String]      An XPath expression
+      #
+      def path
+        native.path
+      end
+
+      ##
+      #
+      # @return [String]    The value of the form element
+      #
+      def value
+        if tag_name == 'textarea'
+          native.content
+        elsif tag_name == 'select'
+          if native['multiple'] == 'multiple'
+            native.xpath(".//option[@selected='selected']").map { |option| option[:value] || option.content  }
+          else
+            option = native.xpath(".//option[@selected='selected']").first || native.xpath(".//option").first
+            option[:value] || option.content if option
+          end
+        else
+          native[:value]
+        end
+      end
+
+      ##
+      #
+      # Whether or not the element is visible. Does not support CSS, so
+      # the result may be inaccurate.
+      #
+      # @return [Boolean]     Whether the element is visible
+      #
+      def visible?
+        native.xpath("./ancestor-or-self::*[contains(@style, 'display:none') or contains(@style, 'display: none')]").size == 0
+      end
+
+    protected
+
+      def find_in_base(xpath)
+        native.xpath(xpath).map { |node| self.class.new(node) }
+      end
+
+      def convert_element(element)
+        element
+      end
+
+      def wait?
+        false
+      end
+    end
+  end
+end

data/lib/capybara/rspec.rb

@@ -0,0 +1,18 @@
+require 'capybara'
+require 'capybara/dsl'
+
+RSpec.configure do |config|
+  config.include Capybara, :type => :acceptance
+  config.after do
+    if example.metadata[:type] == :acceptance
+      Capybara.reset_sessions!
+      Capybara.use_default_driver
+    end
+  end
+  config.before do
+    if example.metadata[:type] == :acceptance
+      Capybara.current_driver = Capybara.javascript_driver if example.metadata[:js]
+      Capybara.current_driver = example.metadata[:driver] if example.metadata[:driver]
+    end
+  end
+end

data/lib/capybara/server.rb

@@ -62,20 +62,15 @@ module Capybara
           Capybara::Server.ports[@app.object_id] = @port
 
           Thread.new do
-            begin
-              require 'rack/handler/thin'
-              Thin::Logging.silent = true
-              Rack::Handler::Thin.run(Identify.new(@app), :Port => @port)
-            rescue LoadError
-              require 'rack/handler/webrick'
-              Rack::Handler::WEBrick.run(Identify.new(@app), :Port => @port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
-            end
+            Capybara.server.call(Identify.new(@app), @port)
           end
 
-          Capybara.timeout(10) { if responsive? then true else sleep(0.5) and false end }
+          Capybara.timeout(Capybara.server_boot_timeout) do
+            if responsive? then true else sleep(0.5) and false end
+          end
         end
       end
-    rescue Timeout::Error
+    rescue TimeoutError
       puts "Rack application timed out during boot"
       exit
     else

data/lib/capybara/session.rb

@@ -27,12 +27,12 @@ module Capybara
   #
   class Session
     DSL_METHODS = [
-      :all, :attach_file, :body, :check, :choose, :click_link_or_button, :click_button, :click_link, :current_url, :drag, :evaluate_script,
+      :all, :first, :attach_file, :body, :check, :choose, :click_link_or_button, :click_button, :click_link, :current_url, :drag, :evaluate_script,
       :field_labeled, :fill_in, :find, :find_button, :find_by_id, :find_field, :find_link, :has_content?, :has_css?,
       :has_no_content?, :has_no_css?, :has_no_xpath?, :has_xpath?, :locate, :save_and_open_page, :select, :source, :uncheck,
       :visit, :wait_until, :within, :within_fieldset, :within_table, :within_frame, :within_window, :has_link?, :has_no_link?, :has_button?,
       :has_no_button?, :has_field?, :has_no_field?, :has_checked_field?, :has_unchecked_field?, :has_no_table?, :has_table?,
-      :unselect, :has_select?, :has_no_select?, :current_path, :click, :has_selector?, :has_no_selector?
+      :unselect, :has_select?, :has_no_select?, :current_path, :click, :has_selector?, :has_no_selector?, :click_on
     ]
 
     attr_reader :mode, :app
@@ -151,11 +151,11 @@ module Capybara
     #       fill_in('Street', :with => '12 Main Street')
     #     end
     #
-    # @param [:css, :xpath, String] kind    The type of selector or the selector if the second argument is blank
-    # @param [String] selector              The selector within which to execute the given block
+    # @param (see Capybara::Node::Finders#all)
+    # @raise  [Capybara::ElementNotFound]   If the scope can't be found before time expires
     #
-    def within(kind, selector=nil)
-      new_scope = find(kind, selector, :message => "scope '#{selector || kind}' not found on page")
+    def within(*args)
+      new_scope = find(*args)
       begin
         scopes.push(new_scope)
         yield
@@ -247,15 +247,6 @@ module Capybara
       driver.evaluate_script(script)
     end
 
-    ##
-    #
-    # @deprecated click is deprecated, please use {Capybara::Node::Actions#click_link_or_button} instead
-    #
-    def click(locator)
-      Capybara.deprecate("click", "click_link_or_button")
-      current_node.click_link_or_button(locator)
-    end
-
     ##
     #
     # Save a snapshot of the page and open it in a browser for inspection
@@ -266,7 +257,7 @@ module Capybara
     end
 
     def document
-      Capybara::Document.new(self, driver)
+      Capybara::Node::Document.new(self, driver)
     end
 
     def method_missing(*args)

data/lib/capybara/spec/driver.rb

@@ -42,6 +42,7 @@ shared_examples_for 'driver' do
       it "should extract node attributes" do
         @driver.find('//a')[0][:class].should == 'simple'
         @driver.find('//a')[1][:id].should == 'foo'
+        @driver.find('//input')[0][:type].should == 'text'
       end
 
       it "should extract boolean node attributes" do
@@ -70,6 +71,20 @@ shared_examples_for 'driver' do
         @driver.find('//div[@id="hidden"]')[0].should_not be_visible
         @driver.find('//div[@id="hidden_via_ancestor"]')[0].should_not be_visible
       end
+
+      it "should extract node checked state" do
+        @driver.visit('/form')
+        @driver.find('//input[@id="gender_female"]')[0].should be_checked
+        @driver.find('//input[@id="gender_male"]')[0].should_not be_checked
+        @driver.find('//h1')[0].should_not be_checked
+      end
+
+      it "should extract node selected state" do
+        @driver.visit('/form')
+        @driver.find('//option[@value="en"]')[0].should be_selected
+        @driver.find('//option[@value="sv"]')[0].should_not be_selected
+        @driver.find('//h1')[0].should_not be_selected
+      end
     end
   end
 end
@@ -103,7 +118,7 @@ end
 shared_examples_for "driver with header support" do
   it "should make headers available through response_headers" do
     @driver.visit('/with_simple_html')
-    @driver.response_headers['Content-Type'].should == 'text/html'
+    @driver.response_headers['Content-Type'].should =~ /text\/html/
   end
 end
 

data/lib/capybara/spec/session.rb

@@ -42,6 +42,7 @@ shared_examples_for "session" do
   end
 
   it_should_behave_like "all"
+  it_should_behave_like "first"
   it_should_behave_like "attach_file"
   it_should_behave_like "check"
   it_should_behave_like "choose"

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

@@ -56,6 +56,11 @@ shared_examples_for "all" do
         Capybara.ignore_hidden_elements = true
         @session.all("//a[@title='awesome title']").should have(1).elements
       end
+
+      it "should only find invisible nodes" do
+        Capybara.ignore_hidden_elements = true
+        @session.all("//a[@title='awesome title']", :visible => false).should have(2).elements
+      end
     end
 
     context "within a scope" do

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

@@ -53,6 +53,12 @@ shared_examples_for "attach_file" do
         @session.click_button 'Upload'
         @session.body.should include('image/jpeg')
       end
+
+      it  "should not break when using HTML5 multiple file input" do
+        @session.attach_file "Multiple Documents", @test_file_path
+        @session.click_button('Upload Multiple')
+        @session.body.should include(File.read(@test_file_path))
+      end
     end
 
     context "with a locator that doesn't exist" do

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

@@ -18,10 +18,9 @@ shared_examples_for "click_link_or_button" do
       extract_results(@session)['first_name'].should == 'John'
     end
 
-    it "should be aliased as click for backward compatibility" do
-      Capybara.should_receive(:deprecate).with("click", "click_link_or_button")
+    it "should be aliased as click_on" do
       @session.visit('/form')
-      @session.click('awe123')
+      @session.click_on('awe123')
       extract_results(@session)['first_name'].should == 'John'
     end
 

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

@@ -13,12 +13,6 @@ shared_examples_for "find" do
       @session.find("//input[@id='test_field']")[:value].should == 'monkey'
     end
 
-    it "should be aliased as locate for backward compatibility" do
-      Capybara.should_receive(:deprecate).with("locate", "find").twice
-      @session.locate('//h1').text.should == 'This is a test'
-      @session.locate("//input[@id='test_field']")[:value].should == 'monkey'
-    end
-
     it "should find the first element using the given locator and options" do
       @session.find('//a', :text => 'Redirect')[:id].should == 'red'
       @session.find(:css, 'a', :text => 'A link')[:title].should == 'twas a fine link'

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

@@ -0,0 +1,72 @@
+shared_examples_for "first" do
+  describe '#first' do
+    before do
+      @session.visit('/with_html')
+    end
+
+    it "should find the first element using the given locator" do
+      @session.first('//h1').text.should == 'This is a test'
+      @session.first("//input[@id='test_field']")[:value].should == 'monkey'
+    end
+
+    it "should return nil when nothing was found" do
+      @session.first('//div[@id="nosuchthing"]').should be_nil
+    end
+
+    it "should accept an XPath instance" do
+      @session.visit('/form')
+      @xpath = XPath::HTML.fillable_field('Name')
+      @session.first(@xpath).value.should == 'John Smith'
+    end
+
+    context "with css selectors" do
+      it "should find the first element using the given selector" do
+        @session.first(:css, 'h1').text.should == 'This is a test'
+        @session.first(:css, "input[id='test_field']")[:value].should == 'monkey'
+      end
+    end
+
+    context "with xpath selectors" do
+      it "should find the first element using the given locator" do
+        @session.first(:xpath, '//h1').text.should == 'This is a test'
+        @session.first(:xpath, "//input[@id='test_field']")[:value].should == 'monkey'
+      end
+    end
+
+    context "with css as default selector" do
+      before { Capybara.default_selector = :css }
+      it "should find the first element using the given locator" do
+        @session.first('h1').text.should == 'This is a test'
+        @session.first("input[id='test_field']")[: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.first(:css, "a.visibility").should_not be_visible
+        @session.first(:css, "a.visibility", :visible => true).should be_visible
+        Capybara.ignore_hidden_elements = true
+        @session.first(:css, "a.visibility").should be_visible
+      end
+
+      it "should only find invisible nodes" do
+        Capybara.ignore_hidden_elements = true
+        @session.first(:css, "a.visibility", :visible => false).should_not be_visible
+      end
+    end
+
+    context "within a scope" do
+      before do
+        @session.visit('/with_scope')
+      end
+
+      it "should find the first element using the given locator" do
+        @session.within(:xpath, "//div[@id='for_bar']") do
+          @session.first('.//form').should_not be_nil
+        end
+      end
+    end
+  end
+end