capybara 1.1.2 → 1.1.3

data/lib/capybara/node/base.rb

@@ -37,6 +37,14 @@ module Capybara
         self
       end
 
+      def without_wait
+        orig = @wait_disabled
+        @wait_disabled = true
+        yield
+      ensure
+        @wait_disabled = orig
+      end
+
     protected
 
       def wait_until(seconds=Capybara.default_wait_time)
@@ -45,6 +53,7 @@ module Capybara
         begin
           yield
         rescue => e
+          raise e if @wait_disabled
           raise e unless driver.wait?
           raise e unless (driver.respond_to?(:invalid_element_errors) and driver.invalid_element_errors.include?(e.class)) or e.is_a?(Capybara::ElementNotFound)
           raise e if (Time.now - start_time) >= seconds

data/lib/capybara/node/element.rb

@@ -28,6 +28,10 @@ module Capybara
         @selector = selector
       end
 
+      def allow_reload!
+        @allow_reload = true
+      end
+
       ##
       #
       # @return [Object]    The native element from the driver, this allows access to driver specific methods
@@ -186,8 +190,10 @@ module Capybara
       end
 
       def reload
-        reloaded = parent.reload.first(@selector.name, @selector.locator, @selector.options)
-        @base = reloaded.base if reloaded
+        if @allow_reload
+          reloaded = parent.reload.first(@selector.name, @selector.locator, @selector.options)
+          @base = reloaded.base if reloaded
+        end
         self
       end
 

data/lib/capybara/node/finders.rb

@@ -24,7 +24,7 @@ module Capybara
       # @raise  [Capybara::ElementNotFound]   If the element can't be found before time expires
       #
       def find(*args)
-        wait_until { first(*args) or raise_find_error(*args) }
+        wait_until { first(*args) or raise_find_error(*args) }.tap(&:allow_reload!)
       end
 
       ##
@@ -107,9 +107,9 @@ module Capybara
       # @return [Capybara::Element]                       The found elements
       #
       def all(*args)
+        selector = Capybara::Selector.normalize(*args)
         options = extract_normalized_options(args)
 
-        selector = Capybara::Selector.normalize(*args)
         selector.xpaths.
           map    { |path| find_in_base(selector, path) }.flatten.
           select { |node| matches_options(node, options) }
@@ -129,10 +129,10 @@ module Capybara
       # @return Capybara::Element                         The found element
       #
       def first(*args)
+        selector = Capybara::Selector.normalize(*args)
         options = extract_normalized_options(args)
         found_elements = []
 
-        selector = Capybara::Selector.normalize(*args)
         selector.xpaths.each do |path|
           find_in_base(selector, path).each do |node|
             if matches_options(node, options)
@@ -179,13 +179,15 @@ module Capybara
       end
 
       def matches_options(node, options)
-        return false if options[:text]      and not node.text.match(options[:text])
-        return false if options[:visible]   and not node.visible?
-        return false if options[:with]      and not node.value == options[:with]
-        return false if options[:checked]   and not node.checked?
-        return false if options[:unchecked] and node.checked?
-        return false if options[:selected]  and not has_selected_options?(node, options[:selected])
-        true
+        node.without_wait do
+          return false if options[:text]      and not node.text.match(options[:text])
+          return false if options[:visible]   and not node.visible?
+          return false if options[:with]      and not node.value == options[:with]
+          return false if options[:checked]   and not node.checked?
+          return false if options[:unchecked] and node.checked?
+          return false if options[:selected]  and not has_selected_options?(node, options[:selected])
+          true
+        end
       end
 
       def has_selected_options?(node, expected)

data/lib/capybara/node/simple.rb

@@ -74,7 +74,7 @@ module Capybara
       #
       def value
         if tag_name == 'textarea'
-          native.content
+          native.content.sub(/\A\n/, '')
         elsif tag_name == 'select'
           if native['multiple'] == 'multiple'
             native.xpath(".//option[@selected='selected']").map { |option| option[:value] || option.content  }
@@ -118,6 +118,14 @@ module Capybara
         native[:selected]
       end
 
+      def allow_reload!
+        # no op
+      end
+
+      def without_wait
+        yield
+      end
+
     protected
 
       def find_in_base(selector, xpath)

data/lib/capybara/selenium/driver.rb

