aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-29 12:19:21 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-29 12:19:21 -0200
commit7814f901e1ec0cc3228914f60bd340922f98d94f (patch)
treeb5e1301567a11595ace4c391b224353cbec2aab5 /actionpack
parent0eb3ba0e658dd95a5e7d08ddaab7a4c08083756c (diff)
downloadrails-7814f901e1ec0cc3228914f60bd340922f98d94f.tar.gz
rails-7814f901e1ec0cc3228914f60bd340922f98d94f.tar.bz2
rails-7814f901e1ec0cc3228914f60bd340922f98d94f.zip
Use fixed fonts only in the name of the parameter
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/test_case.rb16
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb6
2 files changed, 11 insertions, 11 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index ccfaa1135c..15e587bcea 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -494,11 +494,11 @@ module ActionController
# Simulate a GET request with the given parameters.
#
# - +action+: The controller action to call.
- # - +params:+ The hash with HTTP parameters that you want to pass. This may be +nil+.
- # - +body:+ The request body with a string that is appropriately encoded
+ # - +params+: The hash with HTTP parameters that you want to pass. This may be +nil+.
+ # - +body+: The request body with a string that is appropriately encoded
# (<tt>application/x-www-form-urlencoded</tt> or <tt>multipart/form-data</tt>).
- # - +session:+ A hash of parameters to store in the session. This may be +nil+.
- # - +flash:+ A hash of parameters to store in the flash. This may be +nil+.
+ # - +session+: A hash of parameters to store in the session. This may be +nil+.
+ # - +flash+: A hash of parameters to store in the flash. This may be +nil+.
#
# You can also simulate POST, PATCH, PUT, DELETE, and HEAD requests with
# +post+, +patch+, +put+, +delete+, and +head+.
@@ -574,11 +574,11 @@ module ActionController
# - +action+: The controller action to call.
# - +method+: Request method used to send the HTTP request. Possible values
# are +GET+, +POST+, +PATCH+, +PUT+, +DELETE+, +HEAD+. Defaults to +GET+. Can be a symbol.
- # - +params:+ The hash with HTTP parameters that you want to pass. This may be +nil+.
- # - +body:+ The request body with a string that is appropriately encoded
+ # - +params+: The hash with HTTP parameters that you want to pass. This may be +nil+.
+ # - +body+: The request body with a string that is appropriately encoded
# (<tt>application/x-www-form-urlencoded</tt> or <tt>multipart/form-data</tt>).
- # - +session:+ A hash of parameters to store in the session. This may be +nil+.
- # - +flash:+ A hash of parameters to store in the flash. This may be +nil+.
+ # - +session+: A hash of parameters to store in the session. This may be +nil+.
+ # - +flash+: A hash of parameters to store in the flash. This may be +nil+.
#
# Example calling +create+ action and sending two params:
#
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 0cfec5a7b4..fa6ff03e9c 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -12,14 +12,14 @@ module ActionDispatch
#
# - +path+: The URI (as a String) on which you want to perform a GET
# request.
- # - +params:+ The HTTP parameters that you want to pass. This may
+ # - +params+: The HTTP parameters that you want to pass. This may
# be +nil+,
# a Hash, or a String that is appropriately encoded
# (<tt>application/x-www-form-urlencoded</tt> or
# <tt>multipart/form-data</tt>).
- # - +headers:+ Additional headers to pass, as a Hash. The headers will be
+ # - +headers+: Additional headers to pass, as a Hash. The headers will be
# merged into the Rack env hash.
- # - +env:+ Additional env to pass, as a Hash. The headers will be
+ # - +env+: Additional env to pass, as a Hash. The headers will be
# merged into the Rack env hash.
#
# This method returns a Response object, which one can use to