* Continue evolution toward ActiveSupport::TestCase and friends. #10679 [Josh Peek]

* TestCase: introduce declared setup and teardown callbacks. Pass a list of methods and an optional block to call before setup or after teardown. Setup callbacks are run in the order declared; teardown callbacks are run in reverse.  [Jeremy Kemper]


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8570 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 2 insertions, 8 deletions

diff --git a/actionmailer/test/test_helper_test.rb b/actionmailer/test/test_helper_test.rb
index ab14bcc561..f8913e548c 100644
--- a/actionmailer/test/test_helper_test.rb
+++ b/actionmailer/test/test_helper_test.rb
@@ -9,7 +9,6 @@ class TestHelperMailer < ActionMailer::Base
 end
 
 class TestHelperMailerTest < ActionMailer::TestCase
-
   def test_setup_sets_right_action_mailer_options
     assert_equal :test, ActionMailer::Base.delivery_method
     assert ActionMailer::Base.perform_deliveries
@@ -117,19 +116,14 @@ class TestHelperMailerTest < ActionMailer::TestCase
 end
 
 class AnotherTestHelperMailerTest < ActionMailer::TestCase
-
   tests TestHelperMailer
 
   def setup
-    # Should not override ActionMailer setup methods
     @test_var = "a value"
   end
 
-  def test_should_still_setup_mailer
+  def test_setup_shouldnt_conflict_with_mailer_setup
     assert @expected.is_a?(TMail::Mail)
-  end
-  
-  def test_should_run_overridden_setup_method
-    assert @test_var
+    assert_equal 'a value', @test_var
   end
 end