capybara 0.3.7 → 0.3.8

data/History.txt

@@ -1,4 +1,20 @@
-# Versiob 0.3.7
+# Version 0.3.8
+
+Release date: 2010-05-12
+
+### Added
+
+* Within_frame method to execute a block of code within a particular iframe (Selenium only!)
+
+### Fixed
+
+* Single quotes are properly escaped with `select` under rack-test and Selenium.
+* The :text option for searches now escapes regexp special characters when a string is given.
+* Selenium now correctly checks already checked checkboxes (same with uncheck)
+* Timing issue which caused Selenium to hang under certain circumstances.
+* Selenium now resolves attributes even if they are given as a Symbol
+
+# Version 0.3.7
 
 Release date: 2010-04-09
 

data/README.rdoc

@@ -27,7 +27,8 @@ On OSX you may have to install libffi, you can install it via MacPorts with:
 * Report issues on {GitHub Issues}[http://github.com/jnicklas/capybara/issues]
 
 Pull requests are very welcome! Make sure your patches are well tested, Capybara is
-a testing tool after all.
+a testing tool after all. Please create a topic branch for every separate change
+you make.
 
 == Using Capybara with Cucumber
 
@@ -362,36 +363,6 @@ moving from Webrat and used CSS a lot, or simply generally prefer CSS:
   <tt><a href="/same/url#"></tt> instead. You can achieve this in Rails with
   <tt>link_to('foo', :anchor => '')</tt>
 
-== Contributors:
-
-The following people have dedicated their time and effort to Capybara:
-
-* Jonas Nicklas
-* Dennis Rogenius
-* Rob Holland
-* Wincent Colaiuta
-* Andrea Fazzi
-* Aslak Hellesøy
-* Andrew Brown
-* Lenny Marks
-* Aaron Patterson
-* Dan Dofter
-* Thorbjørn Hermansen
-* Louis T.
-* Stephan Hagemann
-* Graham Ashton
-* Joseph Wilk
-* Matt Wynne
-* Piotr Sarnacki
-* Pavel Gabriel
-* Bodaniel Jeanes
-* Carl Porth
-* Darrin Holst
-* Steven Parkes
-* Davide Marquês
-* Lucas Prim
-* José Valim
-
 == License:
 
 (The MIT License)

data/lib/capybara/driver/base.rb

@@ -30,6 +30,10 @@ class Capybara::Driver::Base
     raise NotImplementedError
   end
 
+  def within_frame(frame_id)
+    raise Capybara::NotSupportedByDriverError
+  end
+
   def source
     raise NotImplementedError
   end

data/lib/capybara/driver/rack_test_driver.rb

@@ -29,12 +29,12 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
 
     def set(value)
       if tag_name == 'input' and type == 'radio'
-        driver.html.xpath("//input[@name='#{self[:name]}']").each { |node| node.remove_attribute("checked") }
+        driver.html.xpath("//input[@name=#{Capybara::XPath.escape(self[:name])}]").each { |node| node.remove_attribute("checked") }
         node['checked'] = 'checked'
       elsif tag_name == 'input' and type == 'checkbox'
-        if value
+        if value && !node['checked']
           node['checked'] = 'checked'
-        else
+        elsif !value && node['checked']
           node.remove_attribute('checked')
         end
       elsif tag_name == 'input'
@@ -49,8 +49,8 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
         node.xpath(".//option[@selected]").each { |node| node.remove_attribute("selected") }
       end
 
-      if option_node = node.xpath(".//option[text()='#{option}']").first ||
-                       node.xpath(".//option[contains(.,'#{option}')]").first
+      if option_node = node.xpath(".//option[text()=#{Capybara::XPath.escape(option)}]").first ||
+                       node.xpath(".//option[contains(.,#{Capybara::XPath.escape(option)})]").first
         option_node["selected"] = 'selected'
       else
         options = node.xpath(".//option").map { |o| "'#{o.text}'" }.join(', ')
@@ -63,8 +63,8 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
         raise Capybara::UnselectNotAllowed, "Cannot unselect option '#{option}' from single select box."
       end
 
-      if option_node = node.xpath(".//option[text()='#{option}']").first ||
-                       node.xpath(".//option[contains(.,'#{option}')]").first
+      if option_node = node.xpath(".//option[text()=#{Capybara::XPath.escape(option)}]").first ||
+                       node.xpath(".//option[contains(.,#{Capybara::XPath.escape(option)})]").first
         option_node.remove_attribute('selected')
       else
         options = node.xpath(".//option").map { |o| "'#{o.text}'" }.join(', ')

data/lib/capybara/driver/selenium_driver.rb

@@ -10,7 +10,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
       if name == :value
         node.value
       else
-        node.attribute(name)
+        node.attribute(name.to_s)
       end
     rescue Selenium::WebDriver::Error::WebDriverError
       nil
@@ -31,12 +31,12 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
       elsif tag_name == 'input' and type == 'radio'
         node.click
       elsif tag_name == 'input' and type == 'checkbox'
-        node.click
+        node.click if node.attribute('checked') != value
       end
     end
 
     def select(option)
-      option_node = node.find_element(:xpath, ".//option[text()='#{option}']") || node.find_element(:xpath, ".//option[contains(.,'#{option}')]")
+      option_node = node.find_element(:xpath, ".//option[text()=#{Capybara::XPath.escape(option)}]") || node.find_element(:xpath, ".//option[contains(.,#{Capybara::XPath.escape(option)})]")
       option_node.select
     rescue 
       options = node.find_elements(:xpath, "//option").map { |o| "'#{o.text}'" }.join(', ')
@@ -49,7 +49,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
       end
 
       begin
-        option_node = node.find_element(:xpath, ".//option[text()='#{option}']") || node.find_element(:xpath, ".//option[contains(.,'#{option}')]")
+        option_node = node.find_element(:xpath, ".//option[text()=#{Capybara::XPath.escape(option)}]") || node.find_element(:xpath, ".//option[contains(.,#{Capybara::XPath.escape(option)})]")
         option_node.clear
       rescue
         options = node.find_elements(:xpath, "//option").map { |o| "'#{o.text}'" }.join(', ')
@@ -140,6 +140,13 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
     browser.manage.delete_all_cookies
   end
 
+  def within_frame(frame_id)
+    old_window = browser.window_handle
+    browser.switch_to.frame(frame_id)
+    yield
+    browser.switch_to.window old_window
+  end
+
 private
 
   def url(path)

data/lib/capybara/searchable.rb

@@ -33,6 +33,7 @@ module Capybara
       results = all_unfiltered(locator)
 
       if options[:text]
+        options[:text] = Regexp.escape(options[:text]) unless options[:text].kind_of?(Regexp)
         results = results.select { |n| n.text.match(options[:text]) }
       end
 

data/lib/capybara/session.rb

@@ -10,9 +10,9 @@ module Capybara
       :all, :attach_file, :body, :check, :choose, :click, :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, :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?
+      :visit, :wait_until, :within, :within_fieldset, :within_table, :within_frame, :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?
     ]
 
     attr_reader :mode, :app
