applies remaining conventions across the project

36 files changed, 102 insertions, 132 deletions

diff --git a/activesupport/bin/generate_tables b/activesupport/bin/generate_tables
index d4e63644d9..06dcff4e87 100755
--- a/activesupport/bin/generate_tables
+++ b/activesupport/bin/generate_tables
@@ -12,7 +12,6 @@ require "tmpdir"
 module ActiveSupport
   module Multibyte
     module Unicode
-
       class UnicodeDatabase
         def load; end
       end
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache_middleware.rb b/activesupport/lib/active_support/cache/strategy/local_cache_middleware.rb
index 10eb6eccbc..af51f66dda 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache_middleware.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache_middleware.rb
@@ -5,7 +5,6 @@ module ActiveSupport
   module Cache
     module Strategy
       module LocalCache
-
         #--
         # This class wraps up local storage for middlewares. Only the middleware method should
         # construct them.
diff --git a/activesupport/lib/active_support/concurrency/latch.rb b/activesupport/lib/active_support/concurrency/latch.rb
index 045beca3dc..53e09b685c 100644
--- a/activesupport/lib/active_support/concurrency/latch.rb
+++ b/activesupport/lib/active_support/concurrency/latch.rb
@@ -3,7 +3,6 @@ require "concurrent/atomic/count_down_latch"
 module ActiveSupport
   module Concurrency
     class Latch
-
       def initialize(count = 1)
         if count == 1
           ActiveSupport::Deprecation.warn("ActiveSupport::Concurrency::Latch is deprecated. Please use Concurrent::Event instead.")
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index a4396be4ad..3cd96ccb9a 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -159,25 +159,25 @@ module ActiveSupport
     private
       def normalize_keys(params)
         case params
-          when Hash
-            Hash[params.map { |k,v| [k.to_s.tr("-", "_"), normalize_keys(v)] } ]
-          when Array
-            params.map { |v| normalize_keys(v) }
+        when Hash
+          Hash[params.map { |k,v| [k.to_s.tr("-", "_"), normalize_keys(v)] } ]
+        when Array
+          params.map { |v| normalize_keys(v) }
           else
-            params
+          params
         end
       end
 
       def deep_to_h(value)
         case value
-          when Hash
-            process_hash(value)
-          when Array
-            process_array(value)
-          when String
-            value
+        when Hash
+          process_hash(value)
+        when Array
+          process_array(value)
+        when String
+          value
           else
-            raise "can't typecast #{value.class.name} - #{value.inspect}"
+          raise "can't typecast #{value.class.name} - #{value.inspect}"
         end
       end
 
@@ -257,6 +257,5 @@ module ActiveSupport
         value.map! { |i| deep_to_h(i) }
         value.length > 1 ? value : value.first
       end
-
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
index 6b8d7e25fb..3e1ccecb6c 100644
--- a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
+++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
@@ -1,7 +1,6 @@
 require "active_support/hash_with_indifferent_access"
 
 class Hash
-
   # Returns an <tt>ActiveSupport::HashWithIndifferentAccess</tt> out of its receiver:
   #
   #   { a: 1 }.with_indifferent_access['a'] # => 1
diff --git a/activesupport/lib/active_support/core_ext/numeric/conversions.rb b/activesupport/lib/active_support/core_ext/numeric/conversions.rb
index ad7b9019c4..5ac312790d 100644
--- a/activesupport/lib/active_support/core_ext/numeric/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/numeric/conversions.rb
@@ -3,7 +3,6 @@ require "active_support/number_helper"
 require "active_support/core_ext/module/deprecation"
 
 module ActiveSupport::NumericWithFormat
-
   # Provides options for converting numbers into formatted strings.
   # Options are provided for phone numbers, currency, percentage,
   # precision, positional notation, file size and pretty printing.
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index c87d0c0b63..2cbfa14772 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -281,5 +281,4 @@ class Time
   end
   alias_method :eql_without_coercion, :eql?
   alias_method :eql?, :eql_with_coercion
