capybara 1.1.4 → 2.0.0.beta2

data/lib/capybara/spec/test_app.rb

@@ -3,8 +3,14 @@ require 'rack'
 require 'yaml'
 
 class TestApp < Sinatra::Base
+  class TestAppError < StandardError; end
+
   set :root, File.dirname(__FILE__)
   set :static, true
+  set :raise_errors, true
+  set :show_exceptions, false
+
+  # Also check lib/capybara/spec/views/*.erb for pages not listed here
 
   get '/' do
     'Hello world! <a href="with_html">Relative</a>'
@@ -22,8 +28,22 @@ class TestApp < Sinatra::Base
     redirect '/landed'
   end
 
+  get '/referer_base' do
+    '<a href="/get_referer">direct link</a>' +
+    '<a href="/redirect_to_get_referer">link via redirect</a>' +
+    '<form action="/get_referer" method="get"><input type="submit"></form>'
+  end
+
+  get '/redirect_to_get_referer' do
+    redirect '/get_referer'
+  end
+
+  get '/get_referer' do
+    request.referer.nil? ? "No referer" : "Got referer: #{request.referer}"
+  end
+
   get '/host' do
-    "Current host is #{request.scheme}://#{request.host}"
+    "Current host is #{request.scheme}://#{request.host}:#{request.port}"
   end
 
   get '/redirect/:times/times' do
@@ -72,7 +92,7 @@ class TestApp < Sinatra::Base
   end
 
   get '/redirect_secure' do
-    redirect "https://#{request.host}/host"
+    redirect "https://#{request.host}:#{request.port}/host"
   end
 
   get '/slow_response' do
@@ -98,6 +118,10 @@ class TestApp < Sinatra::Base
     redirect '/get_header'
   end
 
+  get '/error' do
+    raise TestAppError, "some error"
+  end
+
   get '/:view' do |view|
     erb view.to_sym
   end
@@ -107,7 +131,7 @@ class TestApp < Sinatra::Base
   end
 
   post '/upload_empty' do
-    if params[:form].nil? || params[:form][:file].nil?
+    if params[:form][:file].nil?
       'Successfully ignored empty file field.'
     else
       'Something went wrong.'

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

@@ -32,7 +32,7 @@
     <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>
@@ -47,7 +47,7 @@
     <label for="form_schmooo">Schmooo</label>
     <input type="schmooo" name="form[schmooo]" value="This is Schmooo!" id="form_schmooo"/>
   </p>
-  
+
   <p>
     <label>Street<br/>
       <input type="text" maxlength="" name="form[street]" value="Sesame street 66"/>
@@ -74,7 +74,7 @@
     <label for="form_image">Image</label>
     <input type="file" name="form[image]" id="form_image"/>
   </p>
-  
+
   <p>
     <input type="hidden" name="form[token]" value="12345" id="form_token"/>
   </p>
@@ -155,7 +155,7 @@
   <p>
     <label for="form_underwear">Underwear</label>
     <select name="form[underwear][]" id="form_underwear" multiple="multiple">
-      <option selected="selected">Boxer Briefs</option>
+      <option selected="selected">Boxerbriefs</option>
       <option>Boxers</option>
       <option selected="selected">Briefs</option>
       <option selected="selected">Commando</option>
@@ -163,7 +163,7 @@
       <option selected="selected" value="thermal">Long Johns</option>
     </select>
   </p>
- 
+
   <p>
     <span>First address<span>
     <label for='address1_street'>Street</label>
@@ -185,7 +185,7 @@
     <input type="text" name="form[addresses][][street]" value="" id="address2_street">
 
     <label for='address2_city'>City</label>
-    <input type="text" name="form[addresses][][city]" value="" id="address2_city"> 
+    <input type="text" name="form[addresses][][city]" value="" id="address2_city">
 
     <label for='address2_country'>Country</label>
     <select name="form[addresses][][country]" id="address2_country">
@@ -274,6 +274,7 @@
   </p>
 
   <p>
+    <input type="hidden" name="form[dummy]" value="ensure params[:form] exists"/>
     <input type="submit" value="Upload Empty"/>
   <p>
 </form>
@@ -285,12 +286,12 @@
   </p>
 
   <p>
-    <label for="form_document">Document</label>
+    <label for="form_document">Single Document</label>
     <input type="file" name="form[document]" id="form_document"/>
   </p>
- 
+
   <p>
-    <input type="submit" value="Upload"/>
+    <input type="submit" value="Upload Single"/>
   <p>
 </form>
 
