capybara 0.4.0.rc → 0.4.0

data/History.txt

@@ -1,6 +1,21 @@
+# Version 0.4.0
+
+Release date: 2010-10-22
+
+### Changed
+
+* The Selector API was changed slightly, use Capybara.add_selector, see README
+
+### Fixed
+
+* Celerity driver is registered properly
+* has_selector? and has_no_selector? added to DSL
+* Multiple selects return correct values under C[cu]lerity
+* Naked query strings are handled correctly by rack-test
+
 # Version 0.4.0.rc
 
-Release date:
+Release date: 2010-10-12
 
 ### Changed
 

data/README.rdoc

@@ -382,19 +382,28 @@ Alternatively you can set the default selector to XPath:
 Capybara allows you to add custom selectors, which can be very useful if you
 find yourself using the same kinds of selectors very often:
 
-    Capybara::Selector.add(:id) { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
-    Capybara::Selector.add(:row) { |num| ".//tbody/tr[#{num}]" }
+    Capybara.add_selector(:id) do
+      xpath { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
+    end
+
+    Capybara.add_selector(:row) do
+      xpath { |num| ".//tbody/tr[#{num}]" }
+    end
 
-These must always return an XPath expression as a String, or an XPath expression
-generated through the XPath gem. You can now use these selectors like this:
+The block given to xpath must always return an XPath expression as a String, or
+an XPath expression generated through the XPath gem. You can now use these
+selectors like this:
 
     find(:id, 'post_123')
     find(:row, 3)
 
-You can specify an optional :for option which will automatically use the
-selector if it matches the argument to find using ===:
+You can specify an optional match option which will automatically use the
+selector if it matches the argument:
 
-    Capybara::Selector.add(:id, :for => Symbol) { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
+    Capybara.add_selector(:id) do
+      xpath { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
+      match { |value| value.is_a?(Symbol) }
+    end
 
 Now use it like this:
 

data/lib/capybara.rb

@@ -64,6 +64,46 @@ module Capybara
       drivers[name] = block
     end
 
+    ##
+    #
+    # Add a new selector to Capybara. Selectors can be used by various methods in Capybara
+    # to find certain elements on the page in a more convenient way. For example adding a
+    # selector to find certain table rows might look like this:
+    #
+    #     Capybara.add_selector(:row) do
+    #       xpath { |num| ".//tbody/tr[#{num}]" }
+    #     end
+    #
+    # This makes it possible to use this selector in a cariety of ways:
+    #
+    #     find(:row, 3)
+    #     page.find('table#myTable').find(:row, 3).text
+    #     page.find('table#myTable').has_selector?(:row, 3)
+    #     within(:row, 3) { page.should have_content('$100.000') }
+    #
+    # It might be convenient to specify that the selector is automatically chosen for certain
+    # values. This way you don't have to explicitely specify that you are looking for a row, or
+    # an id. Let's say we want Capybara to treat any Symbols sent into methods like find to be
+    # treated as though they were element ids. We could achieve this like so:
+    #
+    #     Capybara.add_selector(:id) do
+    #       xpath { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
+    #       match { |value| value.is_a?(Symbol) }
+    #     end
+    #
+    # Now we can retrieve elements by id like this:
+    #
+    #     find(:post_123)
+    #
+    # Note that this particular selector already ships with Capybara.
+    #
+    # @param [Symbol] name    The name of the selector to add
+    # @yield                  A block executed in the context of the new {Capybara::Selector}
+    #
+    def add_selector(name, &block)
+      Capybara::Selector.add(name, &block)
+    end
+
     def drivers
       @drivers ||= {}
     end
@@ -103,7 +143,7 @@ Capybara.register_driver :rack_test do |app|
 end
 
 Capybara.register_driver :celerity do |app|
-  Capybara::Driver::Culerity.new(app)
+  Capybara::Driver::Celerity.new(app)
 end
 
 Capybara.register_driver :culerity do |app|

data/lib/capybara/driver/celerity_driver.rb

@@ -15,7 +15,7 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
 
     def value
       if tag_name == "select" and native.multiple?
-        native.selected_options
+        find(".//option[@selected]").map { |n| n.value || n.text }
       else
         self[:value]
       end

data/lib/capybara/driver/rack_test_driver.rb

@@ -185,6 +185,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
 
   def process(method, path, attributes = {})
     return if path.gsub(/^#{request_path}/, '') =~ /^#/
+    path = request_path + path if path =~ /^\?/
     send(method, to_binary(path), to_binary( attributes ), env)
     follow_redirects!
   end

data/lib/capybara/driver/selenium_driver.rb

@@ -8,7 +8,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
 
     def [](name)
       if name == :value
-        native.value
+        value
       else
         native.attribute(name.to_s)
       end
@@ -17,10 +17,10 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
     end
 
     def value
-      if tag_name == "select" and self[:multiple]
+      if tag_name == "select" and self[:multiple] and not self[:multiple] == "false"
         native.find_elements(:xpath, ".//option").select { |n| n.selected? }.map { |n| n.value || n.text }
       else
-        self[:value]
+        native.value
       end
     end
 

data/lib/capybara/selector.rb

@@ -1,14 +1,14 @@
 module Capybara
   class Selector
-    attr_reader :name, :options, :block
+    attr_reader :name
 
     class << self
       def all
         @selectors ||= {}
       end
 
-      def add(name, options={}, &block)
-        all[name.to_sym] = Capybara::Selector.new(name.to_sym, options, &block)
+      def add(name, &block)
+        all[name.to_sym] = Capybara::Selector.new(name.to_sym, &block)
       end
 
       def remove(name)
@@ -31,22 +31,40 @@ module Capybara
       end
     end
 
-    def initialize(name, options={}, &block)
+    def initialize(name, &block)
       @name = name
-      @options = options
-      @block = block
+      instance_eval(&block)
+    end
+
+    def xpath(&block)
+      @xpath = block if block
+      @xpath
+    end
+
+    def match(&block)
+      @match = block if block
+      @match
     end
 
     def call(locator)
-      @block.call(locator)
+      @xpath.call(locator)
     end
 
     def match?(locator)
-      @options[:for] and @options[:for] === locator
+      @match and @match.call(locator)
     end
   end
 end
 
-Capybara::Selector.add(:xpath) { |xpath| xpath }
-Capybara::Selector.add(:css) { |css| XPath.css(css) }
-Capybara::Selector.add(:id, :for => Symbol) { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
+Capybara.add_selector(:xpath) do
+  xpath { |xpath| xpath }
+end
+
+Capybara.add_selector(:css) do
+  xpath { |css| XPath.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

data/lib/capybara/session.rb

@@ -32,7 +32,7 @@ module Capybara
       :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, :scope_to, :click
+      :unselect, :has_select?, :has_no_select?, :current_path, :click, :has_selector?, :has_no_selector?
     ]
 
     attr_reader :mode, :app

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

@@ -16,7 +16,7 @@ shared_examples_for "click_link" do
         @session.click_link('labore')
         @session.body.should include('Bar')
       end
-      
+
       it "should accept partial matches" do
         @session.click_link('abo')
         @session.body.should include('Bar')
@@ -38,7 +38,7 @@ shared_examples_for "click_link" do
         @session.click_link('some tit')
         @session.body.should include('Bar')
       end
-      
+
       it "should prefer exact matches over partial matches" do
         @session.click_link('a fine link')
         @session.body.should include('Bar')
@@ -74,12 +74,17 @@ shared_examples_for "click_link" do
       @session.click_link('Redirect')
       @session.body.should include('You landed')
     end
-    
+
     it "should follow redirects" do
       @session.click_link('BackToMyself')
       @session.body.should include('This is a test')
     end
-    
+
+    it "should add query string to current URL with naked query string" do
+      @session.click_link('Naked Query String')
+      @session.body.should include('Query String sent')
+    end
+
     it "should do nothing on anchor links" do
       @session.fill_in("test_field", :with => 'blah')
       @session.click_link('Anchor')
@@ -87,18 +92,18 @@ shared_examples_for "click_link" do
       @session.click_link('Blank Anchor')
       @session.find_field("test_field").value.should == 'blah'
     end
-    
+
     it "should do nothing on URL+anchor links for the same page" do
       @session.fill_in("test_field", :with => 'blah')
       @session.click_link('Anchor on same page')
       @session.find_field("test_field").value.should == 'blah'
     end
-    
+
     it "should follow link on URL+anchor links for a different page" do
       @session.click_link('Anchor on different page')
       @session.body.should include('Bar')
     end
-    
+
     it "raise an error with links with no href" do
       running do
         @session.click_link('No Href')

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

@@ -64,7 +64,9 @@ shared_examples_for "find" do
 
     context "with custom selector" do
       it "should use the custom selector" do
-        Capybara::Selector.add(:monkey) { |name| ".//*[@id='#{name}_monkey']" }
+        Capybara.add_selector(:monkey) do
+          xpath { |name| ".//*[@id='#{name}_monkey']" }
+        end
         @session.find(:monkey, 'john').text.should == 'Monkey John'
         @session.find(:monkey, 'paul').text.should == 'Monkey Paul'
       end
@@ -72,7 +74,10 @@ shared_examples_for "find" do
 
     context "with custom selector with :for option" do
       it "should use the selector when it matches the :for option" do
-        Capybara::Selector.add(:monkey, :for => Fixnum) { |num| ".//*[contains(@id, 'monkey')][#{num}]" }
+        Capybara.add_selector(:monkey) do
+          xpath { |num| ".//*[contains(@id, 'monkey')][#{num}]" }
+          match { |value| value.is_a?(Fixnum) }
+        end
         @session.find(:monkey, '2').text.should == 'Monkey Paul'
         @session.find(1).text.should == 'Monkey John'
         @session.find(2).text.should == 'Monkey Paul'
@@ -115,7 +120,7 @@ shared_examples_for "find" do
       it "should find the first element using the given locator" do
         @session.within(:xpath, "//div[@id='for_bar']") do
           @session.find('.//li').text.should =~ /With Simple HTML/
-        end        
+        end
       end
     end
   end

data/lib/capybara/spec/views/with_html.erb

@@ -35,6 +35,11 @@
   <input type="text" checked="checked" id="checked_field">
   <a href="/redirect"><img src="http://www.foobar.sun/dummy_image.jpg" width="20" height="20" alt="very fine image" /></a>
   <a href="/with_simple_html"><img src="http://www.foobar.sun/dummy_image.jpg" width="20" height="20" alt="fine image" /></a>
+
+  <a href="?query_string=true">Naked Query String</a>
+  <% if params[:query_string] %>
+    <em>Query String sent</em>
+  <% end %>
 </p>
 
 <div id="hidden" style="display: none;">

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '0.4.0.rc'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: capybara
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 4
   - 0
-  - rc
-  version: 0.4.0.rc
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
+date: 2010-10-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -164,9 +163,7 @@ dependencies:
         - 2
         - 0
         - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        version: 2.0.0
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -321,13 +318,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: capybara