-
 end
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 9f1593a23a..622f637675 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -675,11 +675,11 @@ module ActiveSupport #:nodoc:
     # A module, class, symbol, or string may be provided.
     def to_constant_name(desc) #:nodoc:
       case desc
-        when String then desc.sub(/^::/, "")
-        when Symbol then desc.to_s
-        when Module
-          desc.name ||
-            raise(ArgumentError, "Anonymous modules have no name to be referenced by")
+      when String then desc.sub(/^::/, "")
+      when Symbol then desc.to_s
+      when Module
+        desc.name ||
+          raise(ArgumentError, "Anonymous modules have no name to be referenced by")
         else raise TypeError, "Not a valid constant descriptor: #{desc.inspect}"
       end
     end
diff --git a/activesupport/lib/active_support/deprecation/reporting.rb b/activesupport/lib/active_support/deprecation/reporting.rb
index 4e608a4664..b8d200ba94 100644
--- a/activesupport/lib/active_support/deprecation/reporting.rb
+++ b/activesupport/lib/active_support/deprecation/reporting.rb
@@ -57,8 +57,8 @@ module ActiveSupport
         def deprecated_method_warning(method_name, message = nil)
           warning = "#{method_name} is deprecated and will be removed from #{gem_name} #{deprecation_horizon}"
           case message
-            when Symbol then "#{warning} (use #{message} instead)"
-            when String then "#{warning} (#{message})"
+          when Symbol then "#{warning} (use #{message} instead)"
+          when String then "#{warning} (#{message})"
             else warning
           end
         end
diff --git a/activesupport/lib/active_support/duration/iso8601_parser.rb b/activesupport/lib/active_support/duration/iso8601_parser.rb
index 99a77c0bd3..df56f13b8d 100644
--- a/activesupport/lib/active_support/duration/iso8601_parser.rb
+++ b/activesupport/lib/active_support/duration/iso8601_parser.rb
@@ -40,36 +40,36 @@ module ActiveSupport
       def parse!
         while !finished?
           case mode
-            when :start
-              if scan(SIGN_MARKER)
-                self.sign = (scanner.matched == "-") ? -1 : 1
-                self.mode = :sign
-              else
-                raise_parsing_error
-              end
-
-            when :sign
-              if scan(DATE_MARKER)
-                self.mode = :date
-              else
-                raise_parsing_error
-              end
-
-            when :date
-              if scan(TIME_MARKER)
-                self.mode = :time
-              elsif scan(DATE_COMPONENT)
-                parts[DATE_TO_PART[scanner[2]]] = number * sign
-              else
-                raise_parsing_error
-              end
-
-            when :time
-              if scan(TIME_COMPONENT)
-                parts[TIME_TO_PART[scanner[2]]] = number * sign
-              else
-                raise_parsing_error
-              end
+          when :start
+            if scan(SIGN_MARKER)
+              self.sign = (scanner.matched == "-") ? -1 : 1
+              self.mode = :sign
+            else
+              raise_parsing_error
+            end
+
+          when :sign
+            if scan(DATE_MARKER)
+              self.mode = :date
+            else
+              raise_parsing_error
+            end
+
+          when :date
+            if scan(TIME_MARKER)
+              self.mode = :time
+            elsif scan(DATE_COMPONENT)
+              parts[DATE_TO_PART[scanner[2]]] = number * sign
+            else
+              raise_parsing_error
+            end
+
+          when :time
+            if scan(TIME_COMPONENT)
+              parts[TIME_TO_PART[scanner[2]]] = number * sign
+            else
+              raise_parsing_error
+            end
 
           end
         end
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb
index 6cc7c90c12..4749147ef4 100644
--- a/activesupport/lib/active_support/i18n_railtie.rb
+++ b/activesupport/lib/active_support/i18n_railtie.rb
@@ -84,12 +84,12 @@ module I18n
       include_fallbacks_module
 
       args = case fallbacks
