From 37586ddf279c46c3d0c8c2553d0918aa82ceb020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Sun, 28 Oct 2012 12:55:53 -0700 Subject: Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call Do not render views when mail() isn't called. (NullMail refactoring) Conflicts: actionmailer/CHANGELOG.md --- actionmailer/test/fixtures/base_mailer/without_mail_call.erb | 1 + 1 file changed, 1 insertion(+) create mode 100644 actionmailer/test/fixtures/base_mailer/without_mail_call.erb (limited to 'actionmailer/test/fixtures/base_mailer/without_mail_call.erb') diff --git a/actionmailer/test/fixtures/base_mailer/without_mail_call.erb b/actionmailer/test/fixtures/base_mailer/without_mail_call.erb new file mode 100644 index 0000000000..290379d5fb --- /dev/null +++ b/actionmailer/test/fixtures/base_mailer/without_mail_call.erb @@ -0,0 +1 @@ +<% raise 'the template should not be rendered' %> \ No newline at end of file -- cgit v1.2.3