capybara 1.0.1 → 1.1.0.rc1

data/lib/capybara/node/matchers.rb

@@ -34,7 +34,7 @@ module Capybara
       #
       def has_selector?(*args)
         options = if args.last.is_a?(Hash) then args.last else {} end
-        wait_conditionally_until do
+        wait_until do
           results = all(*args)
 
           case
@@ -50,9 +50,9 @@ module Capybara
             options[:minimum].to_i <= results.size
           else
             results.size > 0
-          end
+          end or raise ExpectationNotMet
         end
-      rescue Capybara::TimeoutError
+      rescue Capybara::ExpectationNotMet
         return false
       end
 
@@ -66,7 +66,7 @@ module Capybara
       #
       def has_no_selector?(*args)
         options = if args.last.is_a?(Hash) then args.last else {} end
-        wait_conditionally_until do
+        wait_until do
           results = all(*args)
 
           case
@@ -82,9 +82,9 @@ module Capybara
             not(options[:minimum].to_i <= results.size)
           else
             results.empty?
-          end
+          end or raise ExpectationNotMet
         end
-      rescue Capybara::TimeoutError
+      rescue Capybara::ExpectationNotMet
         return false
       end
 

data/lib/capybara/node/simple.rb

@@ -120,16 +120,12 @@ module Capybara
 
     protected
 
-      def find_in_base(xpath)
+      def find_in_base(selector, xpath)
         native.xpath(xpath).map { |node| self.class.new(node) }
       end
 
-      def convert_element(element)
-        element
-      end
-
-      def wait?
-        false
+      def wait_until
+        yield # simple nodes don't need to wait
       end
     end
   end

data/lib/capybara/rack_test/browser.rb

@@ -1,32 +1,42 @@
 class Capybara::RackTest::Browser
   include ::Rack::Test::Methods
 
-  attr_reader :app, :options
+  attr_reader :driver
   attr_accessor :current_host
 
-  def initialize(app, options={})
-    @app = app
-    @options = options
+  def initialize(driver)
+    @driver = driver
+  end
+
+  def app
+    driver.app
+  end
+
+  def options
+    driver.options
   end
 
   def visit(path, attributes = {})
     reset_host!
     process(:get, path, attributes)
+    follow_redirects!
   end
 
   def submit(method, path, attributes)
     path = request_path if not path or path.empty?
     process(method, path, attributes)