@@ -337,7 +338,7 @@
     <label for="html5_color">Html5 Color</label>
     <input type="color" name="form[html5_color]" value="#FFFFFF" id="html5_color"/>
   </p>
-  
+
   <p>
     <input type="submit" name="form[html5_submit]" value="html5_submit"/>
   </p>

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

@@ -1,12 +1,12 @@
 <p>
   <a href="/host">Relative Host</a>
-  <a href="http://capybara2.elabs.se/host">Absolute Host</a>
+  <a href="<%= params[:absolute_host] %>/host">Absolute Host</a>
 </p>
 
 <form action="/host">
   <p><input type="submit" value="Relative Host"/></p>
 </form>
 
-<form action="http://capybara2.elabs.se/host">
+<form action="<%= params[:absolute_host] %>/host">
   <p><input type="submit" value="Absolute Host"/></p>
 </form>

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

@@ -1,7 +1,7 @@
 <form action="/form" method="post">
   <table id="agent_table">
     <caption>Agent</caption>
-  
+
     <tr>
       <td>
         <label for="form_agent_name">Name</label>
@@ -10,7 +10,7 @@
         <input type="text" name="form[agent_name]" value="James" id="form_agent_name"/>
       </td>
     </tr>
-  
+
     <tr>
       <td colspan="2">
         <input type="submit" value="Create"/>
@@ -22,7 +22,7 @@
 <form action="/form" method="post">
   <table id="girl_table">
     <caption>Girl</caption>
-  
+
     <tr>
       <td>
         <label for="form_girl_name">Name</label>
@@ -31,7 +31,7 @@
         <input type="text" name="form[girl_name]" value="Vesper" id="form_girl_name"/>
       </td>
     </tr>
-  
+
     <tr>
       <td colspan="2">
         <input type="submit" value="Create"/>
@@ -43,7 +43,7 @@
 <form action="/form" method="post">
   <table id="villain_table">
     <caption>Villain</caption>
-  
+
     <tr>
       <td>
         <label for="form_villain_name">Name</label>
@@ -52,7 +52,7 @@
         <input type="text" name="form[villain_name]" value="Ernst" id="form_villain_name"/>
       </td>
     </tr>
-  
+
     <tr>
       <td colspan="2">
         <input type="submit" value="Create"/>
@@ -60,63 +60,3 @@
     </tr>
   </table>
 </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/lib/capybara/spec/views/with_html.erb

@@ -37,14 +37,14 @@ banana</textarea>
   <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 title="a fine link with data method" data-method="delete" href="/delete">A link with data-method</a>
+  <a title="a fine link with capitalized data method" data-method="DELETE" href="/delete">A link with capitalized data-method</a>
   <a>No Href</a>
   <a href="">Blank Href</a>
   <a href="#">Blank Anchor</a>
-  <a href="#anchor">Anchor</a>
+  <a href="#anchor">Normal Anchor</a>
   <a href="/with_simple_html#anchor">Anchor on different page</a>
   <a href="/with_html#anchor">Anchor on same page</a>
   <a href="with_html">Relative</a>
-  <input type="text" value="" id="test_field">
   <input type="text" checked="checked" id="checked_field">
   <a href="/redirect"><img width="20" height="20" alt="very fine image" /></a>
   <a href="/with_simple_html"><img width="20" height="20" alt="fine image" /></a>
@@ -57,7 +57,7 @@ banana</textarea>
 
 <div id="hidden" style="display: none;">
   <div id="hidden_via_ancestor">Inside element with hidden ancestor</div>
-  <a href="/with_simple_html" title="awesome title" class="simple">hidden link</a>
+  <a href="/with_simple_html" title="hidden link" class="simple">hidden link</a>
 </div>
 
 <div style="display: none;">

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

@@ -2,14 +2,14 @@
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_js</title>
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript" charset="utf-8"></script>
-    <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/jquery-ui.js" type="text/javascript" charset="utf-8"></script>
     <script src="/test.js" type="text/javascript" charset="utf-8"></script>
   </head>
-  
+
   <body id="with_js">
     <h1>FooBar</h1>
-    
+
     <p id="change">This is text</p>
     <div id="drag">
       <p>This is a draggable element.</p>
@@ -17,20 +17,24 @@
     <div id="drop">
       <p>It should be dropped here.</p>
     </div>
-    
+
     <p><a href="#" id="clickable">Click me</a></p>
-    
+
     <p>
       <select id="waiter">
         <option>Foo</option>
         <option>My Waiting Option</option>
       </select>
     </p>
-    
+
     <p>
       <input type="text" name="with_focus_event" value="" id="with_focus_event"/>
     </p>
 
