Skip to content

Commit

Permalink
Allow to use markdown in yard docs and write better documentation for…
Browse files Browse the repository at this point in the history
… session's reset method
  • Loading branch information
abotalov committed Apr 3, 2014
1 parent 12b975d commit a4b694b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 3 deletions.
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ gem 'bundler', '~> 1.1'
gemspec

gem 'xpath', :git => 'git://github.com/jnicklas/xpath.git'

group :doc do
gem 'redcarpet', :platforms => :mri
end
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ end

YARD::Rake::YardocTask.new do |t|
t.files = ['lib/**/*.rb']
#t.options = ['--any', '--extra', '--opts'] # optional
t.options = %w(--markup=markdown)
end

Cucumber::Rake::Task.new(:cucumber) do |task|
Expand Down
1 change: 0 additions & 1 deletion gemfiles/Gemfile.base-versions
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ gem 'rack', '= 1.3.0' # cannot go lower because referer tests need aa7ce77cd0
gem 'rack-test', '= 0.5.4'
gem 'nokogiri', '= 1.3.3'
gem 'rspec', '= 2.2.0'
gem 'fuubar', '>= 0.0.1'
gem 'cucumber', '= 0.10.5'
# We cannot test against older versions of selenium-webdriver without
# installing older compatible Firefox versions.
16 changes: 15 additions & 1 deletion lib/capybara/session.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,21 @@ def driver

##
#
# Reset the session, removing all cookies.
# Reset the session (i.e. remove cookies and navigate to blank page)
#
# This method does not:
#
# * accept modal dialogs if they are present
# * clear browser cache/HTML 5 local storage/IndexedDB/Web SQL database/etc.
# * modify state of the driver/underlying browser in any other way
#
# as doing so will result in performance downsides and it's not needed to do everything from the list above for most apps.
#
# If you want to do anything from the list above on a general basis you can:
#
# * write RSpec/Cucumber/etc. after hook
# * monkeypatch this method
# * use Ruby's `prepend` method
#
def reset!
if @touched
Expand Down

0 comments on commit a4b694b

Please sign in to comment.