@@ -122,7 +122,9 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def invalid_element_errors
-    [Selenium::WebDriver::Error::ObsoleteElementError]
+    [ Selenium::WebDriver::Error::StaleElementReferenceError,
+      Selenium::WebDriver::Error::InvalidSelectorError,
+      Selenium::WebDriver::Error::UnknownError ]
   end
 
 private

data/lib/capybara/spec/driver.rb

@@ -64,7 +64,11 @@ shared_examples_for 'driver' do
       end
 
       it "should allow retrieval of the value" do
-        @driver.find('//textarea').first.value.should == 'banana'
+        @driver.find('//textarea[@id="normal"]').first.value.should == 'banana'
+      end
+
+      it "should not swallow extra newlines in textarea" do
+        @driver.find('//textarea[@id="additional_newline"]').first.value.should == "\nbanana"
       end
 
       it "should allow assignment of field value" do

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

@@ -37,7 +37,12 @@ $(function() {
   });
   $('#reload-link').click(function() {
     setTimeout(function() {
-      $('#reload-me').replaceWith('<div id="reload-me"><em><a>RELOADED</a></em></div>');
+      $('#reload-me').replaceWith('<div id="reload-me"><em><a>has been reloaded</a></em></div>');
+    }, 250)
+  });
+  $('#reload-list').click(function() {
+    setTimeout(function() {
+      $('#the-list').html('<li>Foo</li><li>Bar</li>');
     }, 250)
   });
 });

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

@@ -26,8 +26,8 @@ shared_examples_for "session with javascript support" do
           node = @session.find(:css, '#reload-me')
           @session.click_link('Reload!')
           sleep(0.3)
-          node.reload.text.should == 'RELOADED'
-          node.text.should == 'RELOADED'
+          node.reload.text.should == 'has been reloaded'
+          node.text.should == 'has been reloaded'
         end
 
         it "should reload a parent node" do
@@ -35,8 +35,8 @@ shared_examples_for "session with javascript support" do
           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'
+          node.reload.text.should == 'has been reloaded'
+          node.text.should == 'has been reloaded'
         end
 
         it "should not automatically reload" do
@@ -44,7 +44,7 @@ shared_examples_for "session with javascript support" do
           node = @session.find(:css, '#reload-me')
           @session.click_link('Reload!')
           sleep(0.3)
-          running { node.text.should == 'RELOADED' }.should raise_error
+          running { node.text.should == 'has been reloaded' }.should raise_error
         end
         after { Capybara.automatic_reload = true }
       end
@@ -55,7 +55,7 @@ shared_examples_for "session with javascript support" do
           node = @session.find(:css, '#reload-me')
           @session.click_link('Reload!')
           sleep(0.3)
-          node.text.should == 'RELOADED'
+          node.text.should == 'has been reloaded'
         end
 
         it "should reload a parent node automatically" do
@@ -63,7 +63,7 @@ shared_examples_for "session with javascript support" do
           node = @session.find(:css, '#reload-me').find(:css, 'em')
           @session.click_link('Reload!')
           sleep(0.3)
-          node.text.should == 'RELOADED'
+          node.text.should == 'has been reloaded'
         end
 
         it "should reload a node automatically when using find" do
@@ -71,7 +71,24 @@ shared_examples_for "session with javascript support" do
           node = @session.find(:css, '#reload-me')
           @session.click_link('Reload!')
           sleep(0.3)
-          node.find(:css, 'a').text.should == 'RELOADED'
+          node.find(:css, 'a').text.should == 'has been reloaded'
+        end
+
+        it "should not reload nodes which haven't been found" do
+          @session.visit('/with_js')
+          node = @session.all(:css, '#the-list li')[1]
+          @session.click_link('Fetch new list!')
+          sleep(0.3)
+          running { node.text.should == 'Foo' }.should raise_error
+          running { node.text.should == 'Bar' }.should raise_error
+        end
+
+        it "should reload nodes with options" do
+          @session.visit('/with_js')
+          node = @session.find(:css, 'em', :text => "reloaded")
+          @session.click_link('Reload!')
+          sleep(1)
+          node.text.should == 'has been reloaded'
         end
       end
     end

data/lib/capybara/spec/test_app.rb

@@ -107,7 +107,7 @@ class TestApp < Sinatra::Base
   end
 
   post '/upload_empty' do
-    if params[:form][:file].nil?
+    if params[:form].nil? || params[:form][:file].nil?
       'Successfully ignored empty file field.'
     else
       'Something went wrong.'

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

