capybara 2.1.0 → 2.2.0

data/lib/capybara/selenium/node.rb

@@ -37,8 +37,21 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
       path_names = value.to_s.empty? ? [] : value
       native.send_keys(*path_names)
     elsif tag_name == 'textarea' or tag_name == 'input'
-      #script can change a readonly element which user input cannot, so dont execute if readonly
-      driver.browser.execute_script "arguments[0].value = ''", native unless self[:readonly]
+      if value.to_s.empty?
+        native.clear
+      else
+        #script can change a readonly element which user input cannot, so dont execute if readonly
+        driver.browser.execute_script "arguments[0].value = ''", native unless self[:readonly]
+        native.send_keys(value.to_s)
+      end
+    elsif native.attribute('isContentEditable')
+      #ensure we are focused on the element
+      script = <<-JS
+        var range = document.createRange();
+        range.selectNodeContents(arguments[0]);
+        window.getSelection().addRange(range);
+      JS
+      driver.browser.execute_script script, native
       native.send_keys(value.to_s)
     end
   end
@@ -61,7 +74,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   def hover
     driver.browser.action.move_to(native).perform
   end
-  
+
   def drag_to(element)
     driver.browser.action.drag_and_drop(native, element.native).perform
   end
@@ -89,11 +102,11 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   def find_xpath(locator)
     native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
   end
-  
+
   def find_css(locator)
     native.find_elements(:css, locator).map { |n| self.class.new(driver, n) }
   end
-  
+
   def ==(other)
     native == other.native
   end

data/lib/capybara/server.rb

@@ -31,13 +31,13 @@ module Capybara
       end
     end
 
-    attr_reader :app, :port
+    attr_reader :app, :port, :host
 
-    def initialize(app, port=Capybara.server_port)
+    def initialize(app, port=Capybara.server_port, host=Capybara.server_host)
       @app = app
       @middleware = Middleware.new(@app)
       @server_thread = nil # supress warnings
-      @port = port
+      @host, @port = host, port
       @port ||= Capybara::Server.ports[@app.object_id]
       @port ||= find_available_port
     end
@@ -50,10 +50,6 @@ module Capybara
       @middleware.error
     end
 
-    def host
-      Capybara.server_host || "127.0.0.1"
-    end
-
     def responsive?
       return false if @server_thread && @server_thread.join(0)
 

data/lib/capybara/session.rb

@@ -37,10 +37,11 @@ module Capybara
       :has_no_unchecked_field?, :query, :assert_selector, :assert_no_selector
     ]
     SESSION_METHODS = [
-      :body, :html, :current_url, :current_host, :evaluate_script, :source,
-      :visit, :within, :within_fieldset, :within_table, :within_frame,
-      :within_window, :current_path, :save_page, :save_and_open_page,
-      :save_screenshot, :reset_session!, :response_headers, :status_code,
+      :body, :html, :source, :current_url, :current_host, :current_path,
+      :execute_script, :evaluate_script, :visit, :go_back, :go_forward,
+      :within, :within_fieldset, :within_table, :within_frame, :within_window,
+      :save_page, :save_and_open_page, :save_screenshot,
+      :reset_session!, :response_headers, :status_code,
       :title, :has_title?, :has_no_title?, :current_scope
     ]
     DSL_METHODS = NODE_METHODS + SESSION_METHODS
@@ -74,8 +75,11 @@ module Capybara
     # Reset the session, removing all cookies.
     #
     def reset!
-      driver.reset! if @touched
-      @touched = false
+      if @touched
+        driver.reset!
+        @touched = false
+        assert_no_selector :xpath, "/html/body/*"
+      end
       raise @server.error if Capybara.raise_server_errors and @server and @server.error
     ensure
       @server.reset_error! if @server
@@ -195,27 +199,54 @@ module Capybara
 
     ##
     #
-    # Execute the given block for a particular scope on the page. Within will find the first
-    # element matching the given selector and execute the block scoped to that element:
+    # Move back a single entry in the browser's history.
+    #
+    def go_back
+      driver.go_back
+    end
+
+    ##
+    #
+    # Move forward a single entry in the browser's history.
+    #
+    def go_forward
+      driver.go_forward
+    end
+
+    ##
+    #
+    # Executes the given block within the context of a node. `within` takes the
+    # same options as `find`, as well as a block. For the duration of the
+    # block, any command to Capybara will be handled as though it were scoped
+    # to the given element.
     #
     #     within(:xpath, '//div[@id="delivery-address"]') do
     #       fill_in('Street', :with => '12 Main Street')
     #     end
     #
-    # It is possible to omit the first parameter, in that case, the selector is assumed to be
-    # of the type set in Capybara.default_selector.
+    # Just as with `find`, if multiple elements match the selector given to
+    # `within`, an error will be raised, and just as with `find`, this
+    # behaviour can be controlled through the `:match` and `:exact` options.
+    #
+    # It is possible to omit the first parameter, in that case, the selector is
+    # assumed to be of the type set in Capybara.default_selector.
     #
     #     within('div#delivery-address') do
     #       fill_in('Street', :with => '12 Main Street')
     #     end
     #
+    # Note that a lot of uses of `within` can be replaced more succinctly with
+    # chaining:
+    #
+    #     find('div#delivery-address').fill_in('Street', :with => '12 Main Street')
+    #
     # @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
+    # @raise  [Capybara::ElementNotFound]      If the scope can't be found before time expires
     #
     def within(*args)
       new_scope = if args.first.is_a?(Capybara::Node::Base) then args.first else find(*args) end
@@ -262,9 +293,12 @@ module Capybara
     #   @param [String] name           name of a frame
     #
     def within_frame(frame_handle)
+      scopes.push(nil)
       driver.within_frame(frame_handle) do
         yield
       end
+    ensure
+      scopes.pop
     end
 
     ##
@@ -275,7 +309,10 @@ module Capybara
     # @param [String] handle of the window
     #
     def within_window(handle, &blk)
+      scopes.push(nil)
       driver.within_window(handle, &blk)
+    ensure
+      scopes.pop
     end
 
     ##
@@ -313,7 +350,7 @@ module Capybara
     #
     def save_page(path=nil)
       path ||= "capybara-#{Time.new.strftime("%Y%m%d%H%M%S")}#{rand(10**10)}.html"
-      path = File.expand_path(path, Capybara.save_and_open_page_path) if Capybara.save_and_open_page_path
+      path = File.expand_path(path, Capybara.save_and_open_page_path)
 
       FileUtils.mkdir_p(File.dirname(path))
 
@@ -328,10 +365,15 @@ module Capybara
     # @param  [String] file_name  The path to where it should be saved [optional]
     #
     def save_and_open_page(file_name=nil)
-      require "launchy"
-      Launchy.open(save_page(file_name))
-    rescue LoadError
-      warn "Please install the launchy gem to open page with save_and_open_page"
+      file_name = save_page(file_name)
+
+      begin
+        require "launchy"
+        Launchy.open(file_name)
+      rescue LoadError
+        warn "Page saved to #{file_name} with save_and_open_page."
+        warn "Please install the launchy gem to open page automatically."
+      end
     end
 
     ##
@@ -382,7 +424,7 @@ module Capybara
     end
 
     def current_scope
-      scopes.last
+      scopes.last || document
     end
 
   private

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

