Permalink
Switch branches/tags
Commits on Dec 31, 2012
  1. update version file

    jnicklas committed Dec 31, 2012
  2. update history

    jnicklas committed Dec 31, 2012
  3. Merge pull request #919 from jdelStrother/timeout_error

    jnicklas committed Dec 31, 2012
    Remove Capybara::TimeoutError
  4. formatting

    jnicklas committed Dec 30, 2012
  5. Ignore binstubs

    jnicklas committed Dec 30, 2012
Commits on Dec 26, 2012
  1. Merge pull request #913 from randycoulman/dsl-spec-cleanup

    joliss committed Dec 26, 2012
    Use @session to remove duplication from DSL specs.
  2. Remove Capybara::TimeoutError

    jdelStrother committed Dec 26, 2012
    It's no longer necessary, we rely on Ruby's Timeout::Error instead
  3. Merge pull request #918 from jdelStrother/timeout_error

    jnicklas committed Dec 26, 2012
    Catch the correct timeout exception during Server#boot
  4. Catch the correct timeout exception during Server#boot

    jdelStrother committed Dec 26, 2012
    TimeoutError is actually Capybara::TimeoutError, which is unrelated to Ruby's Timeout
Commits on Dec 23, 2012
  1. Merge pull request #914 from abotalov/patch-1

    jnicklas committed Dec 23, 2012
    Remove info about rows from rubydoc comments
Commits on Dec 18, 2012
Commits on Dec 15, 2012
  1. Merge pull request #912 from sanemat/fix/default-utf-8

    jnicklas committed Dec 15, 2012
    Add magic comment for Ruby2.0.0
  2. Add magic comment for Ruby2.0.0

    sanemat committed Dec 15, 2012
    Ruby2.0.0 default encoding is UTF-8 instead of US_ASCII
Commits on Dec 5, 2012
  1. Merge pull request #902 from kdotme/jruby_encoding_fix

    joliss committed Dec 5, 2012
    Add encoding header to the helpers definition file
  2. Add encoding header to the helpers definition file

    heypiotr committed Dec 5, 2012
    Fixes "incompatible character encoding" error when running Capybara
    on JRuby platforms.
Commits on Dec 3, 2012
  1. Add latest changes

    jnicklas committed Dec 3, 2012
  2. Add 2.0.1 to history

    jnicklas committed Dec 3, 2012
  3. Merge pull request #899 from bcardarella/master

    jnicklas committed Dec 3, 2012
    Don't parse current_host when building mock session
  4. Don't parse current_host

    bcardarella committed Dec 3, 2012
    Because the current_host is now being explicitly set to the host instead
    of the full URI (as it was in Capybara 1.x) when URI.parse is being used
    the result will always be `nil` when parsing the host from an incomplete
    URI.
Commits on Dec 2, 2012
  1. Merge pull request #897 from kou/suppress-warnings

    joliss committed Dec 2, 2012
    Suppress warnings
  2. Suppress a warning: instance variable @touched not initialized

    kou committed Dec 2, 2012
    lib/capybara/session.rb:74: warning: instance variable @touched not initialized
  3. Suppress a warning: instance variable @unsynchronized not initialized

    kou committed Dec 2, 2012
    lib/capybara/node/base.rb:101: warning: instance variable @unsynchronized not initialized
  4. Suppress a warning: instance variable @server not initialized

    kou committed Dec 2, 2012
    lib/capybara/session.rb:170: warning: instance variable @server not initialized
  5. Suppress a warning: instance variable @label not initialized

    kou committed Dec 2, 2012
    lib/capybara/selector.rb:48: warning: instance variable @label not initialized
  6. Suppress warnings: shadowing outer local variable

    kou committed Dec 2, 2012
    lib/capybara/spec/spec_helper.rb:49: warning: shadowing outer local variable - name
    lib/capybara/spec/spec_helper.rb:49: warning: shadowing outer local variable - options
Commits on Nov 30, 2012
  1. Merge pull request #888 from kou/equal-not-raise

    jnicklas committed Nov 30, 2012
    == doesn't raise an exception for unrelated object
Commits on Nov 28, 2012
  1. Clean up spec helper a bit

    jnicklas committed Nov 28, 2012
  2. Don't automatically configure RSpec in Capybara spec helper

    jnicklas committed Nov 28, 2012
    Driver authors then have the choice how they want RSpec configured.
  3. Merge pull request #892 from jamie/master

    joliss committed Nov 28, 2012
    Update for readme
  4. Add 1.1.4 to History

    jnicklas committed Nov 28, 2012