aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/assertions
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-25 18:48:46 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-25 18:48:46 -0800
commit8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0 (patch)
treec68b0a9a12b4079ad375a1172b3186a83755cabf /actionpack/lib/action_controller/assertions
parentd9c95c82e5d522f42ac866462773ee078afcddf2 (diff)
parentc80fe1093deeb57eee8df11d3c4120158634cb81 (diff)
downloadrails-8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0.tar.gz
rails-8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0.tar.bz2
rails-8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/assertions')
-rw-r--r--actionpack/lib/action_controller/assertions/model_assertions.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/assertions/model_assertions.rb b/actionpack/lib/action_controller/assertions/model_assertions.rb
index d25214bb66..3a7b39b106 100644
--- a/actionpack/lib/action_controller/assertions/model_assertions.rb
+++ b/actionpack/lib/action_controller/assertions/model_assertions.rb
@@ -11,6 +11,7 @@ module ActionController
# assert_valid(model)
#
def assert_valid(record)
+ ::ActiveSupport::Deprecation.warn("assert_valid is deprecated. Use assert record.valid? instead", caller)
clean_backtrace do
assert record.valid?, record.errors.full_messages.join("\n")
end