@@ -62,6 +62,7 @@ module Capybara
 
     def fill_in(locator, options={})
       msg = "cannot fill in, no text field, text area or password field with id, name, or label '#{locator}' found"
+      raise "Must pass a hash containing 'with'" if not options.is_a?(Hash) or not options.has_key?(:with)
       locate(:xpath, XPath.fillable_field(locator), msg).set(options[:with])
     end
 
@@ -119,6 +120,12 @@ module Capybara
       end
     end
 
+    def within_frame(frame_id)
+      driver.within_frame(frame_id) do
+        yield
+      end
+    end
+
     def has_xpath?(path, options={})
       wait_conditionally_until do
         results = all(:xpath, path, options)

data/lib/capybara/spec/driver.rb

@@ -129,3 +129,34 @@ shared_examples_for "driver with header support" do
     @driver.response_headers['Content-Type'].should == 'text/html'
   end
 end
+
+shared_examples_for "driver with frame support" do
+  describe '#within_frame' do
+    before(:each) do
+      @driver.visit('/within_frames')
+    end
+
+    it "should find the div in frameOne" do
+      @driver.within_frame("frameOne") do
+        @driver.find("//*[@id='divInFrameOne']")[0].text.should eql 'This is the text of divInFrameOne'
+      end
+    end
+    it "should find the div in FrameTwo" do
+      @driver.within_frame("frameTwo") do
+        @driver.find("//*[@id='divInFrameTwo']")[0].text.should eql 'This is the text of divInFrameTwo'
+      end
+    end
+    it "should find the text div in the main window after finding text in frameOne" do
+      @driver.within_frame("frameOne") do
+        @driver.find("//*[@id='divInFrameOne']")[0].text.should eql 'This is the text of divInFrameOne'
+      end
+      @driver.find("//*[@id='divInMainWindow']")[0].text.should eql 'This is the text for divInMainWindow'
+    end
+    it "should find the text div in the main window after finding text in frameTwo" do
+      @driver.within_frame("frameTwo") do
+        @driver.find("//*[@id='divInFrameTwo']")[0].text.should eql 'This is the text of divInFrameTwo'
+      end
+      @driver.find("//*[@id='divInMainWindow']")[0].text.should eql 'This is the text for divInMainWindow'
+    end
+  end
+end

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

