aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-07-09 13:11:05 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-07-09 13:13:59 -0700
commitd4811702510bf289bb07ce93263cd04d49e96bea (patch)
tree9dd556b8f0f7d2e037db167d302eb849f0275bc7 /actionpack/lib/action_controller
parentd1c4acc669ac1c908cb6fab6e0be5d5c2f310272 (diff)
downloadrails-d4811702510bf289bb07ce93263cd04d49e96bea.tar.gz
rails-d4811702510bf289bb07ce93263cd04d49e96bea.tar.bz2
rails-d4811702510bf289bb07ce93263cd04d49e96bea.zip
deprecate `describe` without a block.
minitest/spec provides `describe`, so deprecate the rails version and have people use the superclass version
Diffstat (limited to 'actionpack/lib/action_controller')
-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 0498b9d138..5f50bf5de6 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -358,7 +358,7 @@ module ActionController
# Use AS::TestCase for the base class when describing a model
register_spec_type(self) do |desc|
- desc < ActionController::Base
+ Class === desc && desc < ActionController::Base
end
module Behavior