Permalink
Browse files

Stop falsely advertising spec/acceptance, fix typos. Closes #483.

Originally introduced in e1ba3c4, though spec/acceptance never
actually worked. Jo just has a vivid imagination.
  • Loading branch information...
1 parent 9ed30f0 commit 546295516287c757d12fb4020034d56577b47b09 @joliss joliss committed Dec 8, 2011
Showing with 5 additions and 6 deletions.
  1. +4 −5 README.rdoc
  2. +1 −1 lib/capybara/session.rb
View
@@ -116,9 +116,9 @@ use the Capybara helpers <i>and</i> you have access to things like named route
helpers in your tests (so you are able to say, for instance, <tt>visit
edit_user_path(user)</tt>, instead of <tt>visit "/users/#{user.id}/edit"</tt>,
if you prefer that sort of thing). A good place to put these specs is
-<tt>spec/requests</tt>, as <tt>rspec-rails</tt> will automatically tag them with
-<tt>:type => :request</tt>. (In fact, <tt>spec/integration</tt> and
-<tt>spec/acceptance</tt> will work just as well.)
+<tt>spec/requests</tt> (or synonymously <tt>spec/integration</tt>), as
+<tt>rspec-rails</tt> will automatically tag them with <tt>:type =>
+:request</tt>.
<tt>rspec-rails</tt> will also automatically include Capybara in <tt>:controller</tt> and <tt>:mailer</tt> example groups.
@@ -529,8 +529,7 @@ pass. If you do not want this behaviour, you can set
== Using the DSL in unsupported testing frameworks
-You can mix the DSL into any context by including +Capybara::DSL+:
-
+You can mix the DSL into any context by including <tt>Capybara::DSL</tt>:
require 'capybara'
require 'capybara/dsl'
View
@@ -257,7 +257,7 @@ def wait_until(timeout = Capybara.default_wait_time)
##
#
# Execute the given script, not returning a result. This is useful for scripts that return
- # complex objects, such as jQuery statements. +execute_script+ should always be used over
+ # complex objects, such as jQuery statements. +execute_script+ should be used over
# +evaluate_script+ whenever possible.
#
# @param [String] script A string of JavaScript to execute

0 comments on commit 5462955

Please sign in to comment.