Permalink
Browse files

renames the :abort deprecation behaviour to :raise

That is a better name, thanks @jeremy.
  • Loading branch information...
fxn committed Aug 12, 2013
1 parent 8381a49 commit 8a099f19126747f8b97d7665ea457cb9d66bb1ee
@@ -1,9 +1,9 @@
## unreleased ##
-* Adds a new deprecation behaviour that aborts the application. Throwing this
+* Adds a new deprecation behaviour that raises an exception. Throwing this
line into +config/environments/development.rb+
- ActiveSupport::Deprecation.behavior = :abort
+ ActiveSupport::Deprecation.behavior = :raise
will cause the application to raise an +ActiveSupport::DeprecationException+
on deprecations.
@@ -7,7 +7,7 @@ class DeprecationException < StandardError
class Deprecation
# Default warning behaviors per Rails.env.
DEFAULT_BEHAVIORS = {
- abort: ->(message, callstack) {
+ raise: ->(message, callstack) {
e = DeprecationException.new(message)
e.set_backtrace(callstack)
raise e
@@ -52,7 +52,7 @@ def behavior
#
# Available behaviors:
#
- # [+abort+] Raises <tt>ActiveSupport::DeprecationException</tt>.
+ # [+raise+] Raise <tt>ActiveSupport::DeprecationException</tt>.
# [+stderr+] Log all deprecation warnings to +$stderr+.
# [+log+] Log all deprecation warnings to +Rails.logger+.
# [+notify+] Use +ActiveSupport::Notifications+ to notify +deprecation.rails+.
@@ -98,8 +98,8 @@ def test_several_behaviors
assert_match(/foo=nil/, @b)
end
- def test_abort_behaviour
- ActiveSupport::Deprecation.behavior = :abort
+ def test_raise_behaviour
+ ActiveSupport::Deprecation.behavior = :raise
message = 'Revise this deprecated stuff now!'
callstack = %w(foo bar baz)
@@ -110,7 +110,7 @@ def test_abort_behaviour
assert_equal message, e.message
assert_equal callstack, e.backtrace
else
- flunk 'the :abort deprecation behaviour should raise the expected exception'
+ flunk 'the :raise deprecation behaviour should raise the expected exception'
end
end

0 comments on commit 8a099f1

Please sign in to comment.