aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/callbacks_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-12-23 19:20:57 +0100
committerJosé Valim <jose.valim@gmail.com>2010-12-23 19:21:14 +0100
commitd6efd3cfc2c6d6822aeac550852c49135fbe46c7 (patch)
tree11e8fe3360b2385f18adf8b6a1b83e5afcd8e61c /actionpack/test/dispatch/callbacks_test.rb
parent819b8cae40623d26ce3c050d482b490539a25b98 (diff)
downloadrails-d6efd3cfc2c6d6822aeac550852c49135fbe46c7.tar.gz
rails-d6efd3cfc2c6d6822aeac550852c49135fbe46c7.tar.bz2
rails-d6efd3cfc2c6d6822aeac550852c49135fbe46c7.zip
Don't deprecate to_prepare.
Diffstat (limited to 'actionpack/test/dispatch/callbacks_test.rb')
-rw-r--r--actionpack/test/dispatch/callbacks_test.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/actionpack/test/dispatch/callbacks_test.rb b/actionpack/test/dispatch/callbacks_test.rb
index 5becb621de..eed2eca2ab 100644
--- a/actionpack/test/dispatch/callbacks_test.rb
+++ b/actionpack/test/dispatch/callbacks_test.rb
@@ -29,14 +29,16 @@ class DispatcherTest < ActiveSupport::TestCase
assert_equal 4, Foo.b
end
- def test_to_prepare_deprecation
- prepared = false
- assert_deprecated do
- ActionDispatch::Callbacks.to_prepare { prepared = true }
- end
+ def test_to_prepare_and_cleanup_delegation
+ prepared = cleaned = false
+ ActionDispatch::Callbacks.to_prepare { prepared = true }
+ ActionDispatch::Callbacks.to_prepare { cleaned = true }
ActionDispatch::Reloader.prepare!
assert prepared
+
+ ActionDispatch::Reloader.cleanup!
+ assert cleaned
end
private