capybara 0.3.0 → 0.3.5

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ require 'drivers_spec'
 require 'session_spec'
 Dir[File.dirname(__FILE__)+'/dsl/*'].each { |group| 
   require group
-  include Object.const_get(group.match(/.*[\/]{1}([\w]*)[.rb]./).captures.first.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase })
 }
 require 'session_with_javascript_support_spec'
 require 'session_without_javascript_support_spec'
@@ -19,4 +18,10 @@ require 'session_without_headers_support_spec'
 
 alias :running :lambda
 
-Capybara.default_wait_time = 1 # less timeout so tests run faster
+Capybara.default_wait_time = 0 # less timeout so tests run faster
+
+Spec::Runner.configure do |config|
+  config.after do
+    Capybara.default_selector = :xpath
+  end
+end

data/spec/test_app.rb

@@ -38,14 +38,18 @@ class TestApp < Sinatra::Base
     nil
   end
 
-  get '/:view' do |view|
-    erb view.to_sym
-  end
-
   post '/redirect' do
     redirect '/redirect_again'
   end
 
+  get '/redirect_back' do
+    redirect back
+  end
+
+  get '/:view' do |view|
+    erb view.to_sym
+  end
+
   post '/form' do
     '<pre id="results">' + params[:form].to_yaml + '</pre>'
   end

data/spec/views/form.erb

@@ -1,6 +1,16 @@
 <h1>Form</h1>
 
 <form action="/form" method="post">
+
+  <p>
+    <label for="form_title">Title</label>
+    <select name="form[title]" id="form_title">
+      <option>Mrs</option>
+      <option>Mr</option>
+      <option>Miss</option>
+    </select>
+  </p>
+
   <p>
     <label for="form_first_name">
       First Name
@@ -12,6 +22,11 @@
     <label for="form_last_name">Last Name</label>
     <input type="text" name="form[last_name]" value="Smith" id="form_last_name"/>
   </p>
+  
+  <p>
+    <label for="form_name_explanation">Explanation of Name</label>
+    <textarea name="form[name_explanation]" id="form_name_explanation"></textarea>
+  </p>
 
   <p>
     <label for="form_name">Name</label>
@@ -106,10 +121,39 @@
   </p>
 
   <p>
+    <label for="form_languages">Languages</label>
+    <select name="form[languages][]" id="form_languages" multiple="multiple">
+      <option>Ruby</option>
+      <option>SQL</option>
+      <option>HTML</option>
+      <option>Javascript</option>
+    </select>
+  </p>
+
+  <p>
+    <label for="form_underwear">Underwear</label>
+    <select name="form[underwear][]" id="form_underwear" multiple="multiple">
+      <option selected="selected">Boxer Briefs</option>
+      <option>Boxers</option>
+      <option selected="selected">Briefs</option>
+      <option selected="selected">Commando</option>
+    </select>
+  </p>
+
+  <div style="display:none;">
+    <label for="form_first_name_hidden">
+      Super Secret
+      <input type="text" name="form[super_secret]" value="test123" id="form_super_secret"/>
+    </label>
+  </div>
+
+  <p>
+    <input type="button" name="form[fresh]" id="fresh_btn" value="i am fresh"/>
     <input type="submit" name="form[awesome]" id="awe123" value="awesome"/>
     <input type="submit" name="form[crappy]" id="crap321" value="crappy"/>
-    <input type="image" name="form[okay]" id="okay556" value="okay"/>
+    <input type="image" name="form[okay]" id="okay556" value="okay" alt="oh hai thar"/>
     <button type="submit" id="click_me_123" value="click_me">Click me!</button>
+    <button type="submit" name="form[no_value]">No Value!</button>
   </p>
 </form>
 
@@ -167,6 +211,10 @@
     <label for="html5_color">Html5 Color</label>
     <input type="color" name="form[html5_color]" value="#FFF" id="html5_color"/>
   </p>
+  
+  <p>
+    <input type="submit" name="form[html5_submit]" value="html5_submit"/>
+  </p>
 </form>
 
 <form action="/form" method="post">
@@ -176,4 +224,4 @@
     <input type="submit" name="form[button]" value="Just a button that came first"/>
     <input type="submit" name="form[button]" value="Just a button"/>
   </p>
-</form>
+</form>

data/spec/views/tables.erb

@@ -59,4 +59,64 @@
       </td>
     </tr>
   </table>
