aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-07-28 20:40:27 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-07-28 20:40:27 -0700
commit1f870a2c5911b2eec519062486a74a725e924b3d (patch)
treee6b51e797f3959f020955c8c97e5e15440c6256b
parentf79b29a5a8634bf40332314fb2d9fb92e830f36a (diff)
downloadrails-1f870a2c5911b2eec519062486a74a725e924b3d.tar.gz
rails-1f870a2c5911b2eec519062486a74a725e924b3d.tar.bz2
rails-1f870a2c5911b2eec519062486a74a725e924b3d.zip
issue a warning when we cannot construct a controller
-rw-r--r--actionpack/lib/action_controller/test_case.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index eb7194ebaf..4ccb77992e 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -529,11 +529,19 @@ module ActionController
@response = TestResponse.new
@response.request = @request
+ @controller = nil unless defined? @controller
+
if klass = self.class.controller_class
- @controller ||= klass.new rescue nil
+ unless @controller
+ begin
+ @controller = klass.new
+ rescue
+ warn "could not construct controller #{klass}" if $VERBOSE
+ end
+ end
end
- if defined?(@controller) && @controller
+ if @controller
@controller.request = @request
@controller.params = {}
end