capybara 2.0.0 → 2.0.1

data/History.md

@@ -1,3 +1,24 @@
+# master
+
+### Changed
+
+* Move the RackTest driver override with the `:respect_data_method` option
+  enabled from capybara/rspec to capybara/rails, so that it is enabled in
+  Rails projects that don't use RSpec. [Carlos Antonio da Silva]
+* Source is now an alias for `body`. RackTest no longer returns modifications
+  to `body`. This basically codifies the behaviour which we've had for a while
+  anyway, and should have minimal impact for end users. It is important to
+  driver authors though. [Jonas Nicklas]
+
+### Fixed
+
+* Visiting relative URLs when `app_host` is set and no server is running works
+  as expected. [Jonas Nicklas]
+* `fill_in` works properly under Selenium again when the caret is not at the
+  end of the field before the method is called. [Douwe Maan, Jonas Nicklas, Jari
+  Bakken]
+* `attach_file` can once again be given a Pathname [Jake Goulding]
+
 # Version 2.0.0
 
 Release date: 2012-11-05

data/README.md

@@ -88,16 +88,15 @@ Load RSpec 2.x support by adding the following line (typically to your
 require 'capybara/rspec'
 ```
 
-If you are using Rails, put your Capybara specs in `spec/requests` or
-`spec/integration`.
+If you are using Rails, put your Capybara specs in `spec/features`.
 
 If you are not using Rails, tag all the example groups in which you want to use
-Capybara with `:type => :request`.
+Capybara with `:type => :feature`.
 
 You can now write your specs like so:
 
 ```ruby
-describe "the signup process", :type => :request do
+describe "the signup process", :type => :feature do
   before :each do
     User.make(:email => 'user@example.com', :password => 'caplin')
   end
@@ -140,7 +139,7 @@ feature "Signing up" do
   end
 
   given(:other_user) { User.make(:email => 'other@example.com', :password => 'rous') }
-  
+
   scenario "Signing in as another user" do
     within("#session") do
       fill_in 'Login', :with => other_user.email
@@ -151,8 +150,9 @@ feature "Signing up" do
 end
 ```
 
-`feature` is in fact just an alias for `describe ..., :type => :request`,
-`background` is an alias for `before`, `scenario` for `it`, and `given`/`given!` aliases for `let`/`let!`, respectively.
+`feature` is in fact just an alias for `describe ..., :type => :feature`,
+`background` is an alias for `before`, `scenario` for `it`, and
+`given`/`given!` aliases for `let`/`let!`, respectively.
 
 ## Using Capybara with Test::Unit
 

data/lib/capybara/driver/base.rb

@@ -11,10 +11,6 @@ class Capybara::Driver::Base
     raise NotImplementedError
   end
 
-  def source
-    raise NotImplementedError
-  end
-
   def html
     raise NotImplementedError
   end

data/lib/capybara/driver/node.rb

@@ -70,6 +70,10 @@ module Capybara
       rescue NotSupportedByDriverError
         %(#<#{self.class} tag="#{tag_name}">)
       end
+
+      def ==(other)
+        raise NotSupportedByDriverError
+      end
     end
   end
 end

data/lib/capybara/node/actions.rb

@@ -138,7 +138,7 @@ module Capybara
       # @param [String] path          The path of the file that will be attached, or an array of paths
       #
       def attach_file(locator, path)
-        (String === path ? [path] : path).each do |p|
+        Array(path).each do |p|
           raise Capybara::FileNotFound, "cannot attach file, #{p} does not exist" unless File.exist?(p.to_s)
         end
         find(:file_field, locator).set(path)

data/lib/capybara/node/finders.rb

@@ -5,7 +5,7 @@ module Capybara
       ##
       #
       # Find an {Capybara::Element} based on the given arguments. +find+ will raise an error if the element
-      # is not found. The error message can be customized through the +:message+ option.
+      # is not found.
       #
       # If the driver is capable of executing JavaScript, +find+ will wait for a set amount of time
       # and continuously retry finding the element until either the element is found or the time
@@ -19,7 +19,6 @@ module Capybara
       #     page.find('li', :text => 'Quox').click_link('Delete')
       #
       # @param (see Capybara::Node::Finders#all)
-      # @option options [String] :message     An error message in case the element can't be found
       # @return [Capybara::Element]           The found element
       # @raise  [Capybara::ElementNotFound]   If the element can't be found before time expires
       #

data/lib/capybara/node/matchers.rb

@@ -451,11 +451,7 @@ module Capybara
       end
 
       def ==(other)
-        if other.respond_to?(:native)
-          self.eql?(other) or native == other.native
-        else
-          self.eql?(other)
-        end
+        self.eql?(other) or base == other.base
       end
 
     private

data/lib/capybara/rack_test/browser.rb

@@ -76,19 +76,15 @@ class Capybara::RackTest::Browser
     @dom = nil
   end
 
-  def html
-    dom.to_xml
-  end
-
   def dom
-    @dom ||= Nokogiri::HTML(source)
+    @dom ||= Nokogiri::HTML(html)
   end
 
   def find(selector)
     dom.xpath(selector).map { |node| Capybara::RackTest::Node.new(self, node) }
   end
 
-  def source
+  def html
     last_response.body
   rescue Rack::Test::Error
     ""

data/lib/capybara/rack_test/driver.rb

@@ -70,10 +70,6 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
     browser.html
   end
 
-  def source
-    browser.source
-  end
-
   def dom
     browser.dom
   end

data/lib/capybara/rack_test/node.rb

@@ -97,6 +97,10 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     native.xpath(locator).map { |n| self.class.new(driver, n) }
   end
 
+  def ==(other)
+    native == other.native
+  end
+
 protected
 
   def unnormalized_text

data/lib/capybara/rails.rb

@@ -4,7 +4,7 @@ require 'capybara/dsl'
 Capybara.app = Rack::Builder.new do
   map "/" do
     if Rails.version.to_f >= 3.0
-      run Rails.application  
+      run Rails.application
     else # Rails 2
       use Rails::Rack::Static
       run ActionController::Dispatcher.new
@@ -15,3 +15,7 @@ end.to_app
 Capybara.asset_root = Rails.root.join('public')
 Capybara.save_and_open_page_path = Rails.root.join('tmp/capybara')
 
+# Override default rack_test driver to respect data-method attributes.
+Capybara.register_driver :rack_test do |app|
+  Capybara::RackTest::Driver.new(app, :respect_data_method => true)
+end

data/lib/capybara/rspec.rb

@@ -22,8 +22,3 @@ RSpec.configure do |config|
     end
   end
 end
-
-# Override default rack_test driver to respect data-method attributes.
-Capybara.register_driver :rack_test do |app|
-  Capybara::RackTest::Driver.new(app, :respect_data_method => true)
-end

data/lib/capybara/selenium/driver.rb

@@ -34,10 +34,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.navigate.to(path)
   end
 
-  def source
-    browser.page_source
-  end
-
   def html
     browser.page_source
   end

data/lib/capybara/selenium/node.rb

@@ -32,7 +32,8 @@ 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'
-      native.send_keys(("\b" * native[:value].size) + value.to_s)
+      driver.browser.execute_script "arguments[0].value = ''", native
+      native.send_keys(value.to_s)
     end
   end
 
@@ -75,6 +76,10 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
   end
 
+  def ==(other)
+    native == other.native
+  end
+
 private
 
   # a reference to the select node if this is an option node

data/lib/capybara/session.rb

@@ -105,15 +105,8 @@ module Capybara
     def html
       driver.html
     end
-
-    ##
-    #
-    # @return [String] HTML source of the document, before being modified by JavaScript.
-    #
-    def source
-      driver.source
-    end
-    alias_method :body, :source
+    alias_method :body, :html
+    alias_method :source, :html
 
     ##
     #
@@ -170,10 +163,12 @@ module Capybara
     def visit(url)
       @touched = true
 
+      if url !~ /^http/ and Capybara.app_host
+        url = Capybara.app_host + url.to_s
+      end
+
       if @server
-        unless url =~ /^http/
-          url = (Capybara.app_host || "http://#{@server.host}:#{@server.port}") + url.to_s
-        end
+        url = "http://#{@server.host}:#{@server.port}" + url.to_s unless url =~ /^http/
 
         if Capybara.always_include_port
           uri = URI.parse(url)

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

@@ -1,8 +1,5 @@
 Capybara::SpecHelper.spec '#html' do
   it "should return the unmodified page body" do
-    # html and body should be aliased, but we can't just check for
-    # method(:html) == method(:body) because these shared examples get run
-    # against the DSL, which uses forwarding methods.  So we test behavior.
     @session.visit('/')
     @session.html.should include('Hello world!')
   end
@@ -13,3 +10,29 @@ Capybara::SpecHelper.spec '#html' do
     @session.html.should_not include('This is text')
   end
 end
+
+Capybara::SpecHelper.spec '#source' do
+  it "should return the unmodified page source" do
+    @session.visit('/')
+    @session.source.should include('Hello world!')
+  end
+
+  it "should return the current state of the page", :requires => [:js] do
+    @session.visit('/with_js')
+    @session.source.should include('I changed it')
+    @session.source.should_not include('This is text')
+  end
+end
+
+Capybara::SpecHelper.spec '#body' do
+  it "should return the unmodified page source" do
+    @session.visit('/')
+    @session.body.should include('Hello world!')
+  end
+
+  it "should return the current state of the page", :requires => [:js] do
+    @session.visit('/with_js')
+    @session.body.should include('I changed it')
+    @session.body.should_not include('This is text')
+  end
+end

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

@@ -65,6 +65,12 @@ Capybara::SpecHelper.spec "node" do
       @session.first('//input').set('gorilla')
       @session.first('//input').value.should == 'gorilla'
     end
+
+    it "should fill the field even if the caret was not at the end", :requires => [:js] do
+      @session.execute_script("var el = document.getElementById('test_field'); el.focus(); el.setSelectionRange(0, 0);")
+      @session.first('//input').set('')
+      @session.first('//input').value.should == ''
+    end
   end
 
   describe "#tag_name" do

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

@@ -1,12 +0,0 @@
-Capybara::SpecHelper.spec '#source' do
-  it "should return the unmodified page source" do
-    @session.visit('/')
-    @session.source.should include('Hello world!')
-  end
-
-  it "should return the original, unmodified source of the page", :requires => [:js, :source] do
-    @session.visit('/with_js')
-    @session.send(method).should include('This is text')
-    @session.send(method).should_not include('I changed it')
-  end
-end

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

@@ -43,6 +43,21 @@ Capybara::SpecHelper.spec '#visit' do
     end
   end
 
+  context "without a server", :requires => [:server] do
+    it "should respect `app_host`" do
+      serverless_session = Capybara::Session.new(@session.mode, nil)
+      Capybara.app_host = "http://#{@session.server.host}:#{@session.server.port}"
+      serverless_session.visit("/foo")
+      serverless_session.should have_content("Another World")
+    end
+
+    it "should visit a fully qualified URL" do
+      serverless_session = Capybara::Session.new(@session.mode, nil)
+      serverless_session.visit("http://#{@session.server.host}:#{@session.server.port}/foo")
+      serverless_session.should have_content("Another World")
+    end
+  end
+
   it "should send no referer when visiting a page" do
     @session.visit '/get_referer'
     @session.should have_content 'No referer'

data/lib/capybara/version.rb

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

data/spec/dsl_spec.rb

@@ -9,7 +9,8 @@ Capybara::SpecHelper.run_specs TestClass.new, "DSL", :skip => [
   :js,
   :screenshot,
   :frames,
-  :windows
+  :windows,
+  :server
 ]
 
 describe Capybara::DSL do

data/spec/rack_test_spec.rb

@@ -8,7 +8,8 @@ Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", :skip => [
   :js,
   :screenshot,
   :frames,
-  :windows
+  :windows,
+  :server
 ]
 
 describe Capybara::Session do

data/spec/selenium_spec.rb

@@ -7,7 +7,6 @@ end
 Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :skip => [
   :response_headers,
   :status_code,
-  :source,
   :trigger
 ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri