capybara 1.1.4 → 2.0.0

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

@@ -21,7 +21,7 @@
   Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
   dolore eu fugiat <a href="/redirect" id="red">Redirect</a> pariatur. Excepteur sint occaecat cupidatat non proident,
   sunt in culpa qui officia
-  text   with
+  text   with &nbsp;
   whitespace
   id est laborum.
 </p>
@@ -37,14 +37,15 @@ 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">
+  <a href="//<%= request.host_with_port %>/foo">Protocol</a>
   <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 +58,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;">
@@ -72,6 +73,10 @@ banana</textarea>
   <a id="visible" class="visibility">visible link</a>
 </div>
 
+<div>
+  Number 42
+</div>
+
 <ul>
   <li id="john_monkey">Monkey John</li>
   <li id="paul_monkey">Monkey Paul</li>

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>

data/lib/capybara/version.rb

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

data/lib/capybara.rb

@@ -1,11 +1,13 @@
 require 'timeout'
 require 'nokogiri'
 require 'xpath'
+
 module Capybara
   class CapybaraError < StandardError; end
   class DriverNotFoundError < CapybaraError; end
   class FrozenInTime < CapybaraError; end
   class ElementNotFound < CapybaraError; end
+  class Ambiguous < ElementNotFound; end
   class ExpectationNotMet < ElementNotFound; end
   class FileNotFound < CapybaraError; end
   class UnselectNotAllowed < CapybaraError; end
@@ -15,10 +17,12 @@ module Capybara
   class InfiniteRedirectError < TimeoutError; end
 
   class << self
-    attr_accessor :asset_root, :app_host, :run_server, :default_host
-    attr_accessor :server_port, :server_boot_timeout
-    attr_accessor :default_selector, :default_wait_time, :ignore_hidden_elements, :prefer_visible_elements
+    attr_accessor :asset_root, :app_host, :run_server, :default_host, :always_include_port
+    attr_accessor :server_host, :server_port
+    attr_accessor :default_selector, :default_wait_time, :ignore_hidden_elements
     attr_accessor :save_and_open_page_path, :automatic_reload
+    attr_writer :default_driver, :current_driver, :javascript_driver, :session_name
+    attr_accessor :app
 
     ##
     #
@@ -33,11 +37,11 @@ module Capybara
     #
     # [asset_root = String]               Where static assets are located, used by save_and_open_page
     # [app_host = String]                 The default host to use when giving a relative URL to visit
+    # [always_include_port = Boolean]     Whether the Rack server's port should automatically be inserted into every visited URL (Default: false)
     # [run_server = Boolean]              Whether to start a Rack server for the given Rack app (Default: true)
     # [default_selector = :css/:xpath]    Methods which take a selector use the given type by default (Default: CSS)
     # [default_wait_time = Integer]       The number of seconds to wait for asynchronous processes to finish (Default: 2)
     # [ignore_hidden_elements = Boolean]  Whether to ignore hidden elements on the page (Default: false)
-    # [prefer_visible_elements = Boolean] Whether to prefer visible elements over hidden elements (Default: true)
     # [automatic_reload = Boolean]        Whether to automatically reload elements as Capybara is waiting (Default: true)
     # [save_and_open_page_path = String]  Where to put pages saved through save_and_open_page (Default: Dir.pwd)
     #
@@ -181,14 +185,130 @@ module Capybara
       end
     end
 
+    ##
+    #
+    # @return [Symbol]    The name of the driver to use by default
+    #
+    def default_driver
+      @default_driver || :rack_test
+    end
+
+    ##
+    #
+    # @return [Symbol]    The name of the driver currently in use
+    #
+    def current_driver
+      @current_driver || default_driver
+    end
+    alias_method :mode, :current_driver
+
+    ##
+    #
+    # @return [Symbol]    The name of the driver used when JavaScript is needed
+    #
+    def javascript_driver
+      @javascript_driver || :selenium
+    end
+
+    ##
+    #
+    # Use the default driver as the current driver
+    #
+    def use_default_driver
+      @current_driver = nil
+    end
+
+    ##
+    #
+    # Yield a block using a specific driver
+    #
+    def using_driver(driver)
+      previous_driver = Capybara.current_driver
+      Capybara.current_driver = driver
+      yield
+    ensure
+      @current_driver = previous_driver
+    end
+
+    ##
+    #
+    # Yield a block using a specific wait time
+    #
+    def using_wait_time(seconds)
+      previous_wait_time = Capybara.default_wait_time
+      Capybara.default_wait_time = seconds
+      yield
+    ensure
+      Capybara.default_wait_time = previous_wait_time
+    end
+
+    ##
+    #
+    # The current Capybara::Session based on what is set as Capybara.app and Capybara.current_driver
+    #
+    # @return [Capybara::Session]     The currently used session
+    #
+    def current_session
+      session_pool["#{current_driver}:#{session_name}:#{app.object_id}"] ||= Capybara::Session.new(current_driver, app)
+    end
+
+    ##
+    #
+    # Reset sessions, cleaning out the pool of sessions. This will remove any session information such
+    # as cookies.
+    #
+    def reset_sessions!
+      session_pool.each { |mode, session| session.reset! }
+    end
+    alias_method :reset!, :reset_sessions!
+
+    ##
+    #
+    # The current session name.
+    #
+    # @return [Symbol]    The name of the currently used session.
+    #
+    def session_name
+      @session_name ||= :default
+    end
+
+    ##
+    #
+    # Yield a block using a specific session name.
+    #
+    def using_session(name)
+      self.session_name = name
+      yield
+    ensure
+      self.session_name = :default
+    end
+
+    def included(base)
+      base.send(:include, Capybara::DSL)
+      warn "`include Capybara` is deprecated. Please use `include Capybara::DSL` instead."
+    end
+
     def deprecate(method, alternate_method)
       warn "DEPRECATED: ##{method} is deprecated, please use ##{alternate_method} instead"
     end