@@ -17,6 +17,34 @@ module CheckSpec
         end
       end
 
+      describe "checking" do
+        it "should not change an already checked checkbox" do
+          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
+          @session.check('form_pets_dog')
+          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
+        end
+
+        it "should check an unchecked checkbox" do
+          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
+          @session.check('form_pets_cat')
+          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_true
+        end
+      end
+
+      describe "unchecking" do
+        it "should not change an already unchecked checkbox" do
+          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
+          @session.uncheck('form_pets_cat')
+          @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
+        end
+
+        it "should uncheck a checked checkbox" do
+          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
+          @session.uncheck('form_pets_dog')
+          @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_false
+        end
+      end
+
       it "should check a checkbox by id" do
         @session.check("form_pets_cat")
         @session.click_button('awesome')

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

@@ -82,7 +82,11 @@ shared_examples_for "fill_in" do
       @session.click_button('awesome')
       extract_results(@session)['name'].should == 'Ford Prefect'
     end
-
+    
+    it "should throw an exception if a hash containing 'with' is not provided" do
+      lambda{@session.fill_in 'Name', 'ignu'}.should raise_error
+    end
+    
     context "with ignore_hidden_fields" do
       before { Capybara.ignore_hidden_elements = true }
       after  { Capybara.ignore_hidden_elements = false }

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

@@ -31,6 +31,12 @@ shared_examples_for "select" do
       extract_results(@session)['title'].should == 'Mr'
     end
 
+    it "should escape quotes" do
+      @session.select("John's made-up language", :from => 'Locale')
+      @session.click_button('awesome')
+      extract_results(@session)['locale'].should == 'jo'
+    end
+
     context "with a locator that doesn't exist" do
       it "should raise an error" do
         running { @session.select('foo', :from => 'does not exist') }.should raise_error(Capybara::ElementNotFound)

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

@@ -25,6 +25,12 @@ shared_examples_for "unselect" do
         extract_results(@session)['underwear'].should include('Commando', 'Boxer Briefs')
         extract_results(@session)['underwear'].should_not include('Briefs')
       end
+
+      it "should escape quotes" do
+        @session.unselect("Frenchman's Pantalons", :from => 'Underwear')
+        @session.click_button('awesome')
+        extract_results(@session)['underwear'].should_not include("Frenchman's Pantalons")
+      end
     end
 
     context "with single select" do

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

@@ -76,6 +76,7 @@
       <option selected="selected" value="en">English</option>
       <option value="fi">Finish</option>
       <option value="no">Norwegian</option>
+      <option value="jo">John's made-up language</option>
     </select>
   </p>
 
@@ -142,6 +143,7 @@
       <option>Boxers</option>
       <option selected="selected">Briefs</option>
       <option selected="selected">Commando</option>
