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

Originally introduced in e1ba3c4dfb, though spec/acceptance never
actually worked. Jo just has a vivid imagination.
This commit is contained in:
Jo Liss 2011-12-08 20:59:17 +01:00
parent 9ed30f08ca
commit 5462955162
2 changed files with 5 additions and 6 deletions

View File

@ -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 File

@ -257,7 +257,7 @@ module Capybara
##
#
# 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