Changeset 8536

Timestamp:

01/03/08 00:40:28 (1 year ago)

Author:

david

Message:

Fixed that you don't have to call super in ActionMailer::TestCase#setup (closes #10406) [jamesgolick]

Files:

• trunk/actionmailer/CHANGELOG (modified) (1 diff)
• trunk/actionmailer/lib/action_mailer/test_case.rb (modified) (2 diffs)
• trunk/actionmailer/test/test_helper_test.rb (modified) (1 diff)

trunk/actionmailer/CHANGELOG

@@ +1 @@
+*SVN*
+
+* Fixed that you don't have to call super in ActionMailer::TestCase#setup #10406 [jamesgolick]
+
+
-*2.0.2* (December 16th, 2007)
-

trunk/actionmailer/lib/action_mailer/test_case.rb

@@ -34 +34 @@
-    end
-
-
+_with_mailer
-      ActionMailer::Base.delivery_method = :test
-      ActionMailer::Base.perform_deliveries = true
@@ -42 +42 @@
-      @expected.set_content_type "text", "plain", { "charset" => charset }
-      @expected.mime_version = '1.0'
+    end
+    alias_method :setup, :setup_with_mailer
+
+    def self.method_added(method)
+      if method.to_s == 'setup'
+        unless method_defined?(:setup_without_mailer)
+          alias_method :setup_without_mailer, :setup
+          define_method(:setup) do
+            setup_with_mailer
+            setup_without_mailer
+          end
+        end
+      end
-    end
-

trunk/actionmailer/test/test_helper_test.rb

@@ -116 +116 @@
-  end
-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
+    assert @expected.is_a?(TMail::Mail)
+  end
+  
+  def test_should_run_overridden_setup_method
+    assert @test_var
+  end
+end