1 files changed, 15 insertions, 0 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index b7a8bc73de..2d3f8ac13a 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -86,6 +86,15 @@ class BaseTest < ActiveSupport::TestCase
       end
     end
 
+    def different_layout(layout_name='')
+      mail do |format|
+        format.text { 
+          render :layout => layout_name 
+        }
+        format.html { render :layout => layout_name }
+      end
+    end
+
   end
 
   test "method call to mail does not raise error" do
@@ -469,6 +478,12 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal("TEXT Explicit Multipart Templates", mail.text_part.body.decoded)
   end
 
+  test "that you can specify a different layout" do
+    mail = BaseMailer.different_layout('different_layout')
+    assert_equal("HTML -- HTML", mail.html_part.body.decoded)
+    assert_equal("PLAIN -- PLAIN", mail.text_part.body.decoded)
+  end
+
   protected
 
     # Execute the block setting the given values and restoring old values after