-      when ActiveSupport::OrderedOptions
-        [*(fallbacks[:defaults] || []) << fallbacks[:map]].compact
-      when Hash, Array
-        Array.wrap(fallbacks)
+             when ActiveSupport::OrderedOptions
+               [*(fallbacks[:defaults] || []) << fallbacks[:map]].compact
+             when Hash, Array
+               Array.wrap(fallbacks)
       else # TrueClass
-        []
+               []
       end
 
       I18n.fallbacks = I18n::Locale::Fallbacks.new(*args)
diff --git a/activesupport/lib/active_support/inflector/inflections.rb b/activesupport/lib/active_support/inflector/inflections.rb
index 3e948e10a0..b1be84a096 100644
--- a/activesupport/lib/active_support/inflector/inflections.rb
+++ b/activesupport/lib/active_support/inflector/inflections.rb
@@ -215,10 +215,10 @@ module ActiveSupport
       #   clear :plurals
       def clear(scope = :all)
         case scope
-          when :all
-            @plurals, @singulars, @uncountables, @humans = [], [], Uncountables.new, []
+        when :all
+          @plurals, @singulars, @uncountables, @humans = [], [], Uncountables.new, []
           else
-            instance_variable_set "@#{scope}", []
+          instance_variable_set "@#{scope}", []
         end
       end
     end
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index fcfe063290..79cede2a0c 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -333,9 +333,9 @@ module ActiveSupport
         "th"
       else
         case abs_number % 10
-          when 1; "st"
-          when 2; "nd"
-          when 3; "rd"
+        when 1; "st"
+        when 2; "nd"
+        when 3; "rd"
           else    "th"
         end
       end
diff --git a/activesupport/lib/active_support/inflector/transliterate.rb b/activesupport/lib/active_support/inflector/transliterate.rb
index 3f4eeff2dd..85fa83c803 100644
--- a/activesupport/lib/active_support/inflector/transliterate.rb
+++ b/activesupport/lib/active_support/inflector/transliterate.rb
@@ -3,7 +3,6 @@ require "active_support/i18n"
 
 module ActiveSupport
   module Inflector
-
     # Replaces non-ASCII characters with an ASCII approximation, or if none
     # exists, a replacement character which defaults to "?".
     #
diff --git a/activesupport/lib/active_support/multibyte/unicode.rb b/activesupport/lib/active_support/multibyte/unicode.rb
index dfd87c9397..c194804c08 100644
--- a/activesupport/lib/active_support/multibyte/unicode.rb
+++ b/activesupport/lib/active_support/multibyte/unicode.rb
@@ -1,7 +1,6 @@
 module ActiveSupport
   module Multibyte
     module Unicode
-
       extend self
 
       # A list of all available normalization forms.
@@ -287,16 +286,16 @@ module ActiveSupport
         # See http://www.unicode.org/reports/tr15, Table 1
         codepoints = string.codepoints.to_a
         case form
-          when :d
-            reorder_characters(decompose(:canonical, codepoints))
-          when :c
-            compose(reorder_characters(decompose(:canonical, codepoints)))
-          when :kd
-            reorder_characters(decompose(:compatibility, codepoints))
-          when :kc
-            compose(reorder_characters(decompose(:compatibility, codepoints)))
+        when :d
+          reorder_characters(decompose(:canonical, codepoints))
+        when :c
+          compose(reorder_characters(decompose(:canonical, codepoints)))
+        when :kd
+          reorder_characters(decompose(:compatibility, codepoints))
+        when :kc
+          compose(reorder_characters(decompose(:compatibility, codepoints)))
           else
-            raise ArgumentError, "#{form} is not a valid normalization variant", caller
+          raise ArgumentError, "#{form} is not a valid normalization variant", caller
         end.pack("U*".freeze)
       end
 
