diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-04 18:19:55 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-04 18:19:55 -0300 |
| commit | 49a0f554a66ed427df2ab9942e64252b56b60c27 (patch) | |
| tree | 4a43bee11e00334458b94deedf776525e727e9ad /activesupport/test | |
| parent | 02acd95d5700ea868c34f5d260882fda3cc836d3 (diff) | |
| download | rails-49a0f554a66ed427df2ab9942e64252b56b60c27.tar.gz rails-49a0f554a66ed427df2ab9942e64252b56b60c27.tar.bz2 rails-49a0f554a66ed427df2ab9942e64252b56b60c27.zip | |
Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters"
This reverts commit c79c6980647eb76bfa52178711fb04ba7e9d403b, reversing
changes made to ba4c27479add60b783a0e623c8a5d176c1dc9043.
This broke all the tests. See https://travis-ci.org/rails/rails/builds/6061839
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/callbacks_test.rb | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb index 5afc2094e8..13f2e3cdaf 100644 --- a/activesupport/test/callbacks_test.rb +++ b/activesupport/test/callbacks_test.rb @@ -66,16 +66,6 @@ module CallbacksTest end end - class CallbackClass - def self.before(model) - model.history << [:before_save, :class] - end - - def self.after(model) - model.history << [:after_save, :class] - end - end - class Person < Record [:before_save, :after_save].each do |callback_method| callback_method_sym = callback_method.to_sym @@ -83,7 +73,6 @@ module CallbacksTest send(callback_method, callback_string(callback_method_sym)) send(callback_method, callback_proc(callback_method_sym)) send(callback_method, callback_object(callback_method_sym.to_s.gsub(/_save/, ''))) - send(callback_method, CallbackClass) send(callback_method) { |model| model.history << [callback_method_sym, :block] } end @@ -97,7 +86,6 @@ module CallbacksTest skip_callback :save, :after, :before_save_method, :unless => :yes skip_callback :save, :after, :before_save_method, :if => :no skip_callback :save, :before, :before_save_method, :unless => :no - skip_callback :save, :before, CallbackClass , :if => :yes def yes; true; end def no; false; end end @@ -442,7 +430,6 @@ module CallbacksTest [:before_save, :object], [:before_save, :block], [:after_save, :block], - [:after_save, :class], [:after_save, :object], [:after_save, :proc], [:after_save, :string], @@ -462,10 +449,8 @@ module CallbacksTest [:before_save, :string], [:before_save, :proc], [:before_save, :object], - [:before_save, :class], [:before_save, :block], [:after_save, :block], - [:after_save, :class], [:after_save, :object], [:after_save, :proc], [:after_save, :string], @@ -730,10 +715,8 @@ module CallbacksTest [:before_save, :string], [:before_save, :proc], [:before_save, :object], - [:before_save, :class], [:before_save, :block], [:after_save, :block], - [:after_save, :class], [:after_save, :object], [:after_save, :proc], [:after_save, :string], |