capybara 0.1.3 → 0.1.4

data/spec/test_app.rb

@@ -50,7 +50,7 @@ class TestApp < Sinatra::Base
   end
 
   post '/upload' do
-    params[:form][:document][:tempfile].read
+    params[:form][:document][:tempfile].read rescue ''
   end
 end
 

data/spec/views/form.erb

@@ -2,8 +2,10 @@
 
 <form action="/form" method="post">
   <p>
-    <label for="form_first_name">First Name</label>
-    <input type="text" name="form[first_name]" value="John" id="form_first_name"/>
+    <label for="form_first_name">
+      First Name
+      <input type="text" name="form[first_name]" value="John" id="form_first_name"/>
+    </label>
   </p>
 
   <p>
@@ -11,11 +13,27 @@
     <input type="text" name="form[last_name]" value="Smith" id="form_last_name"/>
   </p>
 
+  <p>
+    <label for="form_name">Name</label>
+    <input type="text" name="form[name]" value="John Smith" id="form_name"/>
+  </p>
+
+  <p>
+    <label for="form_phone">Phone</label>
+    <input type="text" name="form[phone]" value="+1 555 7021" id="form_phone"/>
+  </p>
+
   <p>
     <label for="form_password">Password</label>
     <input type="password" name="form[password]" value="seeekrit" id="form_password"/>
   </p>
-  
+
+  <p>
+    <label for="form_terms_of_use">Terms of Use</label>
+    <input type="hidden" name="form[terms_of_use]" value="0" id="form_terms_of_use_default">
+    <input type="checkbox" name="form[terms_of_use]" value="1" id="form_terms_of_use">
+  </p>
+
   <p>
     <label for="form_image">Image</label>
     <input type="file" name="form[image]" id="form_image"/>
@@ -101,6 +119,11 @@
 </form>
 
 <form action="/upload" method="post" enctype="multipart/form-data">
+  <p>
+    <label for="form_file_name">File Name</label>
+    <input type="file" name="form[file_name]" id="form_file_name"/>
+  </p>
+
   <p>
     <label for="form_document">Document</label>
     <input type="file" name="form[document]" id="form_document"/>

data/spec/views/with_js.erb

@@ -3,10 +3,27 @@
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_js</title>
     <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/jquery-ui.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript" charset="utf-8">
     //<![CDATA[
       $(function() {
         $('#change').text('I changed it');
+        $('#drag').draggable();
+        $('#drop').droppable({
+          drop: function(event, ui) {
+            ui.draggable.remove();
+            $(this).html('Dropped!');
+          }
+        });
+        $('#clickable').click(function() {
+          var link = $(this);
+          setTimeout(function() {
+            $(link).after('<a href="#">Has been clicked</a>');
+            $(link).after('<input type="submit" value="New Here">');
+            $(link).after('<input type="text" id="new_field">');
+          }, 500);
+          return false;
+        });
       });
     //]]>
     </script>
@@ -16,5 +33,13 @@
     <h1>FooBar</h1>
     
     <p id="change">This is text</p>
+    <div id="drag">
+      <p>This is a draggable element.</p>
+    </div>
+    <div id="drop">
+      <p>It should be dropped here.</p>
+    </div>
+    
+    <p><a href="#" id="clickable">Click me</a></p>
   </body>
 </html>

data/spec/xpath_spec.rb

