aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_case.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-02-01 10:31:51 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-02-01 10:31:51 -0800
commit7bfdbeabd26f87d9e6bb6891d6c8dee36d1dfcb1 (patch)
tree0dc37ebe223e589adde0dc419e7f960843e2534f /actionpack/lib/action_controller/test_case.rb
parent049dc500b632ca1a05d41a0c5454946f24d15035 (diff)
parent46fc0f22e2e59234bdc37a58b04038caf5829f4b (diff)
downloadrails-7bfdbeabd26f87d9e6bb6891d6c8dee36d1dfcb1.tar.gz
rails-7bfdbeabd26f87d9e6bb6891d6c8dee36d1dfcb1.tar.bz2
rails-7bfdbeabd26f87d9e6bb6891d6c8dee36d1dfcb1.zip
Merge pull request #4784 from semaperepelitsa/constantize
A little constantize update
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
-rw-r--r--actionpack/lib/action_controller/test_case.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index fce6e29d5f..1e226fc336 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -351,7 +351,7 @@ module ActionController
def tests(controller_class)
case controller_class
when String, Symbol
- self.controller_class = "#{controller_class.to_s.underscore}_controller".camelize.constantize
+ self.controller_class = "#{controller_class.to_s.camelize}Controller".constantize
when Class
self.controller_class = controller_class
else