Merge branch 'master' into clear_all_environments_log_by_default

7 files changed, 12 insertions, 12 deletions

diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 3bca69890d..91049e33f9 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -829,7 +829,7 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal "special indeed!", mail["X-Special-Header"].to_s
   end
 
-  protected
+  private
 
     # Execute the block setting the given values and restoring old values after
     # the block is executed.
diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb
index 898d32c1e2..f64a69019f 100644
--- a/actionmailer/test/delivery_methods_test.rb
+++ b/actionmailer/test/delivery_methods_test.rb
@@ -87,7 +87,7 @@ class MailDeliveryTest < ActiveSupport::TestCase
       from: "jose@test.plataformatec.com"
     }
 
-    def welcome(hash={})
+    def welcome(hash = {})
       mail(DEFAULT_HEADERS.merge(hash))
     end
   end
diff --git a/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb
index 039685ffe5..a87a9c9861 100644
--- a/actionmailer/test/i18n_with_controller_test.rb
+++ b/actionmailer/test/i18n_with_controller_test.rb
@@ -66,7 +66,7 @@ class ActionMailerI18nWithControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
-  protected
+  private
 
     def with_translation(locale, data)
       I18n.backend.store_translations(locale, data)
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index 972629e477..a2e04b5f48 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -65,7 +65,7 @@ The second
     end
   end
 
-  protected
+  private
 
     def mail_with_defaults(&block)
       mail(to: "test@localhost", from: "tester@example.com",
diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb
index 0d45376070..2a8884959c 100644
--- a/actionmailer/test/mailers/base_mailer.rb
+++ b/actionmailer/test/mailers/base_mailer.rb
@@ -100,18 +100,18 @@ 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 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 }
diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb
index 0eb81a8496..a79d77e1e5 100644
--- a/actionmailer/test/message_delivery_test.rb
+++ b/actionmailer/test/message_delivery_test.rb
@@ -76,7 +76,7 @@ class MessageDeliveryTest < ActiveSupport::TestCase
 
   test "should enqueue a delivery with a delay" do
     travel_to Time.new(2004, 11, 24, 01, 04, 44) do
-      assert_performed_with(job: ActionMailer::DeliveryJob, at: Time.current.to_f+600.seconds, args: ["DelayedMailer", "test_message", "deliver_now", 1, 2, 3]) do
+      assert_performed_with(job: ActionMailer::DeliveryJob, at: Time.current.to_f + 600.seconds, args: ["DelayedMailer", "test_message", "deliver_now", 1, 2, 3]) do
         @mail.deliver_later wait: 600.seconds
       end
     end
diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb
index 27f6e8a491..6dbfb3a1ff 100644
--- a/actionmailer/test/url_test.rb
+++ b/actionmailer/test/url_test.rb
@@ -50,11 +50,11 @@ class ActionMailerUrlTest < ActionMailer::TestCase
     end
   end
 
-  def encode( text, charset="UTF-8" )
-    quoted_printable( text, charset )
+  def encode(text, charset = "UTF-8")
+    quoted_printable(text, charset)
   end
 
-  def new_mail( charset="UTF-8" )
+  def new_mail(charset = "UTF-8")
     mail = Mail.new
     mail.mime_version = "1.0"
     if charset
@@ -81,7 +81,7 @@ class ActionMailerUrlTest < ActionMailer::TestCase
     AppRoutes.draw do
       ActiveSupport::Deprecation.silence do
         get ":controller(/:action(/:id))"
-        get "/welcome"  => "foo#bar", as: "welcome"
+        get "/welcome" => "foo#bar", as: "welcome"
         get "/dummy_model" => "foo#baz", as: "dummy_model"
       end
     end