@@ -0,0 +1,195 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe Capybara::XPath do
+
+  before do
+    @driver = Capybara::Driver::RackTest.new(TestApp)
+    @driver.visit('/form')
+    @xpath = Capybara::XPath.new
+  end
+  
+  it "should proxy any class method calls to a new instance" do
+    @query = Capybara::XPath.fillable_field('First Name').to_s
+    @driver.find(@query).first.value.should == 'John'
+  end
+  
+  it "should respond to instance methods at the class level" do
+    Capybara::XPath.should respond_to(:fillable_field)
+  end
+  
+  describe '.wrap' do
+    it "should return an XPath unmodified" do
+      Capybara::XPath.wrap(@xpath).should == @xpath
+    end
+    
+    it "should wrap a string in an xpath object" do
+      @xpath = Capybara::XPath.wrap('//foo/bar')
+      @xpath.should be_an_instance_of(Capybara::XPath)
+      @xpath.paths.should == ['//foo/bar']
+    end
+  end
+  
+  describe '#scope' do
+    it "should prepend the given scope to all paths" do
+      @xpath = Capybara::XPath.new('//foo/bar', '//test[@blah=foo]').scope('//quox')
+      @xpath.paths.should include('//quox//foo/bar', '//quox//test[@blah=foo]')
+    end
+  end
+
+  describe '#field' do
+    it "should find any field by id or label" do
+      @query = @xpath.field('First Name').to_s
+      @driver.find(@query).first.value.should == 'John'
+      @query = @xpath.field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+      @query = @xpath.field('Description').to_s
+      @driver.find(@query).first.text.should == 'Descriptive text goes here'
+      @query = @xpath.field('Document').to_s
+      @driver.find(@query).first[:name].should == 'form[document]'
+      @query = @xpath.field('Cat').to_s
+      @driver.find(@query).first.value.should == 'cat'
+      @query = @xpath.field('Male').to_s
+      @driver.find(@query).first.value.should == 'male'
+      @query = @xpath.field('Region').to_s
+      @driver.find(@query).first[:name].should == 'form[region]'
+    end
+    
+    it "should be chainable" do
+      @query = @xpath.field('First Name').password_field('First Name').to_s
+      @driver.find(@query).first.value.should == 'John'
+      @query = @xpath.field('Password').password_field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+    end
+  end
+  
+  describe '#fillable_field' do
+    it "should find a text field, password field, or text area by id or label" do
+      @query = @xpath.fillable_field('First Name').to_s
+      @driver.find(@query).first.value.should == 'John'
+      @query = @xpath.fillable_field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+      @query = @xpath.fillable_field('Description').to_s
+      @driver.find(@query).first.text.should == 'Descriptive text goes here'
+    end
+    
+    it "should be chainable" do
+      @query = @xpath.fillable_field('First Name').password_field('First Name').to_s
+      @driver.find(@query).first.value.should == 'John'
+      @query = @xpath.fillable_field('Password').password_field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+    end
+  end
+
+  describe '#text_field' do
+    it "should find a text field by id or label" do
+      @query = @xpath.text_field('form_first_name').to_s
+      @driver.find(@query).first.value.should == 'John'
+      @query = @xpath.text_field('First Name').to_s
+      @driver.find(@query).first.value.should == 'John'
+    end
+
+    it "should be chainable" do
+      @query = @xpath.text_field('First Name').password_field('First Name').to_s
+      @driver.find(@query).first.value.should == 'John'
+      @query = @xpath.text_field('Password').password_field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+    end
+  end
+
+  describe '#password_field' do
+    it "should find a password field by id or label" do
+      @query = @xpath.password_field('form_password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+      @query = @xpath.password_field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+    end
+
+    it "should be chainable" do
+      @query = @xpath.password_field('First Name').text_field('First Name').to_s
+      @driver.find(@query).first.value.should == 'John'
+      @query = @xpath.password_field('Password').text_field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+    end
+  end
+  
+  describe '#text_area' do
+    it "should find a text area by id or label" do
+      @query = @xpath.text_area('form_description').to_s
+      @driver.find(@query).first.text.should == 'Descriptive text goes here'
+      @query = @xpath.text_area('Description').to_s
+      @driver.find(@query).first.text.should == 'Descriptive text goes here'
+    end
+    
+    it "should be chainable" do
+      @query = @xpath.text_area('Description').password_field('Description').to_s
+      @driver.find(@query).first.text.should == 'Descriptive text goes here'
+      @query = @xpath.text_area('Password').password_field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+    end
+  end
+  
+  describe '#radio_button' do
+    it "should find a radio button by id or label" do
+      @query = @xpath.radio_button('Male').to_s
+      @driver.find(@query).first.value.should == 'male'
+      @query = @xpath.radio_button('gender_male').to_s
+      @driver.find(@query).first.value.should == 'male'
+    end
+    
+    it "should be chainable" do
+      @query = @xpath.radio_button('Male').password_field('Male').to_s
+      @driver.find(@query).first.value.should == 'male'
+      @query = @xpath.radio_button('Password').password_field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+    end
+  end
+  
+  describe '#checkbox' do
+    it "should find a checkbox by id or label" do
+      @query = @xpath.checkbox('Cat').to_s
+      @driver.find(@query).first.value.should == 'cat'
+      @query = @xpath.checkbox('form_pets_cat').to_s
+      @driver.find(@query).first.value.should == 'cat'
+    end
+    
+    it "should be chainable" do
+      @query = @xpath.checkbox('Cat').password_field('Cat').to_s
+      @driver.find(@query).first.value.should == 'cat'
+      @query = @xpath.checkbox('Password').password_field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+    end
+  end
+
+  describe '#select' do
+    it "should find a select by id or label" do
+      @query = @xpath.select('Region').to_s
+      @driver.find(@query).first[:name].should == 'form[region]'
+      @query = @xpath.select('form_region').to_s
+      @driver.find(@query).first[:name].should == 'form[region]'
+    end
+    
+    it "should be chainable" do
+      @query = @xpath.select('Region').password_field('Region').to_s
+      @driver.find(@query).first[:name].should == 'form[region]'
+      @query = @xpath.select('Password').password_field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+    end
+  end
+  
+  describe '#file_field' do
+    it "should find a file field by id or label" do
+      @query = @xpath.file_field('Document').to_s
+      @driver.find(@query).first[:name].should == 'form[document]'
+      @query = @xpath.file_field('form_document').to_s
+      @driver.find(@query).first[:name].should == 'form[document]'
+    end
+    
+    it "should be chainable" do
+      @query = @xpath.file_field('Document').password_field('Document').to_s
+      @driver.find(@query).first[:name].should == 'form[document]'
+      @query = @xpath.file_field('Password').password_field('Password').to_s
+      @driver.find(@query).first.value.should == 'seeekrit'
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capybara
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 +01:00
+date: 2009-12-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,10 +115,9 @@ files:
 - Rakefile
 - lib/capybara.rb
 - lib/capybara/cucumber.rb
+- lib/capybara/driver/base.rb
 - lib/capybara/driver/culerity_driver.rb
-- lib/capybara/driver/firewatir_driver.rb
 - lib/capybara/driver/rack_test_driver.rb
-- lib/capybara/driver/safariwatir_driver.rb
 - lib/capybara/driver/selenium_driver.rb
 - lib/capybara/dsl.rb
 - lib/capybara/node.rb
@@ -126,17 +125,17 @@ files:
 - lib/capybara/save_and_open_page.rb
 - lib/capybara/server.rb
 - lib/capybara/session.rb
+- lib/capybara/xpath.rb
 - script/console
 - script/destroy
 - script/generate
 - spec/driver/culerity_driver_spec.rb
-- spec/driver/firewatir_driver_spec.rb
 - spec/driver/rack_test_driver_spec.rb
-- spec/driver/safariwarit_driver_spec.rb
 - spec/driver/selenium_driver_spec.rb
 - spec/drivers_spec.rb
 - spec/dsl_spec.rb
 - spec/fixtures/test_file.txt
+- spec/public/jquery-ui.js
 - spec/public/jquery.js
 - spec/save_and_open_page_spec.rb
 - spec/session/culerity_session_spec.rb
@@ -153,6 +152,7 @@ files:
 - spec/views/with_js.erb
 - spec/views/with_scope.erb
 - spec/views/with_simple_html.erb
+- spec/xpath_spec.rb
 has_rdoc: true
 homepage: http://github.com/jnicklas/capybara
 licenses: []

data/lib/capybara/driver/firewatir_driver.rb

@@ -1,66 +0,0 @@
-require 'watir'
-Watir::Browser.default = "firefox"
-
-class Capybara::Driver::FireWatir
-  class Node < Struct.new(:node)
-    def text
-      node.text
-    end
-    
-    def attribute(name)
-      value = if name.to_sym == :class
-        node.class_name
-      else
-        node.send(name.to_sym)
-      end
-      return value if value and not value.empty?
-    end
-    
-    def click
-      node.click
-    end
-    
-    def tag_name
-      # FIXME: this might be the dumbest way ever of getting the tag name
-      # there has to be something better...
-      node.to_xml[/^\s*<([a-z0-9\-\:]+)/, 1]
-    end
-  end
-  
-  attr_reader :app, :rack_server
-
-  def initialize(app)
-    @app = app
-    @rack_server = Capybara::Server.new(@app)
-    @rack_server.boot
-  end
-  
-  def visit(path)
-    browser.goto(url(path))
-  end
-  
-  def body
-    browser.html
-  end
-  
-  def find(selector)
-    browser.elements_by_xpath(selector).map { |node| Node.new(node) }
-  end
-
-private
-
-  def url(path)
-    rack_server.url(path)
-  end
-  
-  def browser
-    unless @_browser
-      @_browser = Watir::Browser.new
-      at_exit do
-        @_browser.exit
-      end
-    end
-    @_browser
-  end
-
-end

data/lib/capybara/driver/safariwatir_driver.rb

@@ -1,67 +0,0 @@
-require 'safariwatir'
-
-class Capybara::Driver::SafariWatir
-  class Node < Struct.new(:node)
-    def text
-      node.text
-    end
-    
-    def attribute(name)
-      value = if name.to_sym == :class
-        node.class_name
-      else
-        node.send(name.to_sym)
-      end
-      return value if value and not value.empty?
-    end
-    
-    def click
-      node.click
-    end
-    
-    def tag_name
-      # FIXME: this might be the dumbest way ever of getting the tag name
-      # there has to be something better...
-      node.to_xml[/^\s*<([a-z0-9\-\:]+)/, 1]
-    end
-  end
-  
-  attr_reader :app, :rack_server
-
-  def initialize(app)
-    @app = app
-    @rack_server = Capybara::Server.new(@app)
-    @rack_server.boot
-  end
-  
-  def visit(path)
-    browser.goto(url(path))
-  end
-  
-  def body
-    browser.html
-  end
-  
-  def find(selector)
-    foo = Struct.new(:what).new
-    foo.what = selector
-    browser.send(:scripter).operate_by_xpath(foo){}.map { |node| Node.new(node) }
-  end
-
-private
-
-  def url(path)
-    rack_server.url(path)
-  end
-  
-  def browser
-    unless @_browser
-      @_browser = Watir::Safari.new
-      at_exit do
-        @_browser.exit
-      end
-    end
-    @_browser
-  end
-
-end