1 files changed, 28 insertions, 21 deletions

diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb
index f75bd48a9e..c1bb48cc96 100644
--- a/actionmailer/test/mailers/base_mailer.rb
+++ b/actionmailer/test/mailers/base_mailer.rb
@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 class BaseMailer < ActionMailer::Base
   self.mailer_name = "base_mailer"
 
-  default to: 'system@test.lindsaar.net',
-          from: 'jose@test.plataformatec.com',
-          reply_to: 'mikel@test.lindsaar.net'
+  default to: "system@test.lindsaar.net",
+          from: "jose@test.plataformatec.com",
+          reply_to: "mikel@test.lindsaar.net"
 
   def welcome(hash = {})
-    headers['X-SPAM'] = "Not SPAM"
-    mail({subject: "The first email on new API!"}.merge!(hash))
+    headers["X-SPAM"] = "Not SPAM"
+    mail({ subject: "The first email on new API!" }.merge!(hash))
   end
 
   def welcome_with_headers(hash = {})
@@ -19,6 +21,11 @@ class BaseMailer < ActionMailer::Base
     mail(template_name: "welcome", template_path: path)
   end
 
+  def welcome_without_deliveries
+    mail(template_name: "welcome")
+    mail.perform_deliveries = false
+  end
+
   def html_only(hash = {})
     mail(hash)
   end
@@ -28,30 +35,30 @@ class BaseMailer < ActionMailer::Base
   end
 
   def inline_attachment
-    attachments.inline['logo.png'] = "\312\213\254\232"
+    attachments.inline["logo.png"] = "\312\213\254\232"
     mail
   end
 
   def attachment_with_content(hash = {})
-    attachments['invoice.pdf'] = 'This is test File content'
+    attachments["invoice.pdf"] = "This is test File content"
     mail(hash)
   end
 
   def attachment_with_hash
-    attachments['invoice.jpg'] = { data: ::Base64.encode64("\312\213\254\232)b"),
+    attachments["invoice.jpg"] = { data: ::Base64.encode64("\312\213\254\232)b"),
                                    mime_type: "image/x-jpg",
                                    transfer_encoding: "base64" }
     mail
   end
 
   def attachment_with_hash_default_encoding
-    attachments['invoice.jpg'] = { data: "\312\213\254\232)b",
+    attachments["invoice.jpg"] = { data: "\312\213\254\232)b",
                                    mime_type: "image/x-jpg" }
     mail
   end
 
   def implicit_multipart(hash = {})
-    attachments['invoice.pdf'] = 'This is test File content' if hash.delete(:attachments)
+    attachments["invoice.pdf"] = "This is test File content" if hash.delete(:attachments)
     mail(hash)
   end
 
@@ -60,10 +67,10 @@ class BaseMailer < ActionMailer::Base
   end
 
   def explicit_multipart(hash = {})
-    attachments['invoice.pdf'] = 'This is test File content' if hash.delete(:attachments)
+    attachments["invoice.pdf"] = "This is test File content" if hash.delete(:attachments)
     mail(hash) do |format|
-      format.text { render text: "TEXT Explicit Multipart" }
-      format.html { render text: "HTML Explicit Multipart" }
+      format.text { render plain: "TEXT Explicit Multipart" }
+      format.html { render plain: "HTML Explicit Multipart" }
     end
   end
 
@@ -76,7 +83,7 @@ class BaseMailer < ActionMailer::Base
 
   def explicit_multipart_with_any(hash = {})
     mail(hash) do |format|
-      format.any(:text, :html){ render text: "Format with any!" }
+      format.any(:text, :html) { render plain: "Format with any!" }
     end
   end
 
@@ -88,8 +95,8 @@ class BaseMailer < ActionMailer::Base
 
   def explicit_multipart_with_options(include_html = false)
     mail do |format|
-      format.text(content_transfer_encoding: "base64"){ render "welcome" }
-      format.html{ render "welcome" } if include_html
+      format.text(content_transfer_encoding: "base64") { render "welcome" }
+      format.html { render "welcome" } if include_html
     end
   end
 
@@ -100,25 +107,25 @@ class BaseMailer < ActionMailer::Base
     end
   end
 
-  def implicit_different_template(template_name='')
+  def implicit_different_template(template_name = "")
     mail(template_name: template_name)
   end
 
-  def implicit_different_template_with_block(template_name='')
+  def implicit_different_template_with_block(template_name = "")
     mail(template_name: template_name) do |format|
       format.text
       format.html
     end
   end
 
-  def explicit_different_template(template_name='')
+  def explicit_different_template(template_name = "")
     mail do |format|
       format.text { render template: "#{mailer_name}/#{template_name}" }
       format.html { render template: "#{mailer_name}/#{template_name}" }
     end
   end
 
-  def different_layout(layout_name='')
+  def different_layout(layout_name = "")
     mail do |format|
       format.text { render layout: layout_name }
       format.html { render layout: layout_name }
@@ -138,6 +145,6 @@ class BaseMailer < ActionMailer::Base
   end
 
   def with_subject_interpolations
-    mail(subject: default_i18n_subject(rapper_or_impersonator: 'Slim Shady'), body: '')
+    mail(subject: default_i18n_subject(rapper_or_impersonator: "Slim Shady"), body: "")
   end
 end