+
+  private
+
+    def session_pool
+      @session_pool ||= {}
+    end
   end
 
+  self.default_driver = nil
+  self.current_driver = nil
+
+  autoload :DSL,        'capybara/dsl'
   autoload :Server,     'capybara/server'
   autoload :Session,    'capybara/session'
   autoload :Selector,   'capybara/selector'
+  autoload :Query,      'capybara/query'
+  autoload :Result,     'capybara/result'
+  autoload :Helpers,    'capybara/helpers'
   autoload :VERSION,    'capybara/version'
 
   module Node
@@ -232,13 +352,12 @@ module Capybara
 end
 
 Capybara.configure do |config|
+  config.always_include_port = false
   config.run_server = true
   config.server {|app, port| Capybara.run_default_server(app, port)}
-  config.server_boot_timeout = 10
   config.default_selector = :css
   config.default_wait_time = 2
   config.ignore_hidden_elements = false
-  config.prefer_visible_elements = true
   config.default_host = "http://www.example.com"
   config.automatic_reload = true
 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
@@ -32,14 +36,22 @@ describe Capybara do
       Capybara.add_selector :lifeform do
         xpath { |name| "//option[contains(.,'#{name}')]" }
       end
-      string.should have_selector(:page)
-      string.should_not have_selector(:'does-not-exist')
+      string.should have_selector(:id, "page")
+      string.should_not have_selector(:id, 'does-not-exist')
       string.should have_selector(:lifeform, "Monkey")
       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/capybara_spec.rb

@@ -42,5 +42,14 @@ describe Capybara do
       Capybara.server.should == server
     end
   end
+end
 
+describe Capybara::Session do
+  context 'with non-existant driver' do
+    it "should raise an error" do
+      expect {
+        Capybara::Session.new(:quox, TestApp).driver
+      }.to raise_error(Capybara::DriverNotFoundError)
+    end
+  end
 end

data/spec/dsl_spec.rb

@@ -1,18 +1,24 @@
 require 'spec_helper'
-
 require 'capybara/dsl'
 
-describe Capybara::DSL do
+class TestClass
+  include Capybara::DSL
+end
 
-  before do
-    Capybara.app = TestApp
-  end
+Capybara::SpecHelper.run_specs TestClass.new, "DSL", :skip => [
+  :js,
+  :screenshot,
+  :frames,
+  :windows
+]
 
+describe Capybara::DSL do
   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 +75,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
@@ -96,13 +110,21 @@ describe Capybara::DSL do
   end
 
   describe '#using_wait_time' do
+    before do
+      @previous_wait_time = Capybara.default_wait_time
+    end
+
+    after do
+      Capybara.default_wait_time = @previous_wait_time
+    end
+
     it "should switch the wait time and switch it back" do
       in_block = nil
       Capybara.using_wait_time 6 do
         in_block = Capybara.default_wait_time
       end
       in_block.should == 6
-      Capybara.default_wait_time.should == 0
+      Capybara.default_wait_time.should == @previous_wait_time
     end
 
     it "should ensure wait time is reset" do
@@ -111,11 +133,7 @@ describe Capybara::DSL do
           raise "hell"
         end
       end.to raise_error
-      Capybara.default_wait_time.should == 0
-    end
-
-    after do
-      Capybara.default_wait_time = 0
+      Capybara.default_wait_time.should == @previous_wait_time
     end
   end
 
@@ -209,9 +227,6 @@ describe Capybara::DSL do
       @session = Class.new { include Capybara::DSL }.new
     end
 
-    it_should_behave_like "session"
-    it_should_behave_like "session without javascript support"
-
     it "should be possible to include it in another class" do
       klass = Class.new do
         include Capybara::DSL
@@ -250,5 +265,4 @@ describe Capybara::DSL do
       foo.using_wait_time(6)
     end
   end
-
 end