+    follow_redirects!
   end
 
   def follow(method, path, attributes = {})
     return if path.gsub(/^#{request_path}/, '').start_with?('#')
     process(method, path, attributes)
+    follow_redirects!
   end
 
   def follow_redirects!
     5.times do
-      follow_redirect! if last_response.redirect?
+      process(:get, last_response["Location"]) if last_response.redirect?
     end
     raise Capybara::InfiniteRedirectError, "redirected more than 5 times, check for infinite redirects." if last_response.redirect?
   end
@@ -38,20 +48,18 @@ class Capybara::RackTest::Browser
     if new_uri.host
       @current_host = new_uri.scheme + '://' + new_uri.host
     end
-    
+
     if new_uri.relative?
-      path = request_path + path if path.start_with?('?')
-      
-      unless path.start_with?('/')
-        folders = request_path.split('/')
-        path = (folders[0, folders.size - 1] << path).join('/')
+      if path.start_with?('?')
+        path = request_path + path
+      elsif not path.start_with?('/')
+        path = request_path.sub(%r(/[^/]*$), '/') + path
       end
       path = current_host + path
     end
-    
+
     reset_cache!
     send(method, path, attributes, env)
-    follow_redirects!
   end
 
   def current_url

data/lib/capybara/rack_test/driver.rb

@@ -14,7 +14,7 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
   end
 
   def browser
-    @browser ||= Capybara::RackTest::Browser.new(app, options)
+    @browser ||= Capybara::RackTest::Browser.new(self)
   end
 
   def response

data/lib/capybara/rack_test/node.rb

@@ -51,7 +51,8 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
 
   def click
     if tag_name == 'a'
-      method = self["data-method"] || :get
+      method = self["data-method"] if driver.options[:respect_data_method]
+      method ||= :get
       driver.follow(method, self[:href].to_s)
     elsif (tag_name == 'input' and %w(submit image).include?(type)) or
         ((tag_name == 'button') and type.nil? or type == "submit")

data/lib/capybara/selenium/driver.rb

@@ -2,7 +2,7 @@ require 'selenium-webdriver'
 
 class Capybara::Selenium::Driver < Capybara::Driver::Base
   DEFAULT_OPTIONS = {
-    :resynchronize => true,
+    :resynchronize => false,
     :resynchronization_timeout => 10,
     :browser => :firefox
   }
@@ -16,7 +16,10 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
       main = Process.pid
       at_exit do
+        # Store the exit status of the test run since it goes away after calling the at_exit proc...
+        @exit_status = $!.status if $!.is_a?(SystemExit)
         quit if Process.pid == main
+        exit @exit_status if @exit_status # Force exit with stored status
       end
     end
     @browser
@@ -118,6 +121,10 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     # Browser must have already gone
   end
 
+  def invalid_element_errors
+    [Selenium::WebDriver::Error::ObsoleteElementError]
+  end
+
 private
 
   def load_wait_for_ajax_support

data/lib/capybara/session.rb

@@ -173,11 +173,20 @@ module Capybara
     #       fill_in('Street', :with => '12 Main Street')
     #     end
     #
-    # @param (see Capybara::Node::Finders#all)
+    # @overload within(*find_args)
+    #   @param (see Capybara::Node::Finders#all)
+    #
+    # @overload within(a_node)
+    #   @param [Capybara::Node::Base] a_node   The node in whose scope the block should be evaluated
+    #
     # @raise  [Capybara::ElementNotFound]   If the scope can't be found before time expires
     #
     def within(*args)
-      new_scope = find(*args)
+      new_scope = if args.size == 1 && Capybara::Node::Base === args.first
+                    args.first
+                  else
+                    find(*args)
+                  end
       begin
         scopes.push(new_scope)
         yield
@@ -284,7 +293,7 @@ module Capybara
     end
 
     def document
-      Capybara::Node::Document.new(self, driver)
+      @document ||= Capybara::Node::Document.new(self, driver)
     end
 
     NODE_METHODS.each do |method|
@@ -295,6 +304,10 @@ module Capybara
       RUBY
     end
 
+    def inspect
+      %(#<Capybara::Session>)
+    end
+
   private
 
     def current_node

data/lib/capybara/spec/driver.rb

@@ -138,6 +138,7 @@ shared_examples_for "driver with resynchronization support" do
   before { @driver.visit('/with_js') }
   describe "#find" do
     context "with synchronization turned on" do
+      before { @driver.options[:resynchronize] = true }
       it "should wait for all ajax requests to finish" do
         @driver.find('//input[@id="fire_ajax_request"]').first.click
         @driver.find('//p[@id="ajax_request_done"]').should_not be_empty
@@ -146,16 +147,14 @@ shared_examples_for "driver with resynchronization support" do
 
     context "with resynchronization turned off" do
       before { @driver.options[:resynchronize] = false }
-
       it "should not wait for ajax requests to finish" do
         @driver.find('//input[@id="fire_ajax_request"]').first.click
         @driver.find('//p[@id="ajax_request_done"]').should be_empty
       end
-
-      after { @driver.options[:resynchronize] = true }
     end
 
     context "with short synchronization timeout" do
+      before { @driver.options[:resynchronize] = true }
       before { @driver.options[:resynchronization_timeout] = 0.1 }
 
       it "should raise an error" do
@@ -163,10 +162,11 @@ shared_examples_for "driver with resynchronization support" do
           @driver.find('//input[@id="fire_ajax_request"]').first.click
         end.to raise_error(Capybara::TimeoutError, "failed to resynchronize, ajax request timed out")
       end
-
-      after { @driver.options[:resynchronization_timeout] = 10 }
     end
   end
+
+  after { @driver.options[:resynchronize] = false }
+  after { @driver.options[:resynchronization_timeout] = 10 }
 end
 
 shared_examples_for "driver with header support" do

data/lib/capybara/spec/public/test.js

@@ -35,4 +35,9 @@ $(function() {
       $('body').append('<p id="ajax_request_done">Ajax request done</p>');
     }});
   });
+  $('#reload-link').click(function() {
+    setTimeout(function() {
+      $('#reload-me').replaceWith('<div id="reload-me"><em><a>RELOADED</a></em></div>');
+    }, 250)
+  });
 });

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

@@ -52,7 +52,7 @@ shared_examples_for "click_button" do
         end
 
         it "should serialise and submit color fields" do
-          @results['html5_color'].should == '#FFF'
+          @results['html5_color'].should == '#FFFFFF'
         end
       end
 

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

@@ -70,6 +70,12 @@ shared_examples_for "click_link" do
       end
     end
 
+    it "should follow relative links" do
+      @session.visit('/')
+      @session.click_link('Relative')
+      @session.body.should include('This is a test')
+    end
+
     it "should follow redirects" do
       @session.click_link('Redirect')
       @session.body.should include('You landed')

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

@@ -58,5 +58,11 @@ shared_examples_for "current_host" do
       @session.body.should include('Current host is http://capybara2.elabs.se')
       @session.current_host.should == 'http://capybara2.elabs.se'
     end