diff --git a/activesupport/lib/active_support/number_helper/number_to_delimited_converter.rb b/activesupport/lib/active_support/number_helper/number_to_delimited_converter.rb
index 1d0df2e163..e3b35531b1 100644
--- a/activesupport/lib/active_support/number_helper/number_to_delimited_converter.rb
+++ b/activesupport/lib/active_support/number_helper/number_to_delimited_converter.rb
@@ -22,7 +22,6 @@ module ActiveSupport
         def delimiter_pattern
           options.fetch(:delimiter_pattern, DEFAULT_DELIMITER_REGEX)
         end
-
     end
   end
 end
diff --git a/activesupport/lib/active_support/number_helper/number_to_phone_converter.rb b/activesupport/lib/active_support/number_helper/number_to_phone_converter.rb
index 07b1f18695..c2612f9a9b 100644
--- a/activesupport/lib/active_support/number_helper/number_to_phone_converter.rb
+++ b/activesupport/lib/active_support/number_helper/number_to_phone_converter.rb
@@ -51,7 +51,6 @@ module ActiveSupport
         def regexp_pattern(default_pattern)
           opts.fetch :pattern, default_pattern
         end
-
     end
   end
 end
diff --git a/activesupport/lib/active_support/subscriber.rb b/activesupport/lib/active_support/subscriber.rb
index 33c2f1a025..0f09f1eb63 100644
--- a/activesupport/lib/active_support/subscriber.rb
+++ b/activesupport/lib/active_support/subscriber.rb
@@ -23,7 +23,6 @@ module ActiveSupport
   # the +sql+ method.
   class Subscriber
     class << self
-
       # Attach the subscriber to a namespace.
       def attach_to(namespace, subscriber=new, notifier=ActiveSupport::Notifications)
         @namespace  = namespace
diff --git a/activesupport/lib/active_support/testing/constant_lookup.rb b/activesupport/lib/active_support/testing/constant_lookup.rb
index 07d477c0db..647395d2b3 100644
--- a/activesupport/lib/active_support/testing/constant_lookup.rb
+++ b/activesupport/lib/active_support/testing/constant_lookup.rb
@@ -44,7 +44,6 @@ module ActiveSupport
           end
         end
       end
-
     end
   end
 end
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 6f49ff8b53..439d2b86aa 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -36,7 +36,6 @@ module ActiveSupport
   #   t.is_a?(Time)                         # => true
   #   t.is_a?(ActiveSupport::TimeWithZone)  # => true
   class TimeWithZone
-
     # Report class name as 'Time' to thwart type checking.
     def self.name
       "Time"
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 26906d2911..b5a74ddc52 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -226,17 +226,17 @@ module ActiveSupport
       # Returns +nil+ if no such time zone is known to the system.
       def [](arg)
         case arg
-          when String
-            begin
-              @lazy_zones_map[arg] ||= create(arg)
-            rescue TZInfo::InvalidTimezoneIdentifier
-              nil
-            end
-          when Numeric, ActiveSupport::Duration
-            arg *= 3600 if arg.abs <= 13
-            all.find { |z| z.utc_offset == arg.to_i }
+        when String
+          begin
+            @lazy_zones_map[arg] ||= create(arg)
+          rescue TZInfo::InvalidTimezoneIdentifier
+            nil
+          end
+        when Numeric, ActiveSupport::Duration
+          arg *= 3600 if arg.abs <= 13
+          all.find { |z| z.utc_offset == arg.to_i }
           else
-            raise ArgumentError, "invalid argument to TimeZone[]: #{arg.inspect}"
+          raise ArgumentError, "invalid argument to TimeZone[]: #{arg.inspect}"
         end
       end
 
diff --git a/activesupport/lib/active_support/xml_mini/libxml.rb b/activesupport/lib/active_support/xml_mini/libxml.rb
index 1be962d2b1..8a4aa03963 100644
--- a/activesupport/lib/active_support/xml_mini/libxml.rb
+++ b/activesupport/lib/active_support/xml_mini/libxml.rb
@@ -22,7 +22,6 @@ module ActiveSupport
         LibXML::XML::Parser.io(data).parse.to_hash
       end
     end
-
   end
 end
 