-</form>
+</form>
+
+<table>
+  <caption>Ransom</caption>
+
+  <thead>
+    <tr>
+      <th>Year</th>
+      <th>Governmental</th>
+      <th>Private</th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <tr>
+      <th scope="row">2007</th>
+      <td>$300</td>
+      <td>$100</td>
+    </tr>
+    <tr>
+      <th scope="row">2008</th>
+      <td>$123</td>
+      <td>$897</td>
+    </tr>
+    <tr>
+      <th scope="row">2009</th>
+      <td>$543</td>
+      <td>$99</td>
+    </tr>
+  </tbody>
+</table>
+
+<table>
+  <caption>Deaths</caption>
+
+  <thead>
+    <tr>
+      <th>Year</th>
+      <th>Sharks with lasers</th>
+      <th>Flaming volcano</th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <tr>
+      <th scope="row">2007</th>
+      <td>66</td>
+      <td>7</td>
+    </tr>
+    <tr>
+      <th scope="row">2008</th>
+      <td>123</td>
+      <td>12</td>
+    </tr>
+    <tr>
+      <th scope="row">2009</th>
+      <td>913</td>
+      <td>13</td>
+    </tr>
+  </tbody>
+</table>

data/spec/views/with_html.erb

@@ -6,6 +6,7 @@
   et dolore magna aliqua. Ut enim ad minim veniam,
   quis nostrud exercitation <a href="/foo" id="foo">ullamco</a> laboris nisi
   ut aliquip ex ea commodo consequat.
+  <a href="/with_simple_html"><img src="http://www.foobar.sun/dummy_image.jpg" width="20" height="20" alt="awesome image" /></a>
 </p>
 
 <p id="second">
@@ -16,6 +17,7 @@
 
 <p>
   <input type="text" id="test_field" value="monkey"/>
+  <a href="/redirect_back">BackToMyself</a>
   <a title="twas a fine link" href="/redirect">A link came first</a>
   <a title="a fine link" href="/with_simple_html">A link</a>
   <a>No Href</a>
@@ -25,8 +27,12 @@
   <a href="/with_simple_html#anchor">Anchor on different page</a>
   <a href="/with_html#anchor">Anchor on same page</a>
   <input type="text" value="" id="test_field">
+  <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>
 </p>
 
-<div id="hidden" style="display:none;">
+<div id="hidden" style="display: none;">
   <div id="hidden_via_ancestor">Inside element with hidden ancestor</div>
-</div>
+  <a href="/with_simple_html" title="awesome title" class="simple">hidden link</a>
+</div>

data/spec/views/with_js.erb

@@ -26,5 +26,9 @@
         <option>My Waiting Option</option>
       </select>
     </p>
+    
+    <p>
+      <input type="text" name="with_focus_event" value="" id="with_focus_event"/>
+    </p>
   </body>
 </html>

data/spec/xpath_spec.rb

@@ -155,6 +155,23 @@ describe Capybara::XPath do
       @driver.find(@query).first.value.should == 'seeekrit'
     end
   end
+
+  describe '#button' do
+    it "should find a button by id or content" do
+      @query = @xpath.button('awe123').to_s
+      @driver.find(@query).first.value.should == 'awesome'
+      @query = @xpath.button('okay556').to_s
+      @driver.find(@query).first.value.should == 'okay'
+      @query = @xpath.button('click_me_123').to_s
+      @driver.find(@query).first.value.should == 'click_me'
+      @query = @xpath.button('Click me!').to_s
+      @driver.find(@query).first.value.should == 'click_me'
+      @query = @xpath.button('fresh_btn').to_s
+      @driver.find(@query).first.value.should == 'i am fresh'
+      @query = @xpath.button('i am fresh').to_s
+      @driver.find(@query).first[:name].should == 'form[fresh]'
+    end
+  end
   
   describe '#radio_button' do
     it "should find a radio button by id or label" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capybara
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 +01:00
+date: 2010-02-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -161,11 +161,15 @@ files:
 - spec/dsl/current_url_spec.rb
 - spec/dsl/fill_in_spec.rb
 - spec/dsl/find_button_spec.rb
+- spec/dsl/find_by_id_spec.rb
 - spec/dsl/find_field_spec.rb
 - spec/dsl/find_link_spec.rb
 - spec/dsl/find_spec.rb
+- spec/dsl/has_button_spec.rb
 - spec/dsl/has_content_spec.rb
 - spec/dsl/has_css_spec.rb
+- spec/dsl/has_field_spec.rb
+- spec/dsl/has_link_spec.rb
 - spec/dsl/has_xpath_spec.rb
 - spec/dsl/locate_spec.rb
 - spec/dsl/select_spec.rb