+      <option selected="selected">Frenchman's Pantalons</option>
     </select>
   </p>
 

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

@@ -0,0 +1,8 @@
+<html>
+    <head>
+        <title>This is the title of frame one</title>
+    </head>
+    <body>
+        <div id="divInFrameOne">This is the text of divInFrameOne</div>
+    </body>
+</html>

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

@@ -0,0 +1,8 @@
+<html>
+    <head>
+        <title>This is the title of frame two</title>
+    </head>
+    <body>
+        <div id="divInFrameTwo">This is the text of divInFrameTwo</div>
+    </body>
+</html>

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

@@ -0,0 +1,10 @@
+<html>
+    <head>
+        <title>With Frames</title>
+    </head>
+    <body>
+        <div id="divInMainWindow">This is the text for divInMainWindow</div>
+    <iframe src="/frame_one" id="frameOne"></iframe>
+    <iframe src="/frame_two" id="frameTwo"></iframe>
+    </body>
+</html>

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 end

data/lib/capybara/wait_until.rb

@@ -18,6 +18,8 @@ module Capybara
           end
 
           driver && driver.wait_until(delay)
+
+          sleep(0.05)
         end
       end
 

data/lib/capybara/xpath.rb

@@ -5,6 +5,17 @@ module Capybara
   class XPath
 
     class << self
+      def escape(string)
+        if string.include?("'")
+          string = string.split("'", -1).map do |substr|
+            "'#{substr}'"
+          end.join(%q{,"'",})
+          "concat(#{string})"
+        else
+          "'#{string}'"
+        end
+      end
+      
       def wrap(path)
         if path.is_a?(self)
           path
@@ -161,15 +172,7 @@ module Capybara
 
     # Sanitize a String for putting it into an xpath query
     def s(string)
-      if string.include?("'")
-        string = string.split("'", -1).map do |substr|
-          "'#{substr}'"
-        end.join(%q{,"'",})
-        "concat(#{string})"
-      else
-        "'#{string}'"
-      end
-
+      XPath.escape(string)
     end
 
   end

data/spec/driver/selenium_driver_spec.rb

@@ -7,5 +7,5 @@ describe Capybara::Driver::Selenium do
 
   it_should_behave_like "driver"
   it_should_behave_like "driver with javascript support"
-  
+  it_should_behave_like "driver with frame support"
 end

data/spec/searchable_spec.rb

@@ -26,8 +26,8 @@ module Capybara
       
       context "with :text filter" do
         before do
-          @node1 = stub(Node, :text => 'node one text')
-          @node2 = stub(Node, :text => 'node two text')      
+          @node1 = stub(Node, :text => 'node one text (with parens)')
+          @node2 = stub(Node, :text => 'node two text [-]')
           @searchable.stub(:all_unfiltered).and_return([@node1, @node2])
         end
         
@@ -40,6 +40,11 @@ module Capybara
           @searchable.all('//x', :text => "node one").should == [@node1]
           @searchable.all('//x', :text => "node two").should == [@node2]
         end   
+
+        it "should allow Regexp reserved words in text" do
+          @searchable.all('//x', :text => "node one text (with parens)").should == [@node1]
+          @searchable.all('//x', :text => "node two text [-]").should == [@node2]
+        end
       end
       
       context "with :visible filter" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 +02:00
+date: 2010-05-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -191,12 +191,15 @@ files:
 - lib/capybara/spec/views/buttons.erb
 - lib/capybara/spec/views/fieldsets.erb
 - lib/capybara/spec/views/form.erb
+- lib/capybara/spec/views/frame_one.erb
+- lib/capybara/spec/views/frame_two.erb
 - lib/capybara/spec/views/postback.erb
 - lib/capybara/spec/views/tables.erb
 - lib/capybara/spec/views/with_html.erb
 - lib/capybara/spec/views/with_js.erb
 - lib/capybara/spec/views/with_scope.erb
 - lib/capybara/spec/views/with_simple_html.erb
+- lib/capybara/spec/views/within_frames.erb
 - lib/capybara/version.rb
 - lib/capybara/wait_until.rb
 - lib/capybara/xpath.rb