aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-09-05 02:49:28 -0700
committerXavier Noria <fxn@hashref.com>2012-09-05 02:49:28 -0700
commit08c4eb5e24f2a6aad3f0af4b9ae18290279d05bf (patch)
tree86440acf26a471735b64c43dac75cd5f53692661 /actionpack
parentac5089d769d612a596c437085acd3c4ef257ab4e (diff)
parentdc69220e28e319fb557f87b92766f88d240a3327 (diff)
downloadrails-08c4eb5e24f2a6aad3f0af4b9ae18290279d05bf.tar.gz
rails-08c4eb5e24f2a6aad3f0af4b9ae18290279d05bf.tar.bz2
rails-08c4eb5e24f2a6aad3f0af4b9ae18290279d05bf.zip
Merge pull request #7530 from robin850/master
Fix a typo in AD
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index ab584abf68..a8b27ffafd 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -19,7 +19,7 @@ module ActionDispatch
# - +headers+: Additional headers to pass, as a Hash. The headers will be
# merged into the Rack env hash.
#
- # This method returns an Response object, which one can use to
+ # This method returns a Response object, which one can use to
# inspect the details of the response. Furthermore, if this method was
# called from an ActionDispatch::IntegrationTest object, then that
# object's <tt>@response</tt> instance variable will point to the same