diff options
| author | Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local> | 2009-06-02 21:41:31 -0700 |
|---|---|---|
| committer | Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local> | 2009-06-02 21:41:31 -0700 |
| commit | 1126a85aed576402d978e6f76eb393b6baaa9541 (patch) | |
| tree | ab98097c1b6b80730941c8589dc8eb48847f0339 /activesupport/test/new_callback_inheritance_test.rb | |
| parent | 971e2438d98326c994ec6d3ef8e37b7e868ed6e2 (diff) | |
| download | rails-1126a85aed576402d978e6f76eb393b6baaa9541.tar.gz rails-1126a85aed576402d978e6f76eb393b6baaa9541.tar.bz2 rails-1126a85aed576402d978e6f76eb393b6baaa9541.zip | |
Further cleaning up new callbacks
Diffstat (limited to 'activesupport/test/new_callback_inheritance_test.rb')
| -rw-r--r-- | activesupport/test/new_callback_inheritance_test.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/test/new_callback_inheritance_test.rb b/activesupport/test/new_callback_inheritance_test.rb index 9a1882b9d3..da0c19eaea 100644 --- a/activesupport/test/new_callback_inheritance_test.rb +++ b/activesupport/test/new_callback_inheritance_test.rb @@ -11,8 +11,8 @@ class GrandParent end define_callbacks :dispatch - _set_callback :dispatch, :before, :before1, :before2, :per_key => {:if => proc {|c| c.action_name == "index" || c.action_name == "update" }} - _set_callback :dispatch, :after, :after1, :after2, :per_key => {:if => proc {|c| c.action_name == "update" || c.action_name == "delete" }} + set_callback :dispatch, :before, :before1, :before2, :per_key => {:if => proc {|c| c.action_name == "index" || c.action_name == "update" }} + set_callback :dispatch, :after, :after1, :after2, :per_key => {:if => proc {|c| c.action_name == "update" || c.action_name == "delete" }} def before1 @log << "before1" @@ -39,12 +39,12 @@ class GrandParent end class Parent < GrandParent - _skip_callback :dispatch, :before, :before2, :per_key => {:unless => proc {|c| c.action_name == "update" }} - _skip_callback :dispatch, :after, :after2, :per_key => {:unless => proc {|c| c.action_name == "delete" }} + skip_callback :dispatch, :before, :before2, :per_key => {:unless => proc {|c| c.action_name == "update" }} + skip_callback :dispatch, :after, :after2, :per_key => {:unless => proc {|c| c.action_name == "delete" }} end class Child < GrandParent - _skip_callback :dispatch, :before, :before2, :per_key => {:unless => proc {|c| c.action_name == "update" }}, :if => :state_open? + skip_callback :dispatch, :before, :before2, :per_key => {:unless => proc {|c| c.action_name == "update" }}, :if => :state_open? def state_open? @state == :open |