@@ -46,9 +45,9 @@ module LibXML #:nodoc:
 
         # Insert node hash into parent hash correctly.
         case hash[name]
-          when Array then hash[name] << node_hash
-          when Hash  then hash[name] = [hash[name], node_hash]
-          when nil   then hash[name] = node_hash
+        when Array then hash[name] << node_hash
+        when Hash  then hash[name] = [hash[name], node_hash]
+        when nil   then hash[name] = node_hash
         end
 
         # Handle child elements
diff --git a/activesupport/lib/active_support/xml_mini/libxmlsax.rb b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
index e907d610a1..4edb0bd2b1 100644
--- a/activesupport/lib/active_support/xml_mini/libxmlsax.rb
+++ b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
@@ -9,7 +9,6 @@ module ActiveSupport
     # Class that will build the hash while the XML document
     # is being parsed using SAX events.
     class HashBuilder
-
       include LibXML::XML::SaxParser::Callbacks
 
       CONTENT_KEY   = "__content__".freeze
@@ -36,9 +35,9 @@ module ActiveSupport
         new_hash[HASH_SIZE_KEY] = new_hash.size + 1
 
         case current_hash[name]
-          when Array then current_hash[name] << new_hash
-          when Hash  then current_hash[name] = [current_hash[name], new_hash]
-          when nil   then current_hash[name] = new_hash
+        when Array then current_hash[name] << new_hash
+        when Hash  then current_hash[name] = [current_hash[name], new_hash]
+        when nil   then current_hash[name] = new_hash
         end
 
         @hash_stack.push(new_hash)
diff --git a/activesupport/lib/active_support/xml_mini/nokogiri.rb b/activesupport/lib/active_support/xml_mini/nokogiri.rb
index 7c32b2a07b..b92fa7ea7c 100644
--- a/activesupport/lib/active_support/xml_mini/nokogiri.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogiri.rb
@@ -49,9 +49,9 @@ module ActiveSupport
 
           # Insert node hash into parent hash correctly.
           case hash[name]
-            when Array then hash[name] << node_hash
-            when Hash  then hash[name] = [hash[name], node_hash]
-            when nil   then hash[name] = node_hash
+          when Array then hash[name] << node_hash
+          when Hash  then hash[name] = [hash[name], node_hash]
+          when nil   then hash[name] = node_hash
           end
 
           # Handle child elements
diff --git a/activesupport/lib/active_support/xml_mini/nokogirisax.rb b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
index d4dc90787d..b8b85146c5 100644
--- a/activesupport/lib/active_support/xml_mini/nokogirisax.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
@@ -14,7 +14,6 @@ module ActiveSupport
     # Class that will build the hash while the XML document
     # is being parsed using SAX events.
     class HashBuilder < Nokogiri::XML::SAX::Document
-
       CONTENT_KEY   = "__content__".freeze
       HASH_SIZE_KEY = "__hash_size__".freeze
 
@@ -42,9 +41,9 @@ module ActiveSupport
         new_hash[HASH_SIZE_KEY] = new_hash.size + 1
 
         case current_hash[name]
-          when Array then current_hash[name] << new_hash
-          when Hash  then current_hash[name] = [current_hash[name], new_hash]
-          when nil   then current_hash[name] = new_hash
+        when Array then current_hash[name] << new_hash
+        when Hash  then current_hash[name] = [current_hash[name], new_hash]
+        when nil   then current_hash[name] = new_hash
         end
 
         @hash_stack.push(new_hash)
diff --git a/activesupport/test/broadcast_logger_test.rb b/activesupport/test/broadcast_logger_test.rb
index 465dc8e8e1..4b74f1313e 100644
--- a/activesupport/test/broadcast_logger_test.rb
+++ b/activesupport/test/broadcast_logger_test.rb
@@ -138,7 +138,7 @@ module ActiveSupport
         add(::Logger::UNKNOWN, message, &block)
       end
 
-      def << x
+      def <<(x)
         @chevrons << x
       end
 
diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb
index ac2c539f66..040e9c1cca 100644
--- a/activesupport/test/callbacks_test.rb
+++ b/activesupport/test/callbacks_test.rb
@@ -361,7 +361,6 @@ module CallbacksTest
   end
 
   class ExtendCallbacks
-
     include ActiveSupport::Callbacks
 
     define_callbacks :save
@@ -453,7 +452,6 @@ module CallbacksTest
   end
 
   class CallbacksTest < ActiveSupport::TestCase
-
     def test_save_person
       person = Person.new
       assert_equal [], person.history
diff --git a/activesupport/test/clean_backtrace_test.rb b/activesupport/test/clean_backtrace_test.rb
index 0069d0959f..5ed518cdb0 100644
--- a/activesupport/test/clean_backtrace_test.rb
+++ b/activesupport/test/clean_backtrace_test.rb
@@ -20,7 +20,6 @@ class BacktraceCleanerFilterTest < ActiveSupport::TestCase
   test "backtrace should contain unaltered lines if they dont match a filter" do
     assert_equal "/my/other_prefix/my/class.rb", @bc.clean([ "/my/other_prefix/my/class.rb" ]).first
   end
-
 end
 
 class BacktraceCleanerSilencerTest < ActiveSupport::TestCase
diff --git a/activesupport/test/core_ext/module/remove_method_test.rb b/activesupport/test/core_ext/module/remove_method_test.rb
index c731d08026..6579b2754f 100644
--- a/activesupport/test/core_ext/module/remove_method_test.rb
+++ b/activesupport/test/core_ext/module/remove_method_test.rb
@@ -26,7 +26,6 @@ module RemoveMethodTests
 end
 
 class RemoveMethodTest < ActiveSupport::TestCase
-
   def test_remove_method_from_an_object
     RemoveMethodTests::A.class_eval{
       self.remove_possible_method(:do_something)
@@ -55,5 +54,4 @@ class RemoveMethodTest < ActiveSupport::TestCase
     assert RemoveMethodTests::A.protected_method_defined? :do_something_protected
     assert RemoveMethodTests::A.private_method_defined? :do_something_private
   end
-
 end
diff --git a/activesupport/test/core_ext/object/deep_dup_test.rb b/activesupport/test/core_ext/object/deep_dup_test.rb
index 2c0526eebf..e335ec1b40 100644
--- a/activesupport/test/core_ext/object/deep_dup_test.rb
+++ b/activesupport/test/core_ext/object/deep_dup_test.rb
@@ -2,7 +2,6 @@ require "abstract_unit"
 require "active_support/core_ext/object"
 
 class DeepDupTest < ActiveSupport::TestCase
-
   def test_array_deep_dup
     array = [1, [2, 3]]
     dup = array.deep_dup
@@ -55,5 +54,4 @@ class DeepDupTest < ActiveSupport::TestCase
     dup = hash.deep_dup
     assert_equal 1, dup.keys.length
   end
-
 end
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index b9447d74b4..36c3a44c31 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -370,5 +370,4 @@ class DeprecationTest < ActiveSupport::TestCase
       end
       deprecator
     end
-
 end
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
index 97cc508268..de314921ec 100644
--- a/activesupport/test/json/decoding_test.rb
+++ b/activesupport/test/json/decoding_test.rb
@@ -46,10 +46,10 @@ class TestJSONDecoding < ActiveSupport::TestCase
     %({"a": null})  => {"a" => nil},
     %({"a": true})  => {"a" => true},
     %({"a": false}) => {"a" => false},
-    %q({"bad":"\\\\","trailing":""}) => {"bad" => "\\", "trailing" => ""},
+    '{"bad":"\\\\","trailing":""}' => {"bad" => "\\", "trailing" => ""},
     %q({"a": "http:\/\/test.host\/posts\/1"}) => {"a" => "http://test.host/posts/1"},
     %q({"a": "\u003cunicode\u0020escape\u003e"}) => {"a" => "<unicode escape>"},
-    %q({"a": "\\\\u0020skip double backslashes"}) => {"a" => "\\u0020skip double backslashes"},
+    '{"a": "\\\\u0020skip double backslashes"}' => {"a" => "\\u0020skip double backslashes"},
     %q({"a": "\u003cbr /\u003e"}) => {"a" => "<br />"},
     %q({"b":["\u003ci\u003e","\u003cb\u003e","\u003cu\u003e"]}) => {"b" => ["<i>","<b>","<u>"]},
     # test combination of dates and escaped or unicode encoded data in arrays
@@ -63,15 +63,15 @@ class TestJSONDecoding < ActiveSupport::TestCase
     %q({"a":"\u000a"}) => {"a"=>"\n"},
     %q({"a":"Line1\u000aLine2"}) => {"a"=>"Line1\nLine2"},
     # prevent json unmarshalling
-    %q({"json_class":"TestJSONDecoding::Foo"}) => {"json_class"=>"TestJSONDecoding::Foo"},
+    '{"json_class":"TestJSONDecoding::Foo"}' => {"json_class"=>"TestJSONDecoding::Foo"},
     # json "fragments" - these are invalid JSON, but ActionPack relies on this
-    %q("a string") => "a string",
-    %q(1.1) => 1.1,
-    %q(1) => 1,
-    %q(-1) => -1,
-    %q(true) => true,
-    %q(false) => false,
-    %q(null) => nil
+    '"a string"' => "a string",
+    "1.1" => 1.1,
+    "1" => 1,
+    "-1" => -1,
+    "true" => true,
+    "false" => false,
+    "null" => nil
   }
 
   TESTS.each_with_index do |(json, expected), index|