+    <p>
+      <input type="text" name="with_change_event" value="default value" id="with_change_event"/>
+    </p>
+
     <p>
       <input type="checkbox" id="checkbox_with_event"/>
     </p>
@@ -41,7 +45,6 @@
 
     <p>
       <a id="reload-link" href="#">Reload!</a>
-      <em>this won't change</em>
       <div id="reload-me"><em>waiting to be reloaded</em></div>
     </p>
 

data/lib/capybara/util/save_and_open_page.rb

@@ -22,11 +22,12 @@ module Capybara
   protected
 
     def open_in_browser(path) # :nodoc
-      require "launchy"
+      require "launchy" # could raise LoadError
+      raise LoadError unless Launchy::Version::MAJOR >= 2
       Launchy.open(path)
     rescue LoadError
-      warn "Sorry, you need to install launchy (`gem install launchy`) and " <<
-        "make sure it's available to open pages with `save_and_open_page`."
+      warn "You need launchy >=2.0.0 to open pages with `save_and_open_page`:\n" <<
+        "gem 'launchy', '>= 2.0.0', :require => false, :group => :test"
     end
 
     def rewrite_css_and_image_references(response_html) # :nodoc:

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '1.1.4'
+  VERSION = '2.0.0.beta2'
 end

data/spec/basic_node_spec.rb

@@ -6,7 +6,7 @@ describe Capybara do
       Capybara.string <<-STRING
         <div id="page">
           <div id="content">
-            <h1 data="fantastic">Awesome</h1>
+            <h1 data="fantastic">Totally awesome</h1>
             <p>Yes it is</p>
           </div>
 
@@ -19,6 +19,10 @@ describe Capybara do
               <option selected="selected">Capybara</option>
             </select>
           </div>
+
+          <section>
+            <div class="subsection"></div>
+          </div>
         </div>
       STRING
     end
@@ -38,8 +42,16 @@ describe Capybara do
       string.should_not have_selector(:lifeform, "Gorilla")
     end
 
+    it 'allows custom matcher using css' do
+      Capybara.add_selector :section do
+        css { |css_class| "section .#{css_class}" }
+      end
+      string.should     have_selector(:section, 'subsection')
+      string.should_not have_selector(:section, 'section_8')
+    end
+
     it "allows using matchers with text option" do
-      string.should have_css('h1', :text => 'Awesome')
+      string.should have_css('h1', :text => 'Totally awesome')
       string.should_not have_css('h1', :text => 'Not so awesome')
     end
 
@@ -49,7 +61,7 @@ describe Capybara do
     end
 
     it "allows finding elements and extracting text from them" do
-      string.find('//h1').text.should == 'Awesome'
+      string.find('//h1').text.should == 'Totally awesome'
     end
 
     it "allows finding elements and extracting attributes from them" do

data/spec/dsl_spec.rb

@@ -1,18 +1,12 @@
 require 'spec_helper'
-
 require 'capybara/dsl'
 
 describe Capybara::DSL do
-
-  before do
-    Capybara.app = TestApp
-  end
-
   after do
     Capybara.session_name = nil
     Capybara.default_driver = nil
-    Capybara.javascript_driver = nil
     Capybara.use_default_driver
+    Capybara.app = TestApp
   end
 
   describe '#default_driver' do
@@ -69,12 +63,20 @@ describe Capybara::DSL do
       driver.should == :selenium
     end
 
-    it 'should reset the driver using Capybara.use_default_driver, even if an exception occurs' do
+    it 'should return the driver to default if it has not been changed' do
+      Capybara.using_driver(:selenium) do
+        Capybara.current_driver.should == :selenium
+      end
+      Capybara.current_driver.should == Capybara.default_driver
+    end
+
+    it 'should reset the driver even if an exception occurs' do
+      driver_before_block = Capybara.current_driver
       begin
         Capybara.using_driver(:selenium) { raise "ohnoes!" }
       rescue Exception
       end
-      Capybara.current_driver.should == Capybara.default_driver
+      Capybara.current_driver.should == driver_before_block
     end
 
     it 'should return the driver to what it was previously' do
@@ -211,6 +213,7 @@ describe Capybara::DSL do
 
     it_should_behave_like "session"
     it_should_behave_like "session without javascript support"
+    it_should_behave_like "session without screenshot support"
 
     it "should be possible to include it in another class" do
       klass = Class.new do
@@ -250,5 +253,4 @@ describe Capybara::DSL do
       foo.using_wait_time(6)
     end
   end
-
 end