aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-16 14:46:34 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-16 14:46:34 -0200
commit43ab5433a78fede6c1499d7305661dc3cd205e53 (patch)
treeedb6d7bd106352363d25689c9d1ca03d71f07081 /activesupport/lib
parentab90c277a74b4b47a8d4cbef796c45d1a8b17cfd (diff)
parent8c1889c926326ca97cd9b4b1fb0017d13f208b03 (diff)
downloadrails-43ab5433a78fede6c1499d7305661dc3cd205e53.tar.gz
rails-43ab5433a78fede6c1499d7305661dc3cd205e53.tar.bz2
rails-43ab5433a78fede6c1499d7305661dc3cd205e53.zip
Merge pull request #18031 from claudiob/better-tests-for-callbacks-terminator
Add test for `:skip_after_callbacks_if_terminated`
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/callbacks.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 24c702b602..95dbc9a0cb 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -659,16 +659,17 @@ module ActiveSupport
# ===== Options
#
# * <tt>:terminator</tt> - Determines when a before filter will halt the
- # callback chain, preventing following callbacks from being called and
- # the event from being triggered. This should be a lambda to be executed.
+ # callback chain, preventing following before and around callbacks from
+ # being called and the event from being triggered.
+ # This should be a lambda to be executed.
# The current object and the return result of the callback will be called
# with the lambda.
#
# define_callbacks :validate, terminator: ->(target, result) { result == false }
#
# In this example, if any before validate callbacks returns +false+,
- # other callbacks are not executed. Defaults to +false+, meaning no value
- # halts the chain.
+ # any successive before and around callback is not executed.
+ # Defaults to +false+, meaning no value halts the chain.
#
# * <tt>:skip_after_callbacks_if_terminated</tt> - Determines if after
# callbacks should be terminated by the <tt>:terminator</tt> option. By