aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_case.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-17 14:51:44 -0400
committerJosé Valim <jose.valim@gmail.com>2011-05-17 14:51:44 -0400
commit760dec17bea1cf10534d33d409e4d6e1ff62c6af (patch)
tree630dceb455cabc41ab277230e964e7796fd42c7d /actionpack/lib/action_controller/test_case.rb
parent1d71c93f99f25e13719e4a6697f7630996421ca4 (diff)
downloadrails-760dec17bea1cf10534d33d409e4d6e1ff62c6af.tar.gz
rails-760dec17bea1cf10534d33d409e4d6e1ff62c6af.tar.bz2
rails-760dec17bea1cf10534d33d409e4d6e1ff62c6af.zip
Use anonymous? that works on both Ruby 1.8 and 1.9.
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
-rw-r--r--actionpack/lib/action_controller/test_case.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 5e4b48a531..89ff5ba174 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -2,6 +2,7 @@ require 'rack/session/abstract/id'
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/object/to_query'
require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/module/anonymous'
module ActionController
module TemplateAssertions
@@ -413,9 +414,9 @@ module ActionController
@request.env['REQUEST_METHOD'] = http_method
parameters ||= {}
- controller_class_name = @controller.class.name ?
- @controller.class.name.underscore.sub(/_controller$/, '') :
- "anonymous_controller"
+ controller_class_name = @controller.class.anonymous? ?
+ "anonymous_controller" :
+ @controller.class.name.underscore.sub(/_controller$/, '')
@request.assign_parameters(@routes, controller_class_name, action.to_s, parameters)