applies remaining conventions across the project

4 files changed, 5 insertions, 7 deletions

diff --git a/actionmailer/lib/action_mailer/preview.rb b/actionmailer/lib/action_mailer/preview.rb
index de9f945c36..7612cddf22 100644
--- a/actionmailer/lib/action_mailer/preview.rb
+++ b/actionmailer/lib/action_mailer/preview.rb
@@ -35,10 +35,10 @@ module ActionMailer
       # string is passed in it will be <tt>constantize</tt>d.
       def register_preview_interceptor(interceptor)
         preview_interceptor = case interceptor
-          when String, Symbol
-            interceptor.to_s.camelize.constantize
+                              when String, Symbol
+                                interceptor.to_s.camelize.constantize
           else
-            interceptor
+                                interceptor
           end
 
         unless preview_interceptors.include?(preview_interceptor)
diff --git a/actionmailer/test/asset_host_test.rb b/actionmailer/test/asset_host_test.rb
index c02ff53afa..812df01a34 100644
--- a/actionmailer/test/asset_host_test.rb
+++ b/actionmailer/test/asset_host_test.rb
@@ -22,7 +22,7 @@ class AssetHostTest < ActionMailer::TestCase
 
   def test_asset_host_as_string
     mail = AssetHostMailer.email_with_asset
-    assert_dom_equal %Q{<img alt="Somelogo" src="http://www.example.com/images/somelogo.png" />}, mail.body.to_s.strip
+    assert_dom_equal '<img alt="Somelogo" src="http://www.example.com/images/somelogo.png" />', mail.body.to_s.strip
   end
 
   def test_asset_host_as_one_argument_proc
@@ -32,6 +32,6 @@ class AssetHostTest < ActionMailer::TestCase
       end
     }
     mail = AssetHostMailer.email_with_asset
-    assert_dom_equal %Q{<img alt="Somelogo" src="http://images.example.com/images/somelogo.png" />}, mail.body.to_s.strip
+    assert_dom_equal '<img alt="Somelogo" src="http://images.example.com/images/somelogo.png" />', mail.body.to_s.strip
   end
 end
diff --git a/actionmailer/test/caching_test.rb b/actionmailer/test/caching_test.rb
index 4bf8cdb0a4..17267667aa 100644
--- a/actionmailer/test/caching_test.rb
+++ b/actionmailer/test/caching_test.rb
@@ -195,7 +195,6 @@ class FunctionalFragmentCachingTest < BaseCachingTest
 end
 
 class CacheHelperOutputBufferTest < BaseCachingTest
-
   class MockController
     def read_fragment(name, options)
       return false
diff --git a/actionmailer/test/mailers/proc_mailer.rb b/actionmailer/test/mailers/proc_mailer.rb
index 40610812fb..2487db9eb9 100644
--- a/actionmailer/test/mailers/proc_mailer.rb
+++ b/actionmailer/test/mailers/proc_mailer.rb
@@ -13,5 +13,4 @@ class ProcMailer < ActionMailer::Base
     def give_a_greeting
       "Thanks for signing up this afternoon"
     end
-
 end