1 files changed, 26 insertions, 0 deletions

diff --git a/railties/test/application/mailer_previews_test.rb b/railties/test/application/mailer_previews_test.rb
index 1752a9f3c6..83501a7f11 100644
--- a/railties/test/application/mailer_previews_test.rb
+++ b/railties/test/application/mailer_previews_test.rb
@@ -327,6 +327,32 @@ module ApplicationTests
       assert_match "Email 'bar' not found in NotifierPreview", last_response.body
     end
 
+    test "mailer preview NullMail" do
+      mailer 'notifier', <<-RUBY
+        class Notifier < ActionMailer::Base
+          default from: "from@example.com"
+
+          def foo
+            # does not call +mail+
+          end
+        end
+      RUBY
+
+      mailer_preview 'notifier', <<-RUBY
+        class NotifierPreview < ActionMailer::Preview
+          def foo
+            Notifier.foo
+          end
+        end
+      RUBY
+
+      app('development')
+
+      get "/rails/mailers/notifier/foo"
+      assert_match "You are trying to preview an email that does not have any content.", last_response.body
+      assert_match "notifier#foo", last_response.body
+    end
+
     test "mailer preview email part not found" do
       mailer 'notifier', <<-RUBY
         class Notifier < ActionMailer::Base