diff --git a/activesupport/test/message_verifier_test.rb b/activesupport/test/message_verifier_test.rb
index a29727608d..d56a46b250 100644
--- a/activesupport/test/message_verifier_test.rb
+++ b/activesupport/test/message_verifier_test.rb
@@ -4,7 +4,6 @@ require "active_support/time"
 require "active_support/json"
 
 class MessageVerifierTest < ActiveSupport::TestCase
-
   class JSONSerializer
     def dump(value)
       ActiveSupport::JSON.encode(value)
diff --git a/activesupport/test/multibyte_unicode_database_test.rb b/activesupport/test/multibyte_unicode_database_test.rb
index 267e3e1427..924db303b6 100644
--- a/activesupport/test/multibyte_unicode_database_test.rb
+++ b/activesupport/test/multibyte_unicode_database_test.rb
@@ -2,7 +2,6 @@ require "abstract_unit"
 
 
 class MultibyteUnicodeDatabaseTest < ActiveSupport::TestCase
-
   include ActiveSupport::Multibyte::Unicode
 
   def setup
diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb
index c25a3dedf7..cd6f9ad234 100644
--- a/activesupport/test/number_helper_test.rb
+++ b/activesupport/test/number_helper_test.rb
@@ -5,7 +5,6 @@ require "active_support/core_ext/string/output_safety"
 module ActiveSupport
   module NumberHelper
     class NumberHelperTest < ActiveSupport::TestCase
-
       class TestClassWithInstanceNumberHelpers
         include ActiveSupport::NumberHelper
       end
@@ -416,7 +415,6 @@ module ActiveSupport
           assert_equal "x", number_helper.number_to_human("x")
         end
       end
-
     end
   end
 end
diff --git a/activesupport/test/xml_mini/rexml_engine_test.rb b/activesupport/test/xml_mini/rexml_engine_test.rb
index a3bae7a89c..e616b73162 100644
--- a/activesupport/test/xml_mini/rexml_engine_test.rb
+++ b/activesupport/test/xml_mini/rexml_engine_test.rb
@@ -41,5 +41,4 @@ class REXMLEngineTest < ActiveSupport::TestCase
     xml_string = "<root></root>".freeze
     assert_equal({"root" => {}}, ActiveSupport::XmlMini.parse(xml_string))
   end
-
 end