diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-10-12 23:03:02 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-10-12 23:03:02 -0500 |
commit | 29b280666b6a8216a46b8349fa76c85f5b5dcc55 (patch) | |
tree | 56ef2169b03356667efd2e48e70e5a23bf819fc9 /activesupport/test | |
parent | 4552dabba7e95ca3805747c469858328a4929857 (diff) | |
download | rails-29b280666b6a8216a46b8349fa76c85f5b5dcc55.tar.gz rails-29b280666b6a8216a46b8349fa76c85f5b5dcc55.tar.bz2 rails-29b280666b6a8216a46b8349fa76c85f5b5dcc55.zip |
Get AS TestCase off deprecated callbacks
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/test_test.rb | 56 |
1 files changed, 2 insertions, 54 deletions
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb index 40d3d612e7..7a45dab60b 100644 --- a/activesupport/test/test_test.rb +++ b/activesupport/test/test_test.rb @@ -4,7 +4,7 @@ require 'active_support/core_ext/kernel/reporting' class AssertDifferenceTest < ActiveSupport::TestCase def setup @object = Class.new do - attr_accessor :num + attr_accessor :num def increment self.num += 1 end @@ -12,7 +12,7 @@ class AssertDifferenceTest < ActiveSupport::TestCase def decrement self.num -= 1 end - end.new + end.new @object.num = 0 end @@ -95,55 +95,3 @@ end class AlsoDoingNothingTest < ActiveSupport::TestCase end - -# Setup and teardown callbacks. -class SetupAndTeardownTest < ActiveSupport::TestCase - setup :reset_callback_record, :foo - teardown :foo, :sentinel, :foo - - def test_inherited_setup_callbacks - assert_equal [:reset_callback_record, :foo], self.class.setup_callback_chain.map(&:method) - assert_equal [:foo], @called_back - assert_equal [:foo, :sentinel, :foo], self.class.teardown_callback_chain.map(&:method) - end - - def setup - end - - def teardown - end - - protected - def reset_callback_record - @called_back = [] - end - - def foo - @called_back << :foo - end - - def sentinel - assert_equal [:foo, :foo], @called_back - end -end - - -class SubclassSetupAndTeardownTest < SetupAndTeardownTest - setup :bar - teardown :bar - - def test_inherited_setup_callbacks - assert_equal [:reset_callback_record, :foo, :bar], self.class.setup_callback_chain.map(&:method) - assert_equal [:foo, :bar], @called_back - assert_equal [:foo, :sentinel, :foo, :bar], self.class.teardown_callback_chain.map(&:method) - end - - protected - def bar - @called_back << :bar - end - - def sentinel - assert_equal [:foo, :bar, :bar, :foo], @called_back - end -end |