diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-20 17:18:57 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-20 17:18:57 +0200 |
| commit | 0c75ec51a9b60252125534b8f9a3f6406713a957 (patch) | |
| tree | 34165e93f7dd01157f77e4e70a46ec6a5bed77c8 /activerecord/test/cases/callbacks_test.rb | |
| parent | 87398e531d0bb23b30787fe26d86678dba322895 (diff) | |
| parent | 2ffa50f5a9fac08e08869687006031b70322497a (diff) | |
| download | rails-0c75ec51a9b60252125534b8f9a3f6406713a957.tar.gz rails-0c75ec51a9b60252125534b8f9a3f6406713a957.tar.bz2 rails-0c75ec51a9b60252125534b8f9a3f6406713a957.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activerecord/test/cases/callbacks_test.rb')
| -rw-r--r-- | activerecord/test/cases/callbacks_test.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb index dc7f82b001..8a84f19836 100644 --- a/activerecord/test/cases/callbacks_test.rb +++ b/activerecord/test/cases/callbacks_test.rb @@ -461,7 +461,12 @@ class CallbacksTest < ActiveRecord::TestCase [ :before_validation, :proc ], [ :before_validation, :object ], [ :before_validation, :block ], - [ :before_validation, :returning_false ] + [ :before_validation, :returning_false ], + [ :after_rollback, :block ], + [ :after_rollback, :object ], + [ :after_rollback, :proc ], + [ :after_rollback, :string ], + [ :after_rollback, :method ], ], david.history end |