aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2014-06-06 03:24:48 +0930
committerMatthew Draper <matthew@trebex.net>2014-06-06 03:24:48 +0930
commit141e6e8a2faf1492e5a0ccd4acb8b2cd075ee446 (patch)
tree1a05dfd4000ff0e0e1cb0d20a95f403ea6cc88e3 /actionpack
parent805c31dc4340664142a02b839fdf571b6586a347 (diff)
parent5faf77fe7abffed40e3a4110cf33f83c99e90ce4 (diff)
downloadrails-141e6e8a2faf1492e5a0ccd4acb8b2cd075ee446.tar.gz
rails-141e6e8a2faf1492e5a0ccd4acb8b2cd075ee446.tar.bz2
rails-141e6e8a2faf1492e5a0ccd4acb8b2cd075ee446.zip
Merge pull request #15530 from zuhao/refactor_actionpack_reloader_test
Reset callbacks after test.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/dispatch/reloader_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/reloader_test.rb b/actionpack/test/dispatch/reloader_test.rb
index ce9ccfcee8..62e8197e20 100644
--- a/actionpack/test/dispatch/reloader_test.rb
+++ b/actionpack/test/dispatch/reloader_test.rb
@@ -3,6 +3,11 @@ require 'abstract_unit'
class ReloaderTest < ActiveSupport::TestCase
Reloader = ActionDispatch::Reloader
+ teardown do
+ Reloader.reset_callbacks :prepare
+ Reloader.reset_callbacks :cleanup
+ end
+
def test_prepare_callbacks
a = b = c = nil
Reloader.to_prepare { |*args| a = b = c = 1 }