+
+    it "is affected by following a redirect" do
+      @session.visit('http://capybara-testapp.heroku.com/redirect_secure')
+      @session.body.should include('Current host is https://capybara-testapp.heroku.com')
+      @session.current_host.should == 'https://capybara-testapp.heroku.com'
+    end
   end
 end

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

@@ -32,6 +32,12 @@ shared_examples_for "find" do
       it "should scope CSS selectors" do
         @session.find(:css, '#second').should have_no_css('h1')
       end
+
+      it "should have a reference to its parent if there is one" do
+        @node = @session.find(:css, '#first')
+        @node.parent.should == @node.session.document
+        @node.find('a').parent.should == @node
+      end
     end
 
     context "with css selectors" do

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

@@ -18,6 +18,64 @@ shared_examples_for "session with javascript support" do
       end
     end
 
+    describe 'Node#reload' do
+      context "without automatic reload" do
+        before { Capybara.automatic_reload = false }
+        it "should reload the current context of the node" do
+          @session.visit('/with_js')
+          node = @session.find(:css, '#reload-me')
+          @session.click_link('Reload!')
+          sleep(0.3)
+          node.reload.text.should == 'RELOADED'
+          node.text.should == 'RELOADED'
+        end
+
+        it "should reload a parent node" do
+          @session.visit('/with_js')
+          node = @session.find(:css, '#reload-me').find(:css, 'em')
+          @session.click_link('Reload!')
+          sleep(0.3)
+          node.reload.text.should == 'RELOADED'
+          node.text.should == 'RELOADED'
+        end
+
+        it "should not automatically reload" do
+          @session.visit('/with_js')
+          node = @session.find(:css, '#reload-me')
+          @session.click_link('Reload!')
+          sleep(0.3)
+          running { node.text.should == 'RELOADED' }.should raise_error
+        end
+        after { Capybara.automatic_reload = true }
+      end
+
+      context "with automatic reload" do
+        it "should reload the current context of the node automatically" do
+          @session.visit('/with_js')
+          node = @session.find(:css, '#reload-me')
+          @session.click_link('Reload!')
+          sleep(0.3)
+          node.text.should == 'RELOADED'
+        end
+
+        it "should reload a parent node automatically" do
+          @session.visit('/with_js')
+          node = @session.find(:css, '#reload-me').find(:css, 'em')
+          @session.click_link('Reload!')
+          sleep(0.3)
+          node.text.should == 'RELOADED'
+        end
+
+        it "should reload a node automatically when using find" do
+          @session.visit('/with_js')
+          node = @session.find(:css, '#reload-me')
+          @session.click_link('Reload!')
+          sleep(0.3)
+          node.find(:css, 'a').text.should == 'RELOADED'
+        end
+      end
+    end
+
     describe '#find' do
       it "should allow triggering of custom JS events" do
         pending "cannot figure out how to do this with selenium" if @session.mode == :selenium
@@ -65,6 +123,15 @@ shared_examples_for "session with javascript support" do
         @session.click_link('Click me')
         @session.find(:css, "a#has-been-clicked").text.should include('Has been clicked')
       end
+
+      context "with frozen time" do
+        it "raises an error suggesting that Capybara is stuck in time" do
+          @session.visit('/with_js')
+          now = Time.now
+          Time.stub(:now).and_return(now)
+          expect { @session.find('//isnotthere') }.to raise_error(Capybara::FrozenInTime)
+        end
+      end
     end
 
     describe '#wait_until' do

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

@@ -38,6 +38,17 @@ shared_examples_for "within" do
       end
     end
 
+    context "with Node rather than selector" do
+      it "should click links in the given scope" do
+        node_of_interest = @session.find(:css, "ul li[contains('With Simple HTML')]")
+
+        @session.within(node_of_interest) do 
+          @session.click_link('Go')
+        end
+        @session.body.should include('Bar')
+      end
+    end
+
     context "with the default selector set to CSS" do
       before { Capybara.default_selector = :css }
       it "should use CSS" do

data/lib/capybara/spec/test_app.rb

@@ -7,7 +7,7 @@ class TestApp < Sinatra::Base
   set :static, true
 
   get '/' do
-    'Hello world!'
+    'Hello world! <a href="with_html">Relative</a>'
   end
 
   get '/foo' do
@@ -63,10 +63,18 @@ class TestApp < Sinatra::Base
     "The requested object was deleted"
   end
 
+  get "/delete" do
+    "Not deleted"
+  end
+
   get '/redirect_back' do
     redirect back
   end
 
+  get '/redirect_secure' do
+    redirect "https://#{request.host}/host"
+  end
+
   get '/slow_response' do
     sleep 2
     'Finally!'
@@ -86,6 +94,10 @@ class TestApp < Sinatra::Base
     env['HTTP_FOO']
   end
 
+  get '/get_header_via_redirect' do
+    redirect '/get_header'
+  end
+
   get '/:view' do |view|
     erb view.to_sym
   end