1 files changed, 16 insertions, 15 deletions

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index b9a5e78fe9..e5f1ad63c2 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -18,7 +18,7 @@ module ActionController
       @_layouts = Hash.new(0)
       @_files = Hash.new(0)
 
-      ActiveSupport::Notifications.subscribe("render_template.action_view") do |name, start, finish, id, payload|
+      ActiveSupport::Notifications.subscribe("render_template.action_view") do |_name, _start, _finish, _id, payload|
         path = payload[:layout]
         if path
           @_layouts[path] += 1
@@ -28,7 +28,7 @@ module ActionController
         end
       end
 
-      ActiveSupport::Notifications.subscribe("!render_template.action_view") do |name, start, finish, id, payload|
+      ActiveSupport::Notifications.subscribe("!render_template.action_view") do |_name, _start, _finish, _id, payload|
         path = payload[:virtual_path]
         next unless path
         partial = path =~ /^.*\/_[^\/]*$/
@@ -41,7 +41,7 @@ module ActionController
         @_templates[path] += 1
       end
 
-      ActiveSupport::Notifications.subscribe("!render_template.action_view") do |name, start, finish, id, payload|
+      ActiveSupport::Notifications.subscribe("!render_template.action_view") do |_name, _start, _finish, _id, payload|
         next if payload[:virtual_path] # files don't have virtual path
 
         path = payload[:identifier]
@@ -455,13 +455,14 @@ module ActionController
       #
       # - +action+: The controller action to call.
       # - +parameters+: The HTTP parameters that you want to pass. This may
-      #   be +nil+, a Hash, or a String that is appropriately encoded
+      #   be +nil+, a hash, or 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, HEAD, and OPTIONS requests with
+      # +post+, +patch+, +put+, +delete+, +head+, and +options+.
       #
-      # You can also simulate POST, PATCH, PUT, DELETE, and HEAD requests with
-      # +#post+, +#patch+, +#put+, +#delete+, and +#head+.
       # Note that the request method is not verified. The different methods are
       # available to make the tests more expressive.
       def get(action, *args)
@@ -469,37 +470,37 @@ module ActionController
       end
 
       # Simulate a POST request with the given parameters and set/volley the response.
-      # See +#get+ for more details.
+      # See +get+ for more details.
       def post(action, *args)
         process(action, "POST", *args)
       end
 
       # Simulate a PATCH request with the given parameters and set/volley the response.
-      # See +#get+ for more details.
+      # See +get+ for more details.
       def patch(action, *args)
         process(action, "PATCH", *args)
       end
 
       # Simulate a PUT request with the given parameters and set/volley the response.
-      # See +#get+ for more details.
+      # See +get+ for more details.
       def put(action, *args)
         process(action, "PUT", *args)
       end
 
       # Simulate a DELETE request with the given parameters and set/volley the response.
-      # See +#get+ for more details.
+      # See +get+ for more details.
       def delete(action, *args)
         process(action, "DELETE", *args)
       end
 
       # Simulate a HEAD request with the given parameters and set/volley the response.
-      # See +#get+ for more details.
+      # See +get+ for more details.
       def head(action, *args)
         process(action, "HEAD", *args)
       end
 
       # Simulate a OPTIONS request with the given parameters and set/volley the response.
-      # See +#get+ for more details.
+      # See +get+ for more details.
       def options(action, *args)
         process(action, "OPTIONS", *args)
       end
@@ -557,7 +558,7 @@ module ActionController
         parameters ||= {}
         controller_class_name = @controller.class.anonymous? ?
           "anonymous" :
-          @controller.class.name.underscore.sub(/_controller$/, '')
+          @controller.class.controller_path
 
         @request.assign_parameters(@routes, controller_class_name, action.to_s, parameters)