@@ -35,7 +35,7 @@ $(function() {
     $('body').append('<p id="focus_event_triggered">Focus Event triggered</p>');
   });
   $('#with_change_event').change(function() {
-    if($(this).val() == '') $(this).val("Can't be empty");
+    $('body').append($('<p class="change_event_triggered"></p>').text(this.value));
   });
   $('#checkbox_with_event').click(function() {
     $('body').append('<p id="checkbox_event_triggered">Checkbox event triggered</p>');

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

@@ -58,6 +58,16 @@ Capybara::SpecHelper.spec '#assert_selector' do
       expect { @session.assert_selector("//p//a", :text => /Red$/) }.to raise_error(Capybara::ElementNotFound)
     end
   end
+
+  context "with wait", :requires => [:js] do
+    it "should find element if it appears before given wait duration" do
+      Capybara.using_wait_time(0.1) do
+        @session.visit('/with_js')
+        @session.click_link('Click me')
+        @session.assert_selector(:css, "a#has-been-clicked", :text => "Has been clicked", :wait => 0.9)
+      end
+    end
+  end
 end
 
 Capybara::SpecHelper.spec '#assert_no_selector' do
@@ -120,4 +130,12 @@ Capybara::SpecHelper.spec '#assert_no_selector' do
       @session.assert_no_selector("//p//a", :text => /Red$/)
     end
   end
+
+  context "with wait", :requires => [:js] do
+    it "should not find element if it appears after given wait duration" do
+      @session.visit('/with_js')
+      @session.click_link('Click me')
+      @session.assert_no_selector(:css, "a#has-been-clicked", :text => "Has been clicked", :wait => 0.1)
+    end
+  end
 end

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

@@ -64,13 +64,18 @@ Capybara::SpecHelper.spec "#attach_file" do
     end
 
     it  "should not break when using HTML5 multiple file input uploading multiple files" do
-      pending "Selenium is buggy on this, see http://code.google.com/p/selenium/issues/detail?id=2239" if @session.respond_to?(:mode) && @session.mode == :selenium
+      pending "Selenium is buggy on this, see http://code.google.com/p/selenium/issues/detail?id=2239" if @session.respond_to?(:mode) && @session.mode.to_s =~ /^selenium/
       @session.attach_file "Multiple Documents", [@test_file_path, @another_test_file_path]
       @session.click_button('Upload Multiple')
       @session.body.should include("2 | ")#number of files
       @session.body.should include(File.read(@test_file_path))
       @session.body.should include(File.read(@another_test_file_path))
     end
+
+    it "should not send anything when attaching no files to a multiple upload field" do
+      @session.click_button('Upload Empty Multiple')
+      @session.body.should include("Successfully ignored empty file field")
+    end
   end
 
   context "with a locator that doesn't exist" do

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

@@ -96,4 +96,18 @@ Capybara::SpecHelper.spec "#check" do
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
+
+  context "with `option` option" do
+    it "can check boxes by their value" do
+      @session.check('form[pets][]', :option => "cat")
+      @session.click_button('awesome')
+      extract_results(@session)['pets'].should include('cat')
+    end
+
+    it "should raise an error if option not found" do
+      expect do
+        @session.check('form[pets][]', :option => "elephant")
+      end.to raise_error(Capybara::ElementNotFound)
+    end
+  end
 end

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

@@ -51,4 +51,18 @@ Capybara::SpecHelper.spec "#choose" do
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
+
+  context "with `option` option" do
+    it "can check radio buttons by their value" do
+      @session.choose('form[gender]', :option => "male")
+      @session.click_button('awesome')
+      extract_results(@session)['gender'].should == "male"
+    end
+
+    it "should raise an error if option not found" do
+      expect do
+        @session.choose('form[gender]', :option => "hermaphrodite")
+      end.to raise_error(Capybara::ElementNotFound)
+    end
+  end
 end

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

@@ -102,10 +102,18 @@ Capybara::SpecHelper.spec '#click_button' do
         @results['gender'].should == 'female'
       end
 
+      it "should default radio value to 'on' if none specified" do
+        @results['valueless_radio'].should == 'on'
+      end
+
       it "should serialize check boxes" do
         @results['pets'].should include('dog', 'hamster')
         @results['pets'].should_not include('cat')
       end
+      
+      it "should default checkbox value to 'on' if none specififed" do
+        @results['valueless_checkbox'].should == 'on'
+      end
 
       it "should serialize text areas" do
         @results['description'].should == 'Descriptive text goes here'
@@ -126,7 +134,11 @@ Capybara::SpecHelper.spec '#click_button' do
       it "should not serialize a select tag without options" do
         @results['tendency'].should be_nil
       end
-
+      
+      it "should convert lf to cr/lf in submitted textareas" do
+        @results['newline'].should == "\r\nNew line after and before textarea tag\r\n"
+      end
+      
       it "should not submit disabled fields" do
         @results['disabled_text_field'].should be_nil
         @results['disabled_textarea'].should be_nil
@@ -225,6 +237,12 @@ Capybara::SpecHelper.spec '#click_button' do
     end
   end
 
+  context "with submit button not associated with any form" do
+    it "should not error when clicked" do
+      lambda { @session.click_button('no_form_button') }.should_not raise_error
+    end
+  end
+
   context "with alt given on an image button" do
     it "should submit the associated form" do
       @session.click_button('oh hai thar')
@@ -236,6 +254,7 @@ Capybara::SpecHelper.spec '#click_button' do
       extract_results(@session)['first_name'].should == 'John'
     end
   end
+  
 
   context "with value given on an image button" do
     it "should submit the associated form" do

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

@@ -57,6 +57,12 @@ Capybara::SpecHelper.spec "#fill_in" do
     extract_results(@session)['description'].should == 'is <strong>very</strong> secret!'
   end
 
+  it "should handle newlines in a textarea" do
+    @session.fill_in('form_description', :with => "\nSome text\n")
+    @session.click_button('awesome')
+    extract_results(@session)['description'].should == "\r\nSome text\r\n"
+  end
+
   it "should fill in a field with a custom type" do
     @session.fill_in('Schmooo', :with => 'Schmooo is the game')
     @session.click_button('awesome')
@@ -109,7 +115,7 @@ Capybara::SpecHelper.spec "#fill_in" do
     extract_results(@session)['first_name'].should == 'Harry'
   end
 
-  it "casts to string if field has maxlength", :focus => true do
+  it "casts to string if field has maxlength" do
     @session.fill_in(:'form_zipcode', :with => 1234567)
     @session.click_button('awesome')
     extract_results(@session)['zipcode'].should == '12345'
@@ -119,7 +125,17 @@ Capybara::SpecHelper.spec "#fill_in" do
     it 'should only trigger onchange once' do
       @session.visit('/with_js')
       @session.fill_in('with_change_event', :with => 'some value')
-      @session.find(:css, '#with_change_event').value.should == 'some value'
+      # click outside the field to trigger the change event
+      @session.find(:css, 'body').click
+      @session.find(:css, '.change_event_triggered', :match => :one).should have_text 'some value'
+    end
+
+    it 'should trigger change when clearing field' do
+      @session.visit('/with_js')
+      @session.fill_in('with_change_event', :with => '')
+      # click outside the field to trigger the change event
+      @session.find(:css, 'body').click
+      @session.should have_selector(:css, '.change_event_triggered', :match => :one)
     end
   end
 

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

@@ -0,0 +1,10 @@
+Capybara::SpecHelper.spec '#go_back', :requires => [:js] do
+  it "should fetch a response from the driver from the previous page" do
+    @session.visit('/')
+    @session.should have_content('Hello world!')
+    @session.visit('/foo')
+    @session.should have_content('Another World')
+    @session.go_back
+    @session.should have_content('Hello world!')
+  end
+end

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

@@ -0,0 +1,12 @@
+Capybara::SpecHelper.spec '#go_forward', :requires => [:js] do
+  it "should fetch a response from the driver from the previous page" do
+    @session.visit('/')
+    @session.should have_content('Hello world!')
+    @session.visit('/foo')
+    @session.should have_content('Another World')
+    @session.go_back
+    @session.should have_content('Hello world!')
+    @session.go_forward
+    @session.should have_content('Another World')
+  end
+end

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

@@ -9,9 +9,21 @@ Capybara::SpecHelper.spec '#has_button?' do
     @session.should have_button(:'crap321')
   end
 
+  it "should be true for disabled buttons if :disabled => true" do
+    @session.should have_button('Disabled button', :disabled => true)
+  end
+
   it "should be false if the given button is not on the page" do
     @session.should_not have_button('monkey')
   end
+
+  it "should be false for disabled buttons by default" do
+    @session.should_not have_button('Disabled button')
+  end
+
+  it "should be false for disabled buttons if :disabled => false" do
+    @session.should_not have_button('Disabled button', :disabled => false)
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_button?' do
@@ -24,7 +36,19 @@ Capybara::SpecHelper.spec '#has_no_button?' do
     @session.should_not have_no_button('crap321')
   end
 
+  it "should be true for disabled buttons if :disabled => true" do
+    @session.should_not have_no_button('Disabled button', :disabled => true)
+  end
+
   it "should be false if the given button is not on the page" do
     @session.should have_no_button('monkey')
   end
+
+  it "should be false for disabled buttons by default" do
+    @session.should have_no_button('Disabled button')
+  end
+
+  it "should be false for disabled buttons if :disabled => false" do
+    @session.should have_no_button('Disabled button', :disabled => false)
+  end
 end

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

@@ -121,6 +121,10 @@ Capybara::SpecHelper.spec '#has_checked_field?' do
     @session.should have_checked_field('Hamster')
   end
 
+  it "should be true for disabled checkboxes if :disabled => true" do
+    @session.should have_checked_field('Disabled Checkbox', :disabled => true)
+  end
+
   it "should be false if an unchecked field is on the page" do
     @session.should_not have_checked_field('form_pets_cat')
     @session.should_not have_checked_field('Male')
@@ -130,6 +134,14 @@ Capybara::SpecHelper.spec '#has_checked_field?' do
     @session.should_not have_checked_field('Does Not Exist')
   end
 
+  it "should be false for disabled checkboxes by default" do
+    @session.should_not have_checked_field('Disabled Checkbox')
+  end
+
+  it "should be false for disabled checkboxes if :disabled => false" do
+    @session.should_not have_checked_field('Disabled Checkbox', :disabled => false)
+  end
+
   it "should be true after an unchecked checkbox is checked" do
     @session.check('form_pets_cat')
     @session.should have_checked_field('form_pets_cat')
@@ -159,6 +171,10 @@ Capybara::SpecHelper.spec '#has_no_checked_field?' do
     @session.should_not have_no_checked_field('Hamster')
   end
 
+  it "should be false for disabled checkboxes if :disabled => true" do
+    @session.should_not have_no_checked_field('Disabled Checkbox', :disabled => true)
+  end
+
   it "should be true if an unchecked field is on the page" do
     @session.should have_no_checked_field('form_pets_cat')
     @session.should have_no_checked_field('Male')
@@ -167,6 +183,14 @@ Capybara::SpecHelper.spec '#has_no_checked_field?' do
   it "should be true if no field is on the page" do
     @session.should have_no_checked_field('Does Not Exist')
   end
+
+  it "should be true for disabled checkboxes by default" do
+    @session.should have_no_checked_field('Disabled Checkbox')
+  end
+
+  it "should be true for disabled checkboxes if :disabled => false" do
+    @session.should have_no_checked_field('Disabled Checkbox', :disabled => false)
+  end
 end
 
 Capybara::SpecHelper.spec '#has_unchecked_field?' do
@@ -182,10 +206,22 @@ Capybara::SpecHelper.spec '#has_unchecked_field?' do
     @session.should have_unchecked_field('Male')
   end
 
+  it "should be true for disabled unchecked fields if :disabled => true" do
+    @session.should have_unchecked_field('Disabled Unchecked Checkbox', :disabled => true)
+  end
+
   it "should be false if no field is on the page" do
     @session.should_not have_unchecked_field('Does Not Exist')
   end
 
+  it "should be false for disabled unchecked fields by default" do
+    @session.should_not have_unchecked_field('Disabled Unchecked Checkbox')
+  end
+
+  it "should be false for disabled unchecked fields if :disabled => false" do
+    @session.should_not have_unchecked_field('Disabled Unchecked Checkbox', :disabled => false)
+  end
+
   it "should be false after an unchecked checkbox is checked" do
     @session.check('form_pets_cat')
     @session.should_not have_unchecked_field('form_pets_cat')
@@ -220,7 +256,19 @@ Capybara::SpecHelper.spec '#has_no_unchecked_field?' do
     @session.should_not have_no_unchecked_field('Male')
   end
 
+  it "should be false for disabled unchecked fields if :disabled => true" do
+    @session.should_not have_no_unchecked_field('Disabled Unchecked Checkbox', :disabled => true)
+  end
+
   it "should be true if no field is on the page" do
     @session.should have_no_unchecked_field('Does Not Exist')
   end
+
+  it "should be true for disabled unchecked fields by default" do
+    @session.should have_no_unchecked_field('Disabled Unchecked Checkbox')
+  end
+
+  it "should be true for disabled unchecked fields if :disabled => false" do
+    @session.should have_no_unchecked_field('Disabled Unchecked Checkbox', :disabled => false)
+  end
 end

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

@@ -190,6 +190,16 @@ Capybara::SpecHelper.spec '#has_text?' do
       @session.should_not have_text('count', minimum: '3')
     end
   end
+
+  context "with wait", :requires => [:js] do
+    it "should find element if it appears before given wait duration" do
+      Capybara.using_wait_time(0.1) do
+        @session.visit('/with_js')
+        @session.click_link('Click me')
+        @session.should have_text('Has been clicked', :wait => 0.9)
+      end
+    end
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_text?' do
@@ -288,4 +298,12 @@ Capybara::SpecHelper.spec '#has_no_text?' do
     @session.click_link('Click me')
     @session.should have_no_text("I changed it")
   end
+
+  context "with wait", :requires => [:js] do
+    it "should not find element if it appears after given wait duration" do
+      @session.visit('/with_js')
+      @session.click_link('Click me')
+      @session.should have_no_text('Has been clicked', :wait => 0.1)
+    end
+  end
 end