@@ -28,7 +28,11 @@
 
 <p>
   <input type="text" id="test_field" value="monkey"/>
-  <textarea>banana</textarea>
+  <textarea id="normal">
+banana</textarea>
+  <textarea id="additional_newline">
+
+banana</textarea>
   <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>

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

@@ -41,8 +41,22 @@
 
     <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>
+
+    <p>
+      <a id="reload-list" href="#">Fetch new list!</a>
+      <ul id="the-list">
+        <li>Item 1</li>
+        <li>Item 2</li>
+      </ul>
+    </p>
+
+    <script type="text/javascript">
+      // a javascript comment
+      var aVar = 123;
+    </script>
   </body>
 </html>
 

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/spec/driver/selenium_driver_spec.rb

@@ -14,19 +14,6 @@ describe Capybara::Selenium::Driver do
   it_should_behave_like "driver without status code support"
   it_should_behave_like "driver with cookies support"
 
-  unless Config::CONFIG['host_os'] =~ /mswin|mingw/
-    it "should not interfere with forking child processes" do
-      # Launch a browser, which registers the at_exit hook
-      browser = Capybara::Selenium::Driver.new(TestApp).browser
-
-      # Fork an unrelated child process. This should not run the code in the at_exit hook.
-      pid = fork { "child" }
-      Process.wait2(pid)[1].exitstatus.should == 0
-
-      browser.quit
-    end
-  end
-
   describe "exit codes" do
     before do
       @current_dir = Dir.getwd

data/spec/dsl_spec.rb

@@ -11,6 +11,7 @@ describe Capybara::DSL do
   after do
     Capybara.session_name = nil
     Capybara.default_driver = nil
+    Capybara.javascript_driver = nil
     Capybara.use_default_driver
   end
 

data/spec/rspec/features_spec.rb

@@ -3,7 +3,7 @@ require 'capybara/rspec'
 
 Capybara.app = TestApp
 
-RSpec.configuration.before(:each, :example_group => {:file_path => __FILE__}) do
+RSpec.configuration.before(:each, :example_group => {:file_path => "./spec/rspec/features_spec.rb"}) do
   @in_filtered_hook = true
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152404620 !ruby/object:Gem::Requirement
+  requirement: &2151926160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152404620
+  version_requirements: *2151926160
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &2152399360 !ruby/object:Gem::Requirement
+  requirement: &2151922440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *2152399360
+  version_requirements: *2151922440
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &2152397660 !ruby/object:Gem::Requirement
+  requirement: &2151935300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152397660
+  version_requirements: *2151935300
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152396320 !ruby/object:Gem::Requirement
+  requirement: &2151934440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152396320
+  version_requirements: *2151934440
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152395280 !ruby/object:Gem::Requirement
+  requirement: &2151933220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152395280
+  version_requirements: *2151933220
 - !ruby/object:Gem::Dependency
   name: xpath
-  requirement: &2152394120 !ruby/object:Gem::Requirement
+  requirement: &2151943440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152394120
+  version_requirements: *2151943440
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152392600 !ruby/object:Gem::Requirement
+  requirement: &2151942160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.4
   type: :development
   prerelease: false
-  version_requirements: *2152392600
+  version_requirements: *2151942160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152391040 !ruby/object:Gem::Requirement
+  requirement: &2151941460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152391040
+  version_requirements: *2151941460
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &2152388240 !ruby/object:Gem::Requirement
+  requirement: &2151940240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 2.0.4
   type: :development
   prerelease: false
-  version_requirements: *2152388240
+  version_requirements: *2151940240
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152383200 !ruby/object:Gem::Requirement
+  requirement: &2151939320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 0.5.8
   type: :development
   prerelease: false
-  version_requirements: *2152383200
+  version_requirements: *2151939320
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &2152381360 !ruby/object:Gem::Requirement
+  requirement: &2151938480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *2152381360
+  version_requirements: *2151938480
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152379900 !ruby/object:Gem::Requirement
+  requirement: &2151937200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,18 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *2152379900
+  version_requirements: *2151937200
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2151936560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2151936560
 description: Capybara is an integration testing tool for rack based web applications.
   It simulates how a user would interact with a website
 email:
@@ -284,3 +295,4 @@ specification_version: 3
 summary: Capybara aims to simplify the process of integration testing Rack applications,
   such as Rails, Sinatra or Merb
 test_files: []
+has_rdoc: