Add three new rubocop rules

Style/SpaceBeforeBlockBraces
Style/SpaceInsideBlockBraces
Style/SpaceInsideHashLiteralBraces

Fix all violations in the repository.

41 files changed, 262 insertions, 262 deletions

diff --git a/activesupport/test/benchmarkable_test.rb b/activesupport/test/benchmarkable_test.rb
index 6b9eb5aa66..210b9cb9fd 100644
--- a/activesupport/test/benchmarkable_test.rb
+++ b/activesupport/test/benchmarkable_test.rb
@@ -57,13 +57,13 @@ class BenchmarkableTest < ActiveSupport::TestCase
 
   def test_within_level
     logger.level = ActiveSupport::Logger::DEBUG
-    benchmark("included_debug_run", level: :debug) { }
+    benchmark("included_debug_run", level: :debug) {}
     assert_last_logged "included_debug_run"
   end
 
   def test_outside_level
     logger.level = ActiveSupport::Logger::ERROR
-    benchmark("skipped_debug_run", level: :debug) { }
+    benchmark("skipped_debug_run", level: :debug) {}
     assert_no_match(/skipped_debug_run/, buffer.last)
   ensure
     logger.level = ActiveSupport::Logger::DEBUG
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 072a2530ba..4e47465726 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -19,7 +19,7 @@ module ActiveSupport
             })
             _, _, body = middleware.call({})
             assert LocalCacheRegistry.cache_for(key), "should still have a cache"
-            body.each { }
+            body.each {}
             assert LocalCacheRegistry.cache_for(key), "should still have a cache"
             body.close
             assert_nil LocalCacheRegistry.cache_for(key)
@@ -135,7 +135,7 @@ class CacheKeyTest < ActiveSupport::TestCase
       kv.each { |key, value| old_values[key], ENV[key] = ENV[key], value }
       yield
     ensure
-      old_values.each { |key, value| ENV[key] = value}
+      old_values.each { |key, value| ENV[key] = value }
     end
 end
 
@@ -212,7 +212,7 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
 
   def test_proc_namespace
     test_val = "tester"
-    proc = lambda{test_val}
+    proc = lambda { test_val }
     cache = ActiveSupport::Cache.lookup_store(:memory_store, namespace: proc)
     cache.write("foo", "bar")
     assert_equal "bar", cache.read("foo")
@@ -306,7 +306,7 @@ module CacheStoreBehavior
 
   def test_should_read_and_write_hash
     assert @cache.write("foo", a: "b")
-    assert_equal({a: "b"}, @cache.read("foo"))
+    assert_equal({ a: "b" }, @cache.read("foo"))
   end
 
   def test_should_read_and_write_integer
@@ -328,7 +328,7 @@ module CacheStoreBehavior
     @cache.write("foo", "bar")
     @cache.write("fu", "baz")
     @cache.write("fud", "biz")
-    assert_equal({"foo" => "bar", "fu" => "baz"}, @cache.read_multi("foo", "fu"))
+    assert_equal({ "foo" => "bar", "fu" => "baz" }, @cache.read_multi("foo", "fu"))
   end
 
   def test_read_multi_with_expires
@@ -337,7 +337,7 @@ module CacheStoreBehavior
     @cache.write("fu", "baz")
     @cache.write("fud", "biz")
     Time.stub(:now, time + 11) do
-      assert_equal({"fu" => "baz"}, @cache.read_multi("foo", "fu"))
+      assert_equal({ "fu" => "baz" }, @cache.read_multi("foo", "fu"))
     end
   end
 
@@ -402,7 +402,7 @@ module CacheStoreBehavior
   end
 
   def test_hash_as_cache_key
-    @cache.write({foo: 1, fu: 2}, "bar")
+    @cache.write({ foo: 1, fu: 2 }, "bar")
     assert_equal "bar", @cache.read("foo=1/fu=2")
   end
 
@@ -520,12 +520,12 @@ module CacheStoreBehavior
 
   def test_really_long_keys
     key = ""
-    900.times{key << "x"}
+    900.times { key << "x" }
     assert @cache.write(key, "bar")
     assert_equal "bar", @cache.read(key)
     assert_equal "bar", @cache.fetch(key)
     assert_nil @cache.read("#{key}x")
-    assert_equal({key => "bar"}, @cache.read_multi(key))
+    assert_equal({ key => "bar" }, @cache.read_multi(key))
     assert @cache.delete(key)
   end
 
@@ -867,7 +867,7 @@ class FileStoreTest < ActiveSupport::TestCase
   def test_key_transformation_max_filename_size
     key = "#{'A' * ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}B"
     path = @cache.send(:normalize_key, key, {})
-    assert path.split("/").all? { |dir_name| dir_name.size <= ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}
+    assert path.split("/").all? { |dir_name| dir_name.size <= ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE }
     assert_equal "B", File.basename(path)
   end
 
@@ -888,7 +888,7 @@ class FileStoreTest < ActiveSupport::TestCase
     end
     assert File.exist?(cache_dir), "Parent of top level cache dir was deleted!"
     assert File.exist?(sub_cache_dir), "Top level cache dir was deleted!"
-    assert Dir.entries(sub_cache_dir).reject {|f| ActiveSupport::Cache::FileStore::EXCLUDED_DIRS.include?(f)}.empty?
+    assert Dir.entries(sub_cache_dir).reject { |f| ActiveSupport::Cache::FileStore::EXCLUDED_DIRS.include?(f) }.empty?
   end
 
   def test_log_exception_when_cache_read_fails
diff --git a/activesupport/test/callback_inheritance_test.rb b/activesupport/test/callback_inheritance_test.rb
index d1c217177d..9e2f7527e0 100644
--- a/activesupport/test/callback_inheritance_test.rb
+++ b/activesupport/test/callback_inheritance_test.rb
@@ -9,8 +9,8 @@ class GrandParent
   end
 
   define_callbacks :dispatch
-  set_callback :dispatch, :before, :before1, :before2, if: proc {|c| c.action_name == "index" || c.action_name == "update" }
-  set_callback :dispatch, :after, :after1, :after2, if: proc {|c| c.action_name == "update" || c.action_name == "delete" }
+  set_callback :dispatch, :before, :before1, :before2, if: proc { |c| c.action_name == "index" || c.action_name == "update" }
+  set_callback :dispatch, :after, :after1, :after2, if: proc { |c| c.action_name == "update" || c.action_name == "delete" }
 
   def before1
     @log << "before1"
@@ -37,12 +37,12 @@ class GrandParent
 end
 
 class Parent < GrandParent
-  skip_callback :dispatch, :before, :before2, unless: proc {|c| c.action_name == "update" }
-  skip_callback :dispatch, :after, :after2, unless: proc {|c| c.action_name == "delete" }
+  skip_callback :dispatch, :before, :before2, unless: proc { |c| c.action_name == "update" }
+  skip_callback :dispatch, :after, :after2, unless: proc { |c| c.action_name == "delete" }
 end
 
 class Child < GrandParent
-  skip_callback :dispatch, :before, :before2, unless: proc {|c| c.action_name == "update" }, if: :state_open?
+  skip_callback :dispatch, :before, :before2, unless: proc { |c| c.action_name == "update" }, if: :state_open?
 
   def state_open?
     @state == :open
diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb
index 913b7c8cfc..b4e98edd84 100644
--- a/activesupport/test/callbacks_test.rb
+++ b/activesupport/test/callbacks_test.rb
@@ -89,7 +89,7 @@ module CallbacksTest
 
     define_callbacks :dispatch
 
-    set_callback :dispatch, :before, :log, unless: proc {|c| c.action_name == :index || c.action_name == :show }
+    set_callback :dispatch, :before, :log, unless: proc { |c| c.action_name == :index || c.action_name == :show }
     set_callback :dispatch, :after, :log2
 
     attr_reader :action_name, :logger
@@ -114,7 +114,7 @@ module CallbacksTest
   end
 
   class Child < ParentController
-    skip_callback :dispatch, :before, :log, if: proc {|c| c.action_name == :update}
+    skip_callback :dispatch, :before, :log, if: proc { |c| c.action_name == :update }
     skip_callback :dispatch, :after, :log2
   end
 
@@ -125,10 +125,10 @@ module CallbacksTest
       super
     end
 
-    before_save Proc.new {|r| r.history << [:before_save, :starts_true, :if] }, if: :starts_true
-    before_save Proc.new {|r| r.history << [:before_save, :starts_false, :if] }, if: :starts_false
-    before_save Proc.new {|r| r.history << [:before_save, :starts_true, :unless] }, unless: :starts_true
-    before_save Proc.new {|r| r.history << [:before_save, :starts_false, :unless] }, unless: :starts_false
+    before_save Proc.new { |r| r.history << [:before_save, :starts_true, :if] }, if: :starts_true
+    before_save Proc.new { |r| r.history << [:before_save, :starts_false, :if] }, if: :starts_false
+    before_save Proc.new { |r| r.history << [:before_save, :starts_true, :unless] }, unless: :starts_true
+    before_save Proc.new { |r| r.history << [:before_save, :starts_false, :unless] }, unless: :starts_false
 
     def starts_true
       if @@starts_true
@@ -227,7 +227,7 @@ module CallbacksTest
     set_callback :save, :before, :nope,           unless: :yes
     set_callback :save, :after,  :tweedle
     ActiveSupport::Deprecation.silence { set_callback :save, :before, "tweedle_dee" }
-    set_callback :save, :before, proc {|m| m.history << "yup" }
+    set_callback :save, :before, proc { |m| m.history << "yup" }
     set_callback :save, :before, :nope,           if: proc { false }
     set_callback :save, :before, :nope,           unless: proc { true }
     set_callback :save, :before, :yup,            if: proc { true }
@@ -879,7 +879,7 @@ module CallbacksTest
 
     def test_proc_arity_2
       assert_raises(ArgumentError) do
-        klass = build_class(->(x,y) { })
+        klass = build_class(->(x,y) {})
         klass.new.run
       end
     end
@@ -958,7 +958,7 @@ module CallbacksTest
 
     def test_proc_arity2
       assert_raises(ArgumentError) do
-        object = build_class(->(a,b) { }).new
+        object = build_class(->(a,b) {}).new
         object.run
       end
     end
diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb
index 64b5bca151..1a2dcba760 100644
--- a/activesupport/test/core_ext/duration_test.rb
+++ b/activesupport/test/core_ext/duration_test.rb
@@ -194,7 +194,7 @@ class DurationTest < ActiveSupport::TestCase
   def test_delegation_with_block_works
     counter = 0
     assert_nothing_raised do
-      1.minute.times {counter += 1}
+      1.minute.times { counter += 1 }
     end
     assert_equal counter, 60
   end
diff --git a/activesupport/test/core_ext/enumerable_test.rb b/activesupport/test/core_ext/enumerable_test.rb
index 3d63a5fbb6..9072957e0e 100644
--- a/activesupport/test/core_ext/enumerable_test.rb
+++ b/activesupport/test/core_ext/enumerable_test.rb
@@ -75,7 +75,7 @@ class EnumerableTests < ActiveSupport::TestCase
     assert_typed_equal(2.0, sum.real, Float)
     assert_typed_equal(3.0, sum.imag, Float)
 
-    sum = GenericEnumerable.new([1, 2]).sum(10) {|v| v * 2 }
+    sum = GenericEnumerable.new([1, 2]).sum(10) { |v| v * 2 }
     assert_typed_equal(16, sum, Integer)
   end
 
@@ -162,7 +162,7 @@ class EnumerableTests < ActiveSupport::TestCase
     assert_typed_equal(2.0, sum.real, Float)
     assert_typed_equal(3.0, sum.imag, Float)
 
-    sum = [1, 2].sum(10) {|v| v * 2 }
+    sum = [1, 2].sum(10) { |v| v * 2 }
     assert_typed_equal(16, sum, Integer)
   end
 
@@ -184,17 +184,17 @@ class EnumerableTests < ActiveSupport::TestCase
     assert_equal false, GenericEnumerable.new([ 1 ]      ).many?
     assert_equal true,  GenericEnumerable.new([ 1, 2 ]   ).many?
 
-    assert_equal false, GenericEnumerable.new([]         ).many? {|x| x > 1 }
-    assert_equal false, GenericEnumerable.new([ 2 ]      ).many? {|x| x > 1 }
-    assert_equal false, GenericEnumerable.new([ 1, 2 ]   ).many? {|x| x > 1 }
-    assert_equal true,  GenericEnumerable.new([ 1, 2, 2 ]).many? {|x| x > 1 }
+    assert_equal false, GenericEnumerable.new([]         ).many? { |x| x > 1 }
+    assert_equal false, GenericEnumerable.new([ 2 ]      ).many? { |x| x > 1 }
+    assert_equal false, GenericEnumerable.new([ 1, 2 ]   ).many? { |x| x > 1 }
+    assert_equal true,  GenericEnumerable.new([ 1, 2, 2 ]).many? { |x| x > 1 }
   end
 
   def test_many_iterates_only_on_what_is_needed
     infinity = 1.0/0.0
     very_long_enum = 0..infinity
     assert_equal true, very_long_enum.many?
-    assert_equal true, very_long_enum.many?{|x| x > 100}
+    assert_equal true, very_long_enum.many? { |x| x > 100 }
   end
 
   def test_exclude?
@@ -206,7 +206,7 @@ class EnumerableTests < ActiveSupport::TestCase
     assert_equal [1, 2, 4], GenericEnumerable.new((1..5).to_a).without(3, 5)
     assert_equal [1, 2, 4], (1..5).to_a.without(3, 5)
     assert_equal [1, 2, 4], (1..5).to_set.without(3, 5)
-    assert_equal({foo: 1, baz: 3}, {foo: 1, bar: 2, baz: 3}.without(:bar))
+    assert_equal({ foo: 1, baz: 3 }, { foo: 1, bar: 2, baz: 3 }.without(:bar))
   end
 
   def test_pluck
diff --git a/activesupport/test/core_ext/hash/transform_keys_test.rb b/activesupport/test/core_ext/hash/transform_keys_test.rb
index ea34a47b3d..7a11d827f8 100644
--- a/activesupport/test/core_ext/hash/transform_keys_test.rb
+++ b/activesupport/test/core_ext/hash/transform_keys_test.rb
@@ -48,7 +48,7 @@ class TransformKeysTest < ActiveSupport::TestCase
     class HashDescendant < ::Hash
       def initialize(elements = nil)
         super(elements)
-        (elements || {}).each_pair{ |key, value| self[key] = value }
+        (elements || {}).each_pair { |key, value| self[key] = value }
       end
     end
 
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index 6a65f999fd..e457cb866d 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -41,9 +41,9 @@ class HashExtTest < ActiveSupport::TestCase
     @mixed = { :a => 1, "b" => 2 }
     @nested_mixed = { "a" => { b: { "c" => 3 } } }
     @integers = { 0 => 1, 1 => 2 }
-    @nested_integers = { 0 => { 1 => { 2 => 3} } }
+    @nested_integers = { 0 => { 1 => { 2 => 3 } } }
     @illegal_symbols = { [] => 3 }
-    @nested_illegal_symbols = { [] => { [] => 3} }
+    @nested_illegal_symbols = { [] => { [] => 3 } }
     @upcase_strings = { "A" => 1, "B" => 2 }
     @nested_upcase_strings = { "A" => { "B" => { "C" => 3 } } }
     @string_array_of_hashes = { "a" => [ { "b" => 2 }, { "c" => 3 }, 4 ] }
@@ -75,57 +75,57 @@ class HashExtTest < ActiveSupport::TestCase
   end
 
   def test_transform_keys
-    assert_equal @upcase_strings, @strings.transform_keys{ |key| key.to_s.upcase }
-    assert_equal @upcase_strings, @symbols.transform_keys{ |key| key.to_s.upcase }
-    assert_equal @upcase_strings, @mixed.transform_keys{ |key| key.to_s.upcase }
+    assert_equal @upcase_strings, @strings.transform_keys { |key| key.to_s.upcase }
+    assert_equal @upcase_strings, @symbols.transform_keys { |key| key.to_s.upcase }
+    assert_equal @upcase_strings, @mixed.transform_keys { |key| key.to_s.upcase }
   end
 
   def test_transform_keys_not_mutates
     transformed_hash = @mixed.dup
-    transformed_hash.transform_keys{ |key| key.to_s.upcase }
+    transformed_hash.transform_keys { |key| key.to_s.upcase }
     assert_equal @mixed, transformed_hash
   end
 
   def test_deep_transform_keys
-    assert_equal @nested_upcase_strings, @nested_symbols.deep_transform_keys{ |key| key.to_s.upcase }
-    assert_equal @nested_upcase_strings, @nested_strings.deep_transform_keys{ |key| key.to_s.upcase }
-    assert_equal @nested_upcase_strings, @nested_mixed.deep_transform_keys{ |key| key.to_s.upcase }
-    assert_equal @upcase_array_of_hashes, @string_array_of_hashes.deep_transform_keys{ |key| key.to_s.upcase }
-    assert_equal @upcase_array_of_hashes, @symbol_array_of_hashes.deep_transform_keys{ |key| key.to_s.upcase }
-    assert_equal @upcase_array_of_hashes, @mixed_array_of_hashes.deep_transform_keys{ |key| key.to_s.upcase }
+    assert_equal @nested_upcase_strings, @nested_symbols.deep_transform_keys { |key| key.to_s.upcase }
+    assert_equal @nested_upcase_strings, @nested_strings.deep_transform_keys { |key| key.to_s.upcase }
+    assert_equal @nested_upcase_strings, @nested_mixed.deep_transform_keys { |key| key.to_s.upcase }
+    assert_equal @upcase_array_of_hashes, @string_array_of_hashes.deep_transform_keys { |key| key.to_s.upcase }
+    assert_equal @upcase_array_of_hashes, @symbol_array_of_hashes.deep_transform_keys { |key| key.to_s.upcase }
+    assert_equal @upcase_array_of_hashes, @mixed_array_of_hashes.deep_transform_keys { |key| key.to_s.upcase }
   end
 
   def test_deep_transform_keys_not_mutates
     transformed_hash = @nested_mixed.deep_dup
-    transformed_hash.deep_transform_keys{ |key| key.to_s.upcase }
+    transformed_hash.deep_transform_keys { |key| key.to_s.upcase }
     assert_equal @nested_mixed, transformed_hash
   end
 
   def test_transform_keys!
-    assert_equal @upcase_strings, @symbols.dup.transform_keys!{ |key| key.to_s.upcase }
-    assert_equal @upcase_strings, @strings.dup.transform_keys!{ |key| key.to_s.upcase }
-    assert_equal @upcase_strings, @mixed.dup.transform_keys!{ |key| key.to_s.upcase }
+    assert_equal @upcase_strings, @symbols.dup.transform_keys! { |key| key.to_s.upcase }
+    assert_equal @upcase_strings, @strings.dup.transform_keys! { |key| key.to_s.upcase }
+    assert_equal @upcase_strings, @mixed.dup.transform_keys! { |key| key.to_s.upcase }
   end
 
   def test_transform_keys_with_bang_mutates
     transformed_hash = @mixed.dup
-    transformed_hash.transform_keys!{ |key| key.to_s.upcase }
+    transformed_hash.transform_keys! { |key| key.to_s.upcase }
     assert_equal @upcase_strings, transformed_hash
     assert_equal @mixed, :a => 1, "b" => 2
   end
 
   def test_deep_transform_keys!
-    assert_equal @nested_upcase_strings, @nested_symbols.deep_dup.deep_transform_keys!{ |key| key.to_s.upcase }
-    assert_equal @nested_upcase_strings, @nested_strings.deep_dup.deep_transform_keys!{ |key| key.to_s.upcase }
-    assert_equal @nested_upcase_strings, @nested_mixed.deep_dup.deep_transform_keys!{ |key| key.to_s.upcase }
-    assert_equal @upcase_array_of_hashes, @string_array_of_hashes.deep_dup.deep_transform_keys!{ |key| key.to_s.upcase }
-    assert_equal @upcase_array_of_hashes, @symbol_array_of_hashes.deep_dup.deep_transform_keys!{ |key| key.to_s.upcase }
-    assert_equal @upcase_array_of_hashes, @mixed_array_of_hashes.deep_dup.deep_transform_keys!{ |key| key.to_s.upcase }
+    assert_equal @nested_upcase_strings, @nested_symbols.deep_dup.deep_transform_keys! { |key| key.to_s.upcase }
+    assert_equal @nested_upcase_strings, @nested_strings.deep_dup.deep_transform_keys! { |key| key.to_s.upcase }
+    assert_equal @nested_upcase_strings, @nested_mixed.deep_dup.deep_transform_keys! { |key| key.to_s.upcase }
+    assert_equal @upcase_array_of_hashes, @string_array_of_hashes.deep_dup.deep_transform_keys! { |key| key.to_s.upcase }
+    assert_equal @upcase_array_of_hashes, @symbol_array_of_hashes.deep_dup.deep_transform_keys! { |key| key.to_s.upcase }
+    assert_equal @upcase_array_of_hashes, @mixed_array_of_hashes.deep_dup.deep_transform_keys! { |key| key.to_s.upcase }
   end
 
   def test_deep_transform_keys_with_bang_mutates
     transformed_hash = @nested_mixed.deep_dup
-    transformed_hash.deep_transform_keys!{ |key| key.to_s.upcase }
+    transformed_hash.deep_transform_keys! { |key| key.to_s.upcase }
     assert_equal @nested_upcase_strings, transformed_hash
     assert_equal @nested_mixed, "a" => { b: { "c" => 3 } }
   end
@@ -534,7 +534,7 @@ class HashExtTest < ActiveSupport::TestCase
   end
 
   def test_indifferent_deleting
-    get_hash = proc{ { a: "foo" }.with_indifferent_access }
+    get_hash = proc { { a: "foo" }.with_indifferent_access }
     hash = get_hash.call
     assert_equal hash.delete(:a), "foo"
     assert_equal hash.delete(:a), nil
@@ -544,7 +544,7 @@ class HashExtTest < ActiveSupport::TestCase
   end
 
   def test_indifferent_select
-    hash = ActiveSupport::HashWithIndifferentAccess.new(@strings).select {|k,v| v == 1}
+    hash = ActiveSupport::HashWithIndifferentAccess.new(@strings).select { |k,v| v == 1 }
 
     assert_equal({ "a" => 1 }, hash)
     assert_instance_of ActiveSupport::HashWithIndifferentAccess, hash
@@ -556,21 +556,21 @@ class HashExtTest < ActiveSupport::TestCase
   end
 
   def test_indifferent_select_returns_a_hash_when_unchanged
-    hash = ActiveSupport::HashWithIndifferentAccess.new(@strings).select {|k,v| true}
+    hash = ActiveSupport::HashWithIndifferentAccess.new(@strings).select { |k,v| true }
 
     assert_instance_of ActiveSupport::HashWithIndifferentAccess, hash
   end
 
   def test_indifferent_select_bang
     indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@strings)
-    indifferent_strings.select! {|k,v| v == 1}
+    indifferent_strings.select! { |k,v| v == 1 }
 
     assert_equal({ "a" => 1 }, indifferent_strings)
     assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
   end
 
   def test_indifferent_reject
-    hash = ActiveSupport::HashWithIndifferentAccess.new(@strings).reject {|k,v| v != 1}
+    hash = ActiveSupport::HashWithIndifferentAccess.new(@strings).reject { |k,v| v != 1 }
 
     assert_equal({ "a" => 1 }, hash)
     assert_instance_of ActiveSupport::HashWithIndifferentAccess, hash
@@ -583,7 +583,7 @@ class HashExtTest < ActiveSupport::TestCase
 
   def test_indifferent_reject_bang
     indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@strings)
-    indifferent_strings.reject! {|k,v| v != 1}
+    indifferent_strings.reject! { |k,v| v != 1 }
 
     assert_equal({ "a" => 1 }, indifferent_strings)
     assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
@@ -608,21 +608,21 @@ class HashExtTest < ActiveSupport::TestCase
   end
 
   def test_lookup_returns_the_same_object_that_is_stored_in_hash_indifferent_access
-    hash = HashWithIndifferentAccess.new {|h, k| h[k] = []}
+    hash = HashWithIndifferentAccess.new { |h, k| h[k] = [] }
     hash[:a] << 1
 
     assert_equal [1], hash[:a]
   end
 
   def test_with_indifferent_access_has_no_side_effects_on_existing_hash
-    hash = {content: [{:foo => :bar, "bar" => "baz"}]}
+    hash = { content: [{ :foo => :bar, "bar" => "baz" }] }
     hash.with_indifferent_access
 
     assert_equal [:foo, "bar"], hash[:content].first.keys
   end
 
   def test_indifferent_hash_with_array_of_hashes
-    hash = { "urls" => { "url" => [ { "address" => "1" }, { "address" => "2" } ] }}.with_indifferent_access
+    hash = { "urls" => { "url" => [ { "address" => "1" }, { "address" => "2" } ] } }.with_indifferent_access
     assert_equal "1", hash[:urls][:url].first[:address]
 
     hash = hash.to_hash
@@ -634,14 +634,14 @@ class HashExtTest < ActiveSupport::TestCase
   def test_should_preserve_array_subclass_when_value_is_array
     array = SubclassingArray.new
     array << { "address" => "1" }
-    hash = { "urls" => { "url" => array }}.with_indifferent_access
+    hash = { "urls" => { "url" => array } }.with_indifferent_access
     assert_equal SubclassingArray, hash[:urls][:url].class
   end
 
   def test_should_preserve_array_class_when_hash_value_is_frozen_array
     array = SubclassingArray.new
     array << { "address" => "1" }
-    hash = { "urls" => { "url" => array.freeze }}.with_indifferent_access
+    hash = { "urls" => { "url" => array.freeze } }.with_indifferent_access
     assert_equal SubclassingArray, hash[:urls][:url].class
   end
 
@@ -683,11 +683,11 @@ class HashExtTest < ActiveSupport::TestCase
   end
 
   def test_indifferent_sub_hashes
-    h = {"user" => {"id" => 5}}.with_indifferent_access
-    ["user", :user].each {|user| [:id, "id"].each {|id| assert_equal 5, h[user][id], "h[#{user.inspect}][#{id.inspect}] should be 5"}}
+    h = { "user" => { "id" => 5 } }.with_indifferent_access
+    ["user", :user].each { |user| [:id, "id"].each { |id| assert_equal 5, h[user][id], "h[#{user.inspect}][#{id.inspect}] should be 5" } }
 
-    h = {user: {id: 5}}.with_indifferent_access
-    ["user", :user].each {|user| [:id, "id"].each {|id| assert_equal 5, h[user][id], "h[#{user.inspect}][#{id.inspect}] should be 5"}}
+    h = { user: { id: 5 } }.with_indifferent_access
+    ["user", :user].each { |user| [:id, "id"].each { |id| assert_equal 5, h[user][id], "h[#{user.inspect}][#{id.inspect}] should be 5" } }
   end
 
   def test_indifferent_duplication
@@ -703,7 +703,7 @@ class HashExtTest < ActiveSupport::TestCase
 
   def test_nested_dig_indifferent_access
     skip if RUBY_VERSION < "2.3.0"
-    data = {"this" => {"views" => 1234}}.with_indifferent_access
+    data = { "this" => { "views" => 1234 } }.with_indifferent_access
     assert_equal 1234, data.dig(:this, :views)
   end
 
@@ -740,9 +740,9 @@ class HashExtTest < ActiveSupport::TestCase
   end
 
   def test_assorted_keys_not_stringified
-    original = {Object.new => 2, 1 => 2, [] => true}
+    original = { Object.new => 2, 1 => 2, [] => true }
     indiff = original.with_indifferent_access
-    assert(!indiff.keys.any? {|k| k.kind_of? String}, "A key was converted to a string!")
+    assert(!indiff.keys.any? { |k| k.kind_of? String }, "A key was converted to a string!")
   end
 
   def test_deep_merge
@@ -891,7 +891,7 @@ class HashExtTest < ActiveSupport::TestCase
   end
 
   def test_indifferent_slice_access_with_symbols
-    original = {"login" => "bender", "password" => "shiny", "stuff" => "foo"}
+    original = { "login" => "bender", "password" => "shiny", "stuff" => "foo" }
     original = original.with_indifferent_access
 
     slice = original.slice(:login, :password)
@@ -919,17 +919,17 @@ class HashExtTest < ActiveSupport::TestCase
   end
 
   def test_extract
-    original = {a: 1, b: 2, c: 3, d: 4}
-    expected = {a: 1, b: 2}
-    remaining = {c: 3, d: 4}
+    original = { a: 1, b: 2, c: 3, d: 4 }
+    expected = { a: 1, b: 2 }
+    remaining = { c: 3, d: 4 }
 
     assert_equal expected, original.extract!(:a, :b, :x)
     assert_equal remaining, original
   end
 
   def test_extract_nils
-    original = {a: nil, b: nil}
-    expected = {a: nil}
+    original = { a: nil, b: nil }
+    expected = { a: nil }
     extracted = original.extract!(:a, :x)
 
     assert_equal expected, extracted
@@ -938,9 +938,9 @@ class HashExtTest < ActiveSupport::TestCase
   end
 
   def test_indifferent_extract
-    original = {:a => 1, "b" => 2, :c => 3, "d" => 4}.with_indifferent_access
-    expected = {a: 1, b: 2}.with_indifferent_access
-    remaining = {c: 3, d: 4}.with_indifferent_access
+    original = { :a => 1, "b" => 2, :c => 3, "d" => 4 }.with_indifferent_access
+    expected = { a: 1, b: 2 }.with_indifferent_access
+    remaining = { c: 3, d: 4 }.with_indifferent_access
 
     [["a", "b"], [:a, :b]].each do |keys|
       copy = original.dup
@@ -1099,15 +1099,15 @@ class HashExtToParamTests < ActiveSupport::TestCase
     assert_equal "", {}.to_param
     assert_equal "hello=world", { hello: "world" }.to_param
     assert_equal "hello=10", { "hello" => 10 }.to_param
-    assert_equal "hello=world&say_bye=true", {:hello => "world", "say_bye" => true}.to_param
+    assert_equal "hello=world&say_bye=true", { :hello => "world", "say_bye" => true }.to_param
   end
 
   def test_number_hash
-    assert_equal "10=20&30=40&50=60", {10 => 20, 30 => 40, 50 => 60}.to_param
+    assert_equal "10=20&30=40&50=60", { 10 => 20, 30 => 40, 50 => 60 }.to_param
   end
 
   def test_to_param_hash
-    assert_equal "custom-1=param-1&custom2-1=param2-1", {ToParam.new("custom") => ToParam.new("param"), ToParam.new("custom2") => ToParam.new("param2")}.to_param
+    assert_equal "custom-1=param-1&custom2-1=param2-1", { ToParam.new("custom") => ToParam.new("param"), ToParam.new("custom2") => ToParam.new("param2") }.to_param
   end
 
   def test_to_param_hash_escapes_its_keys_and_values
@@ -1437,7 +1437,7 @@ class HashToXmlTest < ActiveSupport::TestCase
         <posts type="array"></posts>
       </blog>
     XML
-    expected_blog_hash = {"blog" => {"posts" => []}}
+    expected_blog_hash = { "blog" => { "posts" => [] } }
     assert_equal expected_blog_hash, Hash.from_xml(blog_xml)
   end
 
@@ -1448,7 +1448,7 @@ class HashToXmlTest < ActiveSupport::TestCase
         </posts>
       </blog>
     XML
-    expected_blog_hash = {"blog" => {"posts" => []}}
+    expected_blog_hash = { "blog" => { "posts" => [] } }
     assert_equal expected_blog_hash, Hash.from_xml(blog_xml)
   end
 
@@ -1460,7 +1460,7 @@ class HashToXmlTest < ActiveSupport::TestCase
         </posts>
       </blog>
     XML
-    expected_blog_hash = {"blog" => {"posts" => ["a post"]}}
+    expected_blog_hash = { "blog" => { "posts" => ["a post"] } }
     assert_equal expected_blog_hash, Hash.from_xml(blog_xml)
   end
 
@@ -1473,7 +1473,7 @@ class HashToXmlTest < ActiveSupport::TestCase
         </posts>
       </blog>
     XML
-    expected_blog_hash = {"blog" => {"posts" => ["a post", "another post"]}}
+    expected_blog_hash = { "blog" => { "posts" => ["a post", "another post"] } }
     assert_equal expected_blog_hash, Hash.from_xml(blog_xml)
   end
 
@@ -1557,7 +1557,7 @@ class HashToXmlTest < ActiveSupport::TestCase
 
     expected_product_hash = {
       weight: 0.5,
-      image: {"type" => "ProductImage", "filename" => "image.gif" },
+      image: { "type" => "ProductImage", "filename" => "image.gif" },
     }.stringify_keys
 
     assert_equal expected_product_hash, Hash.from_xml(product_xml)["product"]
@@ -1580,17 +1580,17 @@ class HashToXmlTest < ActiveSupport::TestCase
   end
 
   def test_from_xml_array_one
-    expected = { "numbers" => { "type" => "Array", "value" => "1" }}
+    expected = { "numbers" => { "type" => "Array", "value" => "1" } }
     assert_equal expected, Hash.from_xml('<numbers type="Array"><value>1</value></numbers>')
   end
 
   def test_from_xml_array_many
-    expected = { "numbers" => { "type" => "Array", "value" => [ "1", "2" ] }}
+    expected = { "numbers" => { "type" => "Array", "value" => [ "1", "2" ] } }
     assert_equal expected, Hash.from_xml('<numbers type="Array"><value>1</value><value>2</value></numbers>')
   end
 
   def test_from_trusted_xml_allows_symbol_and_yaml_types
-    expected = { "product" => { "name" => :value }}
+    expected = { "product" => { "name" => :value } }
     assert_equal expected, Hash.from_trusted_xml('<product><name type="symbol">value</name></product>')
     assert_equal expected, Hash.from_trusted_xml('<product><name type="yaml">:value</name></product>')
   end
@@ -1734,10 +1734,10 @@ class HashToXmlTest < ActiveSupport::TestCase
   end
 
   def test_to_xml_dups_options
-    options = {skip_instruct: true}
+    options = { skip_instruct: true }
     {}.to_xml(options)
     # :builder, etc, shouldn't be added to options
-    assert_equal({skip_instruct: true}, options)
+    assert_equal({ skip_instruct: true }, options)
   end
 
   def test_expansion_count_is_limited
diff --git a/activesupport/test/core_ext/marshal_test.rb b/activesupport/test/core_ext/marshal_test.rb
index 275002b8a1..a899f98705 100644
--- a/activesupport/test/core_ext/marshal_test.rb
+++ b/activesupport/test/core_ext/marshal_test.rb
@@ -12,7 +12,7 @@ class MarshalTest < ActiveSupport::TestCase
   end
 
   test "that Marshal#load still works" do
-    sanity_data = ["test", [1, 2, 3], {a: [1, 2, 3]}, ActiveSupport::TestCase]
+    sanity_data = ["test", [1, 2, 3], { a: [1, 2, 3] }, ActiveSupport::TestCase]
     sanity_data.each do |obj|
       dumped = Marshal.dump(obj)
       assert_equal Marshal.method(:load).super_method.call(dumped), Marshal.load(dumped)
diff --git a/activesupport/test/core_ext/module/attribute_accessor_test.rb b/activesupport/test/core_ext/module/attribute_accessor_test.rb
index fea6806b9b..464a000d59 100644
--- a/activesupport/test/core_ext/module/attribute_accessor_test.rb
+++ b/activesupport/test/core_ext/module/attribute_accessor_test.rb
@@ -93,7 +93,7 @@ class ModuleAttributeAccessorTest < ActiveSupport::TestCase
 
   def test_should_not_invoke_default_value_block_multiple_times
     count = 0
-    @module.cattr_accessor(:defcount){ count += 1 }
+    @module.cattr_accessor(:defcount) { count += 1 }
     assert_equal 1, count
   end
 end
diff --git a/activesupport/test/core_ext/module/concerning_test.rb b/activesupport/test/core_ext/module/concerning_test.rb
index 45178e477d..038cbf1f2f 100644
--- a/activesupport/test/core_ext/module/concerning_test.rb
+++ b/activesupport/test/core_ext/module/concerning_test.rb
@@ -3,7 +3,7 @@ require "active_support/core_ext/module/concerning"
 
 class ModuleConcerningTest < ActiveSupport::TestCase
   def test_concerning_declares_a_concern_and_includes_it_immediately
-    klass = Class.new { concerning(:Foo) { } }
+    klass = Class.new { concerning(:Foo) {} }
     assert klass.ancestors.include?(klass::Foo), klass.ancestors.inspect
   end
 end
diff --git a/activesupport/test/core_ext/module/qualified_const_test.rb b/activesupport/test/core_ext/module/qualified_const_test.rb
index dcfac4ced1..418bc80ab9 100644
--- a/activesupport/test/core_ext/module/qualified_const_test.rb
+++ b/activesupport/test/core_ext/module/qualified_const_test.rb
@@ -68,7 +68,7 @@ class QualifiedConstTest < ActiveSupport::TestCase
       assert_equal 1, QualifiedConstTestMod.qualified_const_get("N::X")
       assert_equal 2, QualifiedConstTestMod.qualified_const_get("M::C::X")
 
-      assert_raise(NameError) { QualifiedConstTestMod.qualified_const_get("M::C::Y")}
+      assert_raise(NameError) { QualifiedConstTestMod.qualified_const_get("M::C::Y") }
     end
   end
 
@@ -98,14 +98,14 @@ class QualifiedConstTest < ActiveSupport::TestCase
 
   test "reject absolute paths" do
     assert_deprecated do
-      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_defined?("::X")}
-      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_defined?("::X::Y")}
+      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_defined?("::X") }
+      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_defined?("::X::Y") }
 
-      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_get("::X")}
-      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_get("::X::Y")}
+      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_get("::X") }
+      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_get("::X::Y") }
 
-      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_set("::X", nil)}
-      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_set("::X::Y", nil)}
+      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_set("::X", nil) }
+      assert_raise_with_message(NameError, "wrong constant name ::X") { Object.qualified_const_set("::X::Y", nil) }
     end
   end
 
diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb
index 104082b777..36073b28b7 100644
--- a/activesupport/test/core_ext/module_test.rb
+++ b/activesupport/test/core_ext/module_test.rb
@@ -117,7 +117,7 @@ class ParameterSet
   delegate :[], :[]=, to: :@params
 
   def initialize
-    @params = {foo: "bar"}
+    @params = { foo: "bar" }
   end
 end
 
@@ -312,7 +312,7 @@ class ModuleTest < ActiveSupport::TestCase
   rescue NoMethodError => e
     file_and_line = "#{__FILE__}:#{Someone::FAILED_DELEGATE_LINE}"
     # We can't simply check the first line of the backtrace, because JRuby reports the call to __send__ in the backtrace.
-    assert e.backtrace.any?{|a| a.include?(file_and_line)},
+    assert e.backtrace.any? { |a| a.include?(file_and_line) },
            "[#{e.backtrace.inspect}] did not include [#{file_and_line}]"
   end
 
@@ -322,7 +322,7 @@ class ModuleTest < ActiveSupport::TestCase
   rescue NoMethodError => e
     file_and_line = "#{__FILE__}:#{Someone::FAILED_DELEGATE_LINE_2}"
     # We can't simply check the first line of the backtrace, because JRuby reports the call to __send__ in the backtrace.
-    assert e.backtrace.any?{|a| a.include?(file_and_line)},
+    assert e.backtrace.any? { |a| a.include?(file_and_line) },
            "[#{e.backtrace.inspect}] did not include [#{file_and_line}]"
   end
 
diff --git a/activesupport/test/core_ext/numeric_ext_test.rb b/activesupport/test/core_ext/numeric_ext_test.rb
index b99217a1b3..5e824747ed 100644
--- a/activesupport/test/core_ext/numeric_ext_test.rb
+++ b/activesupport/test/core_ext/numeric_ext_test.rb
@@ -348,13 +348,13 @@ class NumericExtFormattingTest < ActiveSupport::TestCase
 
   def test_number_to_human_with_custom_units
     #Only integers
-    volume = {unit: "ml", thousand: "lt", million: "m3"}
+    volume = { unit: "ml", thousand: "lt", million: "m3" }
     assert_equal "123 lt", 123456.to_s(:human, units: volume)
     assert_equal "12 ml", 12.to_s(:human, units: volume)
     assert_equal "1.23 m3", 1234567.to_s(:human, units: volume)
 
     #Including fractionals
-    distance = {mili: "mm", centi: "cm", deci: "dm", unit: "m", ten: "dam", hundred: "hm", thousand: "km"}
+    distance = { mili: "mm", centi: "cm", deci: "dm", unit: "m", ten: "dam", hundred: "hm", thousand: "km" }
     assert_equal "1.23 mm", 0.00123.to_s(:human, units: distance)
     assert_equal "1.23 cm", 0.0123.to_s(:human, units: distance)
     assert_equal "1.23 dm", 0.123.to_s(:human, units: distance)
@@ -367,20 +367,20 @@ class NumericExtFormattingTest < ActiveSupport::TestCase
     assert_equal "12.3 km", 12300.to_s(:human, units: distance)
 
     #The quantifiers don't need to be a continuous sequence
-    gangster = {hundred: "hundred bucks", million: "thousand quids"}
+    gangster = { hundred: "hundred bucks", million: "thousand quids" }
     assert_equal "1 hundred bucks", 100.to_s(:human, units: gangster)
     assert_equal "25 hundred bucks", 2500.to_s(:human, units: gangster)
     assert_equal "25 thousand quids", 25000000.to_s(:human, units: gangster)
     assert_equal "12300 thousand quids", 12345000000.to_s(:human, units: gangster)
 
     #Spaces are stripped from the resulting string
-    assert_equal "4", 4.to_s(:human, units: {unit: "", ten: "tens "})
-    assert_equal "4.5  tens", 45.to_s(:human, units: {unit: "", ten: " tens   "})
+    assert_equal "4", 4.to_s(:human, units: { unit: "", ten: "tens " })
+    assert_equal "4.5  tens", 45.to_s(:human, units: { unit: "", ten: " tens   " })
   end
 
   def test_number_to_human_with_custom_format
     assert_equal "123 times Thousand", 123456.to_s(:human, format: "%n times %u")
-    volume = {unit: "ml", thousand: "lt", million: "m3"}
+    volume = { unit: "ml", thousand: "lt", million: "m3" }
     assert_equal "123.lt", 123456.to_s(:human, units: volume, format: "%n.%u")
   end
 
diff --git a/activesupport/test/core_ext/object/instance_variables_test.rb b/activesupport/test/core_ext/object/instance_variables_test.rb
index 510352595a..5bdb2fbc35 100644
--- a/activesupport/test/core_ext/object/instance_variables_test.rb
+++ b/activesupport/test/core_ext/object/instance_variables_test.rb
@@ -13,7 +13,7 @@ class ObjectInstanceVariableTest < ActiveSupport::TestCase
   end
 
   def test_instance_values
-    assert_equal({"bar" => "bar", "baz" => "baz"}, @source.instance_values)
+    assert_equal({ "bar" => "bar", "baz" => "baz" }, @source.instance_values)
   end
 
   def test_instance_exec_passes_arguments_to_block
diff --git a/activesupport/test/core_ext/object/to_query_test.rb b/activesupport/test/core_ext/object/to_query_test.rb
index 2eff475274..298c8bf373 100644
--- a/activesupport/test/core_ext/object/to_query_test.rb
+++ b/activesupport/test/core_ext/object/to_query_test.rb
@@ -33,17 +33,17 @@ class ToQueryTest < ActiveSupport::TestCase
 
   def test_multiple_nested
     assert_query_equal "account%5Bperson%5D%5Bid%5D=20&person%5Bid%5D=10",
-      Hash[:account, {person: {id: 20}}, :person, {id: 10}]
+      Hash[:account, { person: { id: 20 } }, :person, { id: 10 }]
   end
 
   def test_array_values
     assert_query_equal "person%5Bid%5D%5B%5D=10&person%5Bid%5D%5B%5D=20",
-      person: {id: [10, 20]}
+      person: { id: [10, 20] }
   end
 
   def test_array_values_are_not_sorted
     assert_query_equal "person%5Bid%5D%5B%5D=20&person%5Bid%5D%5B%5D=10",
-      person: {id: [20, 10]}
+      person: { id: [20, 10] }
   end
 
   def test_empty_array
@@ -56,7 +56,7 @@ class ToQueryTest < ActiveSupport::TestCase
     assert_query_equal "a=1&b%5Bc%5D=3",
       a: 1, b: { c: 3, d: {} }
     assert_query_equal "",
-      a: {b: {c: {}}}
+      a: { b: { c: {} } }
     assert_query_equal "b%5Bc%5D=false&b%5Be%5D=&b%5Bf%5D=&p=12",
       p: 12, b: { c: false, e: nil, f: "" }
     assert_query_equal "b%5Bc%5D=3&b%5Bf%5D=",
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index 773d2c0fb7..6ab1368e53 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -1014,7 +1014,7 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < ActiveSupport::TestCase
   def test_use_zone_raises_on_invalid_timezone
     Time.zone = "Alaska"
     assert_raise ArgumentError do
-      Time.use_zone("No such timezone exists") { }
+      Time.use_zone("No such timezone exists") {}
     end
     assert_equal ActiveSupport::TimeZone["Alaska"], Time.zone
   end
@@ -1072,9 +1072,9 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < ActiveSupport::TestCase
   end
 
   def test_time_zone_setter_with_invalid_zone
-    assert_raise(ArgumentError){ Time.zone = "No such timezone exists" }
-    assert_raise(ArgumentError){ Time.zone = -15.hours }
-    assert_raise(ArgumentError){ Time.zone = Object.new }
+    assert_raise(ArgumentError) { Time.zone = "No such timezone exists" }
+    assert_raise(ArgumentError) { Time.zone = -15.hours }
+    assert_raise(ArgumentError) { Time.zone = Object.new }
   end
 
   def test_find_zone_without_bang_returns_nil_if_time_zone_can_not_be_found
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 1ed6337fca..e0edb4a086 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -659,7 +659,7 @@ class DependenciesTest < ActiveSupport::TestCase
 
   def test_autoload_once_pathnames_do_not_add_to_autoloaded_constants
     with_autoloading_fixtures do
-      pathnames = ActiveSupport::Dependencies.autoload_paths.collect{|p| Pathname.new(p)}
+      pathnames = ActiveSupport::Dependencies.autoload_paths.collect { |p| Pathname.new(p) }
       ActiveSupport::Dependencies.autoload_paths = pathnames
       ActiveSupport::Dependencies.autoload_once_paths = pathnames
 
@@ -756,15 +756,15 @@ class DependenciesTest < ActiveSupport::TestCase
   end
 
   def test_new_contants_in_without_constants
-    assert_equal [], (ActiveSupport::Dependencies.new_constants_in(Object) { })
-    assert ActiveSupport::Dependencies.constant_watch_stack.all? {|k,v| v.empty? }
+    assert_equal [], (ActiveSupport::Dependencies.new_constants_in(Object) {})
+    assert ActiveSupport::Dependencies.constant_watch_stack.all? { |k,v| v.empty? }
   end
 
   def test_new_constants_in_with_a_single_constant
     assert_equal ["Hello"], ActiveSupport::Dependencies.new_constants_in(Object) {
                               Object.const_set :Hello, 10
                             }.map(&:to_s)
-    assert ActiveSupport::Dependencies.constant_watch_stack.all? {|k,v| v.empty? }
+    assert ActiveSupport::Dependencies.constant_watch_stack.all? { |k,v| v.empty? }
   ensure
     remove_constants(:Hello)
   end
@@ -781,7 +781,7 @@ class DependenciesTest < ActiveSupport::TestCase
     end
 
     assert_equal ["OuterAfter", "OuterBefore"], outer.sort.map(&:to_s)
-    assert ActiveSupport::Dependencies.constant_watch_stack.all? {|k,v| v.empty? }
+    assert ActiveSupport::Dependencies.constant_watch_stack.all? { |k,v| v.empty? }
   ensure
     remove_constants(:OuterBefore, :Inner, :OuterAfter)
   end
@@ -800,7 +800,7 @@ class DependenciesTest < ActiveSupport::TestCase
       M.const_set :OuterAfter, 30
     end
     assert_equal ["M::OuterAfter", "M::OuterBefore"], outer.sort
-    assert ActiveSupport::Dependencies.constant_watch_stack.all? {|k,v| v.empty? }
+    assert ActiveSupport::Dependencies.constant_watch_stack.all? { |k,v| v.empty? }
   ensure
     remove_constants(:M)
   end
@@ -818,7 +818,7 @@ class DependenciesTest < ActiveSupport::TestCase
       M.const_set :OuterAfter, 30
     end
     assert_equal ["M::OuterAfter", "M::OuterBefore"], outer.sort
-    assert ActiveSupport::Dependencies.constant_watch_stack.all? {|k,v| v.empty? }
+    assert ActiveSupport::Dependencies.constant_watch_stack.all? { |k,v| v.empty? }
   ensure
     remove_constants(:M)
   end
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index 6669a70a00..e2a3331cfa 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -363,7 +363,7 @@ class DeprecationTest < ActiveSupport::TestCase
     def deprecator_with_messages
       klass = Class.new(ActiveSupport::Deprecation)
       deprecator = klass.new
-      deprecator.behavior = Proc.new{|message, callstack| deprecator.messages << message}
+      deprecator.behavior = Proc.new { |message, callstack| deprecator.messages << message }
       def deprecator.messages
         @messages ||= []
       end
diff --git a/activesupport/test/evented_file_update_checker_test.rb b/activesupport/test/evented_file_update_checker_test.rb
index aaa9aaa397..cc47318974 100644
--- a/activesupport/test/evented_file_update_checker_test.rb
+++ b/activesupport/test/evented_file_update_checker_test.rb
@@ -38,7 +38,7 @@ class EventedFileUpdateCheckerTest < ActiveSupport::TestCase
   test "notifies forked processes" do
     FileUtils.touch(tmpfiles)
 
-    checker = new_checker(tmpfiles) { }
+    checker = new_checker(tmpfiles) {}
     assert !checker.updated?
 
     # Pipes used for flow controll across fork.
diff --git a/activesupport/test/executor_test.rb b/activesupport/test/executor_test.rb
index 11ef4e5a50..0b56ea008f 100644
--- a/activesupport/test/executor_test.rb
+++ b/activesupport/test/executor_test.rb
@@ -21,7 +21,7 @@ class ExecutorTest < ActiveSupport::TestCase
     executor.to_run { @foo = true }
     executor.to_complete { result = @foo }
 
-    executor.wrap { }
+    executor.wrap {}
 
     assert result
   end
@@ -83,7 +83,7 @@ class ExecutorTest < ActiveSupport::TestCase
 
     executor.register_hook(hook)
 
-    executor.wrap { }
+    executor.wrap {}
 
     assert_equal :some_state, supplied_state
   end
@@ -103,7 +103,7 @@ class ExecutorTest < ActiveSupport::TestCase
 
     executor.register_hook(hook)
 
-    executor.wrap { }
+    executor.wrap {}
 
     assert_equal nil, supplied_state
   end
@@ -127,7 +127,7 @@ class ExecutorTest < ActiveSupport::TestCase
     executor.register_hook(hook)
 
     assert_raises(DummyError) do
-      executor.wrap { }
+      executor.wrap {}
     end
 
     assert_equal :none, supplied_state
@@ -152,7 +152,7 @@ class ExecutorTest < ActiveSupport::TestCase
     end
 
     assert_raises(DummyError) do
-      executor.wrap { }
+      executor.wrap {}
     end
 
     assert_equal :some_state, supplied_state
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
index de314921ec..dd8382754b 100644
--- a/activesupport/test/json/decoding_test.rb
+++ b/activesupport/test/json/decoding_test.rb
@@ -13,57 +13,57 @@ class TestJSONDecoding < ActiveSupport::TestCase
   end
 
   TESTS = {
-    %q({"returnTo":{"\/categories":"\/"}})        => {"returnTo" => {"/categories" => "/"}},
-    %q({"return\\"To\\":":{"\/categories":"\/"}}) => {"return\"To\":" => {"/categories" => "/"}},
-    %q({"returnTo":{"\/categories":1}})          => {"returnTo" => {"/categories" => 1}},
-    %({"returnTo":[1,"a"]})                    => {"returnTo" => [1, "a"]},
-    %({"returnTo":[1,"\\"a\\",", "b"]})        => {"returnTo" => [1, "\"a\",", "b"]},
-    %({"a": "'", "b": "5,000"})                  => {"a" => "'", "b" => "5,000"},
-    %({"a": "a's, b's and c's", "b": "5,000"})   => {"a" => "a's, b's and c's", "b" => "5,000"},
+    %q({"returnTo":{"\/categories":"\/"}})        => { "returnTo" => { "/categories" => "/" } },
+    %q({"return\\"To\\":":{"\/categories":"\/"}}) => { "return\"To\":" => { "/categories" => "/" } },
+    %q({"returnTo":{"\/categories":1}})          => { "returnTo" => { "/categories" => 1 } },
+    %({"returnTo":[1,"a"]})                    => { "returnTo" => [1, "a"] },
+    %({"returnTo":[1,"\\"a\\",", "b"]})        => { "returnTo" => [1, "\"a\",", "b"] },
+    %({"a": "'", "b": "5,000"})                  => { "a" => "'", "b" => "5,000" },
+    %({"a": "a's, b's and c's", "b": "5,000"})   => { "a" => "a's, b's and c's", "b" => "5,000" },
     # multibyte
-    %({"matzue": "松江", "asakusa": "浅草"}) => {"matzue" => "松江", "asakusa" => "浅草"},
-    %({"a": "2007-01-01"})                       => {"a" => Date.new(2007, 1, 1)},
-    %({"a": "2007-01-01 01:12:34 Z"})            => {"a" => Time.utc(2007, 1, 1, 1, 12, 34)},
+    %({"matzue": "松江", "asakusa": "浅草"}) => { "matzue" => "松江", "asakusa" => "浅草" },
+    %({"a": "2007-01-01"})                       => { "a" => Date.new(2007, 1, 1) },
+    %({"a": "2007-01-01 01:12:34 Z"})            => { "a" => Time.utc(2007, 1, 1, 1, 12, 34) },
     %(["2007-01-01 01:12:34 Z"])                 => [Time.utc(2007, 1, 1, 1, 12, 34)],
     %(["2007-01-01 01:12:34 Z", "2007-01-01 01:12:35 Z"]) => [Time.utc(2007, 1, 1, 1, 12, 34), Time.utc(2007, 1, 1, 1, 12, 35)],
     # no time zone
-    %({"a": "2007-01-01 01:12:34"})              => {"a" => Time.new(2007, 1, 1, 1, 12, 34, "-05:00")},
+    %({"a": "2007-01-01 01:12:34"})              => { "a" => Time.new(2007, 1, 1, 1, 12, 34, "-05:00") },
     # invalid date
-    %({"a": "1089-10-40"})                       => {"a" => "1089-10-40"},
+    %({"a": "1089-10-40"})                       => { "a" => "1089-10-40" },
     # xmlschema date notation
-    %({"a": "2009-08-10T19:01:02"})              => {"a" => Time.new(2009, 8, 10, 19, 1, 2, "-04:00")},
-    %({"a": "2009-08-10T19:01:02Z"})             => {"a" => Time.utc(2009, 8, 10, 19, 1, 2)},
-    %({"a": "2009-08-10T19:01:02+02:00"})        => {"a" => Time.utc(2009, 8, 10, 17, 1, 2)},
-    %({"a": "2009-08-10T19:01:02-05:00"})        => {"a" => Time.utc(2009, 8, 11, 00, 1, 2)},
+    %({"a": "2009-08-10T19:01:02"})              => { "a" => Time.new(2009, 8, 10, 19, 1, 2, "-04:00") },
+    %({"a": "2009-08-10T19:01:02Z"})             => { "a" => Time.utc(2009, 8, 10, 19, 1, 2) },
+    %({"a": "2009-08-10T19:01:02+02:00"})        => { "a" => Time.utc(2009, 8, 10, 17, 1, 2) },
+    %({"a": "2009-08-10T19:01:02-05:00"})        => { "a" => Time.utc(2009, 8, 11, 00, 1, 2) },
     # needs to be *exact*
-    %({"a": " 2007-01-01 01:12:34 Z "})          => {"a" => " 2007-01-01 01:12:34 Z "},
-    %({"a": "2007-01-01 : it's your birthday"})  => {"a" => "2007-01-01 : it's your birthday"},
+    %({"a": " 2007-01-01 01:12:34 Z "})          => { "a" => " 2007-01-01 01:12:34 Z " },
+    %({"a": "2007-01-01 : it's your birthday"})  => { "a" => "2007-01-01 : it's your birthday" },
     %([])    => [],
     %({})    => {},
-    %({"a":1})     => {"a" => 1},
-    %({"a": ""})    => {"a" => ""},
-    %({"a":"\\""}) => {"a" => "\""},
-    %({"a": null})  => {"a" => nil},
-    %({"a": true})  => {"a" => true},
-    %({"a": false}) => {"a" => false},
-    '{"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>"},
-    '{"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>"]},
+    %({"a":1})     => { "a" => 1 },
+    %({"a": ""})    => { "a" => "" },
+    %({"a":"\\""}) => { "a" => "\"" },
+    %({"a": null})  => { "a" => nil },
+    %({"a": true})  => { "a" => true },
+    %({"a": false}) => { "a" => false },
+    '{"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>" },
+    '{"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
     %q([{"d":"1970-01-01", "s":"\u0020escape"},{"d":"1970-01-01", "s":"\u0020escape"}]) =>
-      [{"d" => Date.new(1970, 1, 1), "s" => " escape"},{"d" => Date.new(1970, 1, 1), "s" => " escape"}],
+      [{ "d" => Date.new(1970, 1, 1), "s" => " escape" },{ "d" => Date.new(1970, 1, 1), "s" => " escape" }],
     %q([{"d":"1970-01-01","s":"http:\/\/example.com"},{"d":"1970-01-01","s":"http:\/\/example.com"}]) =>
-      [{"d" => Date.new(1970, 1, 1), "s" => "http://example.com"},
-       {"d" => Date.new(1970, 1, 1), "s" => "http://example.com"}],
+      [{ "d" => Date.new(1970, 1, 1), "s" => "http://example.com" },
+       { "d" => Date.new(1970, 1, 1), "s" => "http://example.com" }],
     # tests escaping of "\n" char with Yaml backend
-    %q({"a":"\n"})  => {"a"=>"\n"},
-    %q({"a":"\u000a"}) => {"a"=>"\n"},
-    %q({"a":"Line1\u000aLine2"}) => {"a"=>"Line1\nLine2"},
+    %q({"a":"\n"})  => { "a"=>"\n" },
+    %q({"a":"\u000a"}) => { "a"=>"\n" },
+    %q({"a":"Line1\u000aLine2"}) => { "a"=>"Line1\nLine2" },
     # prevent json unmarshalling
-    '{"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
     '"a string"' => "a string",
     "1.1" => 1.1,
@@ -89,7 +89,7 @@ class TestJSONDecoding < ActiveSupport::TestCase
 
   test "json decodes time json with time parsing disabled" do
     with_parse_json_times(false) do
-      expected = {"a" => "2007-01-01 01:12:34 Z"}
+      expected = { "a" => "2007-01-01 01:12:34 Z" }
       assert_equal expected, ActiveSupport::JSON.decode(%({"a": "2007-01-01 01:12:34 Z"}))
     end
   end
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index 9c95bf35b8..d125cc939f 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -93,16 +93,16 @@ class TestJSONEncoding < ActiveSupport::TestCase
   end
 
   def test_hash_key_identifiers_are_always_quoted
-    values = {0 => 0, 1 => 1, :_ => :_, "$" => "$", "a" => "a", :A => :A, :A0 => :A0, "A0B" => "A0B"}
+    values = { 0 => 0, 1 => 1, :_ => :_, "$" => "$", "a" => "a", :A => :A, :A0 => :A0, "A0B" => "A0B" }
     assert_equal %w( "$" "A" "A0" "A0B" "_" "a" "0" "1" ).sort, object_keys(ActiveSupport::JSON.encode(values))
   end
 
   def test_hash_should_allow_key_filtering_with_only
-    assert_equal %({"a":1}), ActiveSupport::JSON.encode({"a" => 1, :b => 2, :c => 3}, only: "a")
+    assert_equal %({"a":1}), ActiveSupport::JSON.encode({ "a" => 1, :b => 2, :c => 3 }, only: "a")
   end
 
   def test_hash_should_allow_key_filtering_with_except
-    assert_equal %({"b":2}), ActiveSupport::JSON.encode({"foo" => "bar", :b => 2, :c => 3}, except: ["foo", :c])
+    assert_equal %({"b":2}), ActiveSupport::JSON.encode({ "foo" => "bar", :b => 2, :c => 3 }, except: ["foo", :c])
   end
 
   def test_time_to_json_includes_local_offset
@@ -135,7 +135,7 @@ class TestJSONEncoding < ActiveSupport::TestCase
     h = JSONTest::Hashlike.new
     json = h.to_json only: [:foo]
 
-    assert_equal({"foo"=>"hello"}, JSON.parse(json))
+    assert_equal({ "foo"=>"hello" }, JSON.parse(json))
   end
 
   def test_object_to_json_with_options
@@ -144,7 +144,7 @@ class TestJSONEncoding < ActiveSupport::TestCase
     obj.instance_variable_set :@bar, "world"
     json = obj.to_json only: ["foo"]
 
-    assert_equal({"foo"=>"hello"}, JSON.parse(json))
+    assert_equal({ "foo"=>"hello" }, JSON.parse(json))
   end
 
   def test_struct_to_json_with_options
@@ -153,7 +153,7 @@ class TestJSONEncoding < ActiveSupport::TestCase
     struct.bar = "world"
     json = struct.to_json only: [:foo]
 
-    assert_equal({"foo"=>"hello"}, JSON.parse(json))
+    assert_equal({ "foo"=>"hello" }, JSON.parse(json))
   end
 
   def test_hash_should_pass_encoding_options_to_children_in_as_json
@@ -166,7 +166,7 @@ class TestJSONEncoding < ActiveSupport::TestCase
     }
     json = person.as_json only: [:address, :city]
 
-    assert_equal({ "address" => { "city" => "London" }}, json)
+    assert_equal({ "address" => { "city" => "London" } }, json)
   end
 
   def test_hash_should_pass_encoding_options_to_children_in_to_json
@@ -184,13 +184,13 @@ class TestJSONEncoding < ActiveSupport::TestCase
 
   def test_array_should_pass_encoding_options_to_children_in_as_json
     people = [
-      { name: "John", address: { city: "London", country: "UK" }},
-      { name: "Jean", address: { city: "Paris" , country: "France" }}
+      { name: "John", address: { city: "London", country: "UK" } },
+      { name: "Jean", address: { city: "Paris" , country: "France" } }
     ]
     json = people.as_json only: [:address, :city]
     expected = [
-      { "address" => { "city" => "London" }},
-      { "address" => { "city" => "Paris" }}
+      { "address" => { "city" => "London" } },
+      { "address" => { "city" => "Paris" } }
     ]
 
     assert_equal(expected, json)
@@ -198,8 +198,8 @@ class TestJSONEncoding < ActiveSupport::TestCase
 
   def test_array_should_pass_encoding_options_to_children_in_to_json
     people = [
-      { name: "John", address: { city: "London", country: "UK" }},
-      { name: "Jean", address: { city: "Paris" , country: "France" }}
+      { name: "John", address: { city: "London", country: "UK" } },
+      { name: "Jean", address: { city: "Paris" , country: "France" } }
     ]
     json = people.to_json only: [:address, :city]
 
@@ -210,8 +210,8 @@ class TestJSONEncoding < ActiveSupport::TestCase
     include Enumerable
     def initialize()
       @people = [
-        { name: "John", address: { city: "London", country: "UK" }},
-        { name: "Jean", address: { city: "Paris" , country: "France" }}
+        { name: "John", address: { city: "London", country: "UK" } },
+        { name: "Jean", address: { city: "Paris" , country: "France" } }
       ]
     end
     def each(*, &blk)
@@ -225,8 +225,8 @@ class TestJSONEncoding < ActiveSupport::TestCase
   def test_enumerable_should_generate_json_with_as_json
     json = People.new.as_json only: [:address, :city]
     expected = [
-      { "address" => { "city" => "London" }},
-      { "address" => { "city" => "Paris" }}
+      { "address" => { "city" => "London" } },
+      { "address" => { "city" => "Paris" } }
     ]
 
     assert_equal(expected, json)
@@ -240,8 +240,8 @@ class TestJSONEncoding < ActiveSupport::TestCase
   def test_enumerable_should_pass_encoding_options_to_children_in_as_json
     json = People.new.each.as_json only: [:address, :city]
     expected = [
-      { "address" => { "city" => "London" }},
-      { "address" => { "city" => "Paris" }}
+      { "address" => { "city" => "London" } },
+      { "address" => { "city" => "Paris" } }
     ]
 
     assert_equal(expected, json)
@@ -267,9 +267,9 @@ class TestJSONEncoding < ActiveSupport::TestCase
     f.foo = "hello"
     f.bar = "world"
 
-    hash = {"foo" => f, "other_hash" => {"foo" => "other_foo", "test" => "other_test"}}
-    assert_equal({"foo"=>{"foo"=>"hello","bar"=>"world"},
-                  "other_hash" => {"foo"=>"other_foo","test"=>"other_test"}}, ActiveSupport::JSON.decode(hash.to_json))
+    hash = { "foo" => f, "other_hash" => { "foo" => "other_foo", "test" => "other_test" } }
+    assert_equal({ "foo"=>{ "foo"=>"hello","bar"=>"world" },
+                  "other_hash" => { "foo"=>"other_foo","test"=>"other_test" } }, ActiveSupport::JSON.decode(hash.to_json))
   end
 
   def test_array_to_json_should_not_keep_options_around
@@ -277,9 +277,9 @@ class TestJSONEncoding < ActiveSupport::TestCase
     f.foo = "hello"
     f.bar = "world"
 
-    array = [f, {"foo" => "other_foo", "test" => "other_test"}]
-    assert_equal([{"foo"=>"hello","bar"=>"world"},
-                  {"foo"=>"other_foo","test"=>"other_test"}], ActiveSupport::JSON.decode(array.to_json))
+    array = [f, { "foo" => "other_foo", "test" => "other_test" }]
+    assert_equal([{ "foo"=>"hello","bar"=>"world" },
+                  { "foo"=>"other_foo","test"=>"other_test" }], ActiveSupport::JSON.decode(array.to_json))
   end
 
   class OptionsTest
@@ -290,7 +290,7 @@ class TestJSONEncoding < ActiveSupport::TestCase
 
   def test_hash_as_json_without_options
     json = { foo: OptionsTest.new }.as_json
-    assert_equal({"foo" => :default}, json)
+    assert_equal({ "foo" => :default }, json)
   end
 
   def test_array_as_json_without_options
@@ -316,15 +316,15 @@ class TestJSONEncoding < ActiveSupport::TestCase
       json_custom = custom.to_json
     end
 
-    assert_equal({"name" => "David",
+    assert_equal({ "name" => "David",
                   "sub" => {
                     "name" => "David",
-                    "date" => "2010-01-01" }}, ActiveSupport::JSON.decode(json_custom))
+                    "date" => "2010-01-01" } }, ActiveSupport::JSON.decode(json_custom))
 
-    assert_equal({"name" => "David", "email" => "sample@example.com"},
+    assert_equal({ "name" => "David", "email" => "sample@example.com" },
                  ActiveSupport::JSON.decode(json_strings))
 
-    assert_equal({"name" => "David", "date" => "2010-01-01"},
+    assert_equal({ "name" => "David", "date" => "2010-01-01" },
                  ActiveSupport::JSON.decode(json_string_and_date))
   end
 
diff --git a/activesupport/test/json/encoding_test_cases.rb b/activesupport/test/json/encoding_test_cases.rb
index f8c44f314f..ff2ed3a788 100644
--- a/activesupport/test/json/encoding_test_cases.rb
+++ b/activesupport/test/json/encoding_test_cases.rb
@@ -51,8 +51,8 @@ module JSONTest
     ArrayTests    = [[ ["a", "b", "c"],          %([\"a\",\"b\",\"c\"])        ],
                      [ [1, "a", :b, nil, false], %([1,\"a\",\"b\",null,false]) ]]
 
-    HashTests     = [[ {foo: "bar"}, %({\"foo\":\"bar\"}) ],
-                     [ {1 => 1, 2 => "a", 3 => :b, 4 => nil, 5 => false}, %({\"1\":1,\"2\":\"a\",\"3\":\"b\",\"4\":null,\"5\":false}) ]]
+    HashTests     = [[ { foo: "bar" }, %({\"foo\":\"bar\"}) ],
+                     [ { 1 => 1, 2 => "a", 3 => :b, 4 => nil, 5 => false }, %({\"1\":1,\"2\":\"a\",\"3\":\"b\",\"4\":null,\"5\":false}) ]]
 
     RangeTests    = [[ 1..2,     %("1..2")],
                      [ 1...2,    %("1...2")],
diff --git a/activesupport/test/logger_test.rb b/activesupport/test/logger_test.rb
index 74e94bb9d7..ece4167de9 100644
--- a/activesupport/test/logger_test.rb
+++ b/activesupport/test/logger_test.rb
@@ -78,13 +78,13 @@ class LoggerTest < ActiveSupport::TestCase
 
   def test_should_add_message_passed_as_block_when_using_add
     @logger.level = Logger::INFO
-    @logger.add(Logger::INFO) {@message}
+    @logger.add(Logger::INFO) { @message }
     assert @output.string.include?(@message)
   end
 
   def test_should_add_message_passed_as_block_when_using_shortcut
     @logger.level = Logger::INFO
-    @logger.info {@message}
+    @logger.info { @message }
     assert @output.string.include?(@message)
   end
 
@@ -96,14 +96,14 @@ class LoggerTest < ActiveSupport::TestCase
 
   def test_should_convert_message_to_string_when_passed_in_block
     @logger.level = Logger::INFO
-    @logger.info {@integer_message}
+    @logger.info { @integer_message }
     assert @output.string.include?(@integer_message.to_s)
   end
 
   def test_should_not_evaluate_block_if_message_wont_be_logged
     @logger.level = Logger::INFO
     evaluated = false
-    @logger.add(Logger::DEBUG) {evaluated = true}
+    @logger.add(Logger::DEBUG) { evaluated = true }
     assert evaluated == false
   end
 
diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb
index 9ca9c7c803..54429f4aab 100644
--- a/activesupport/test/multibyte_chars_test.rb
+++ b/activesupport/test/multibyte_chars_test.rb
@@ -208,7 +208,7 @@ class MultibyteCharsUTF8BehaviourTest < ActiveSupport::TestCase
   end
 
   def test_insert_throws_index_error
-    assert_raise(IndexError) { @chars.insert(-12, "わ")}
+    assert_raise(IndexError) { @chars.insert(-12, "わ") }
     assert_raise(IndexError) { @chars.insert(12, "わ") }
   end
 
@@ -479,7 +479,7 @@ class MultibyteCharsUTF8BehaviourTest < ActiveSupport::TestCase
     assert_equal "Hello", chars.method(:capitalize!).call # Defined on Chars
     assert_equal "Hello", chars
     assert_equal "jello", "hello".mb_chars.method(:gsub).call(/h/, "j") # Defined on String
-    assert_raise(NameError){ "".mb_chars.method(:undefined_method) } # Not defined
+    assert_raise(NameError) { "".mb_chars.method(:undefined_method) } # Not defined
   end
 
   def test_acts_like_string
diff --git a/activesupport/test/multibyte_conformance_test.rb b/activesupport/test/multibyte_conformance_test.rb
index a98e542783..bf004d7924 100644
--- a/activesupport/test/multibyte_conformance_test.rb
+++ b/activesupport/test/multibyte_conformance_test.rb
@@ -94,7 +94,7 @@ class MultibyteConformanceTest < ActiveSupport::TestCase
           next unless cols.length == 5
 
           # codepoints are in hex in the test suite, pack wants them as integers
-          cols.map!{|c| c.split.map{|codepoint| codepoint.to_i(16)}.pack("U*") }
+          cols.map! { |c| c.split.map { |codepoint| codepoint.to_i(16) }.pack("U*") }
           cols << comment
 
           yield(*cols)
@@ -103,6 +103,6 @@ class MultibyteConformanceTest < ActiveSupport::TestCase
     end
 
     def inspect_codepoints(str)
-      str.to_s.unpack("U*").map{|cp| cp.to_s(16) }.join(" ")
+      str.to_s.unpack("U*").map { |cp| cp.to_s(16) }.join(" ")
     end
 end
diff --git a/activesupport/test/multibyte_grapheme_break_conformance_test.rb b/activesupport/test/multibyte_grapheme_break_conformance_test.rb
index bb7668acd3..5dc42df08d 100644
--- a/activesupport/test/multibyte_grapheme_break_conformance_test.rb
+++ b/activesupport/test/multibyte_grapheme_break_conformance_test.rb
@@ -40,12 +40,12 @@ class MultibyteGraphemeBreakConformanceTest < ActiveSupport::TestCase
 
           cols, comment = line.split("#")
           # Cluster breaks are represented by ÷
-          clusters = cols.split("÷").map{|e| e.strip}.reject{|e| e.empty? }
+          clusters = cols.split("÷").map { |e| e.strip }.reject { |e| e.empty? }
           clusters = clusters.map do |cluster|
             # Codepoints within each cluster are separated by ×
-            codepoints = cluster.split("×").map{|e| e.strip}.reject{|e| e.empty? }
+            codepoints = cluster.split("×").map { |e| e.strip }.reject { |e| e.empty? }
             # codepoints are in hex in the test suite, pack wants them as integers
-            codepoints.map{|codepoint| codepoint.to_i(16)}
+            codepoints.map { |codepoint| codepoint.to_i(16) }
           end
 
           # The tests contain a solitary U+D800 <Non Private Use High
diff --git a/activesupport/test/multibyte_normalization_conformance_test.rb b/activesupport/test/multibyte_normalization_conformance_test.rb
index 4f1ace4346..716e6487aa 100644
--- a/activesupport/test/multibyte_normalization_conformance_test.rb
+++ b/activesupport/test/multibyte_normalization_conformance_test.rb
@@ -94,11 +94,11 @@ class MultibyteNormalizationConformanceTest < ActiveSupport::TestCase
           next if line.empty? || line.start_with?("#")
 
           cols, comment = line.split("#")
-          cols = cols.split(";").map{|e| e.strip}.reject{|e| e.empty? }
+          cols = cols.split(";").map { |e| e.strip }.reject { |e| e.empty? }
           next unless cols.length == 5
 
           # codepoints are in hex in the test suite, pack wants them as integers
-          cols.map!{|c| c.split.map{|codepoint| codepoint.to_i(16)}.pack("U*") }
+          cols.map! { |c| c.split.map { |codepoint| codepoint.to_i(16) }.pack("U*") }
           cols << comment
 
           yield(*cols)
@@ -107,6 +107,6 @@ class MultibyteNormalizationConformanceTest < ActiveSupport::TestCase
     end
 
     def inspect_codepoints(str)
-      str.to_s.unpack("U*").map{|cp| cp.to_s(16) }.join(" ")
+      str.to_s.unpack("U*").map { |cp| cp.to_s(16) }.join(" ")
     end
 end
diff --git a/activesupport/test/multibyte_test_helpers.rb b/activesupport/test/multibyte_test_helpers.rb
index 29a384729a..22c586c50d 100644
--- a/activesupport/test/multibyte_test_helpers.rb
+++ b/activesupport/test/multibyte_test_helpers.rb
@@ -30,7 +30,7 @@ module MultibyteTestHelpers
   end
 
   def inspect_codepoints(str)
-    str.to_s.unpack("U*").map{|cp| cp.to_s(16) }.join(" ")
+    str.to_s.unpack("U*").map { |cp| cp.to_s(16) }.join(" ")
   end
 
   def assert_equal_codepoints(expected, actual, message=nil)
diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb
index 106aa9c892..a6f0d82e8a 100644
--- a/activesupport/test/notifications_test.rb
+++ b/activesupport/test/notifications_test.rb
@@ -31,7 +31,7 @@ module Notifications
       expected = [name, name]
 
       events   = []
-      callback = lambda {|*_| events << _.first}
+      callback = lambda { |*_| events << _.first }
       ActiveSupport::Notifications.subscribed(callback, name) do
         ActiveSupport::Notifications.instrument(name)
         ActiveSupport::Notifications.instrument(name2)
diff --git a/activesupport/test/number_helper_i18n_test.rb b/activesupport/test/number_helper_i18n_test.rb
index 32e6e22525..4f58e6607a 100644
--- a/activesupport/test/number_helper_i18n_test.rb
+++ b/activesupport/test/number_helper_i18n_test.rb
@@ -26,9 +26,9 @@ module ActiveSupport
           decimal_units: {
             format: "%n %u",
             units: {
-              deci: {one: "Tenth", other: "Tenths"},
+              deci: { one: "Tenth", other: "Tenths" },
               unit: "u",
-              ten: {one: "Ten", other: "Tens"},
+              ten: { one: "Ten", other: "Tens" },
               thousand: "t",
               million: "m",
               billion: "b",
@@ -37,10 +37,10 @@ module ActiveSupport
             }
           }
         },
-        percentage: { format: {delimiter: "", precision: 2, strip_insignificant_zeros: true} },
-        precision: { format: {delimiter: "", significant: true} }
+        percentage: { format: { delimiter: "", precision: 2, strip_insignificant_zeros: true } },
+        precision: { format: { delimiter: "", significant: true } }
       },
-      custom_units_for_number_to_human: {mili: "mm", centi: "cm", deci: "dm", unit: "m", ten: "dam", hundred: "hm", thousand: "km"}
+      custom_units_for_number_to_human: { mili: "mm", centi: "cm", deci: "dm", unit: "m", ten: "dam", hundred: "hm", thousand: "km" }
     end
 
     def teardown
diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb
index cd6f9ad234..1a59210018 100644
--- a/activesupport/test/number_helper_test.rb
+++ b/activesupport/test/number_helper_test.rb
@@ -316,13 +316,13 @@ module ActiveSupport
       def test_number_to_human_with_custom_units
         [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
           #Only integers
-          volume = {unit: "ml", thousand: "lt", million: "m3"}
+          volume = { unit: "ml", thousand: "lt", million: "m3" }
           assert_equal "123 lt", number_helper.number_to_human(123456, units: volume)
           assert_equal "12 ml", number_helper.number_to_human(12, units: volume)
           assert_equal "1.23 m3", number_helper.number_to_human(1234567, units: volume)
 
           #Including fractionals
-          distance = {mili: "mm", centi: "cm", deci: "dm", unit: "m", ten: "dam", hundred: "hm", thousand: "km"}
+          distance = { mili: "mm", centi: "cm", deci: "dm", unit: "m", ten: "dam", hundred: "hm", thousand: "km" }
           assert_equal "1.23 mm", number_helper.number_to_human(0.00123, units: distance)
           assert_equal "1.23 cm", number_helper.number_to_human(0.0123, units: distance)
           assert_equal "1.23 dm", number_helper.number_to_human(0.123, units: distance)
@@ -335,21 +335,21 @@ module ActiveSupport
           assert_equal "12.3 km", number_helper.number_to_human(12300, units: distance)
 
           #The quantifiers don't need to be a continuous sequence
-          gangster = {hundred: "hundred bucks", million: "thousand quids"}
+          gangster = { hundred: "hundred bucks", million: "thousand quids" }
           assert_equal "1 hundred bucks", number_helper.number_to_human(100, units: gangster)
           assert_equal "25 hundred bucks", number_helper.number_to_human(2500, units: gangster)
           assert_equal "25 thousand quids", number_helper.number_to_human(25000000, units: gangster)
           assert_equal "12300 thousand quids", number_helper.number_to_human(12345000000, units: gangster)
 
           #Spaces are stripped from the resulting string
-          assert_equal "4", number_helper.number_to_human(4, units: {unit: "", ten: "tens "})
-          assert_equal "4.5  tens", number_helper.number_to_human(45, units: {unit: "", ten: " tens   "})
+          assert_equal "4", number_helper.number_to_human(4, units: { unit: "", ten: "tens " })
+          assert_equal "4.5  tens", number_helper.number_to_human(45, units: { unit: "", ten: " tens   " })
         end
       end
 
       def test_number_to_human_with_custom_units_that_are_missing_the_needed_key
         [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
-          assert_equal "123", number_helper.number_to_human(123, units: { thousand: "k"})
+          assert_equal "123", number_helper.number_to_human(123, units: { thousand: "k" })
           assert_equal "123", number_helper.number_to_human(123, units: {})
         end
       end
@@ -357,7 +357,7 @@ module ActiveSupport
       def test_number_to_human_with_custom_format
         [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
           assert_equal "123 times Thousand", number_helper.number_to_human(123456, format: "%n times %u")
-          volume = {unit: "ml", thousand: "lt", million: "m3"}
+          volume = { unit: "ml", thousand: "lt", million: "m3" }
           assert_equal "123.lt", number_helper.number_to_human(123456, units: volume, format: "%n.%u")
         end
       end
diff --git a/activesupport/test/option_merger_test.rb b/activesupport/test/option_merger_test.rb
index 2bac550452..c5a6d304ee 100644
--- a/activesupport/test/option_merger_test.rb
+++ b/activesupport/test/option_merger_test.rb
@@ -3,11 +3,11 @@ require "active_support/core_ext/object/with_options"
 
 class OptionMergerTest < ActiveSupport::TestCase
   def setup
-    @options = {hello: "world"}
+    @options = { hello: "world" }
   end
 
   def test_method_with_options_merges_options_when_options_are_present
-    local_options = {cool: true}
+    local_options = { cool: true }
 
     with_options(@options) do |o|
       assert_equal local_options, method_with_options(local_options)
@@ -24,7 +24,7 @@ class OptionMergerTest < ActiveSupport::TestCase
   end
 
   def test_method_with_options_allows_to_overwrite_options
-    local_options = {hello: "moon"}
+    local_options = { hello: "moon" }
     assert_equal @options.keys, local_options.keys
 
     with_options(@options) do |o|
diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb
index f7977b276b..d2dfc34040 100644
--- a/activesupport/test/ordered_hash_test.rb
+++ b/activesupport/test/ordered_hash_test.rb
@@ -94,13 +94,13 @@ class OrderedHashTest < ActiveSupport::TestCase
 
   def test_each
     values = []
-    assert_equal @ordered_hash, @ordered_hash.each {|key, value| values << value}
+    assert_equal @ordered_hash, @ordered_hash.each { |key, value| values << value }
     assert_equal @values, values
     assert_kind_of Enumerator, @ordered_hash.each
   end
 
   def test_each_with_index
-    @ordered_hash.each_with_index { |pair, index| assert_equal [@keys[index], @values[index]], pair}
+    @ordered_hash.each_with_index { |pair, index| assert_equal [@keys[index], @values[index]], pair }
   end
 
   def test_each_pair
@@ -242,7 +242,7 @@ class OrderedHashTest < ActiveSupport::TestCase
   end
 
   def test_nested_under_indifferent_access
-    flash = {a: ActiveSupport::OrderedHash[:b, 1, :c, 2]}.with_indifferent_access
+    flash = { a: ActiveSupport::OrderedHash[:b, 1, :c, 2] }.with_indifferent_access
     assert_kind_of ActiveSupport::OrderedHash, flash[:a]
   end
 
diff --git a/activesupport/test/reloader_test.rb b/activesupport/test/reloader_test.rb
index c6d852cf39..67d8c4b0e3 100644
--- a/activesupport/test/reloader_test.rb
+++ b/activesupport/test/reloader_test.rb
@@ -21,13 +21,13 @@ class ReloaderTest < ActiveSupport::TestCase
     r = new_reloader { true }
     invoked = false
     r.to_run { invoked = true }
-    r.wrap { }
+    r.wrap {}
     assert invoked
 
     r = new_reloader { false }
     invoked = false
     r.to_run { invoked = true }
-    r.wrap { }
+    r.wrap {}
     assert !invoked
   end
 
@@ -39,7 +39,7 @@ class ReloaderTest < ActiveSupport::TestCase
     reloader.executor.to_run { called << :executor_run }
     reloader.executor.to_complete { called << :executor_complete }
 
-    reloader.wrap { }
+    reloader.wrap {}
     assert_equal [:executor_run, :reloader_run, :prepare, :reloader_complete, :executor_complete], called
 
     called = []
@@ -49,7 +49,7 @@ class ReloaderTest < ActiveSupport::TestCase
     reloader.check = lambda { false }
 
     called = []
-    reloader.wrap { }
+    reloader.wrap {}
     assert_equal [:executor_run, :executor_complete], called
 
     called = []
diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb
index 36e262745c..4d083ab773 100644
--- a/activesupport/test/safe_buffer_test.rb
+++ b/activesupport/test/safe_buffer_test.rb
@@ -58,7 +58,7 @@ class SafeBufferTest < ActiveSupport::TestCase
     str  = "hello!"
     data = { "str" => ActiveSupport::SafeBuffer.new(str) }
     yaml = YAML.dump data
-    assert_equal({"str" => str}, YAML.load(yaml))
+    assert_equal({ "str" => str }, YAML.load(yaml))
   end
 
   test "Should work with primitive-like-strings in to_yaml conversion" do
diff --git a/activesupport/test/share_lock_test.rb b/activesupport/test/share_lock_test.rb
index 8155d46934..a5970591fa 100644
--- a/activesupport/test/share_lock_test.rb
+++ b/activesupport/test/share_lock_test.rb
@@ -17,7 +17,7 @@ class ShareLockTest < ActiveSupport::TestCase
 
   def test_sharing_doesnt_block
     with_thread_waiting_in_lock_section(:sharing) do |sharing_thread_latch|
-      assert_threads_not_stuck(Thread.new {@lock.sharing {} })
+      assert_threads_not_stuck(Thread.new { @lock.sharing {} })
     end
   end
 
diff --git a/activesupport/test/transliterate_test.rb b/activesupport/test/transliterate_test.rb
index fd417d4250..040ddd25fc 100644
--- a/activesupport/test/transliterate_test.rb
+++ b/activesupport/test/transliterate_test.rb
@@ -13,7 +13,7 @@ class TransliterateTest < ActiveSupport::TestCase
     # create string with range of Unicode's western characters with
     # diacritics, excluding the division and multiplication signs which for
     # some reason or other are floating in the middle of all the letters.
-    string = (0xC0..0x17E).to_a.reject {|c| [0xD7, 0xF7].include?(c)}.pack("U*")
+    string = (0xC0..0x17E).to_a.reject { |c| [0xD7, 0xF7].include?(c) }.pack("U*")
     string.each_char do |char|
       assert_match %r{^[a-zA-Z']*$}, ActiveSupport::Inflector.transliterate(char)
     end
@@ -21,7 +21,7 @@ class TransliterateTest < ActiveSupport::TestCase
 
   def test_transliterate_should_work_with_custom_i18n_rules_and_uncomposed_utf8
     char = [117, 776].pack("U*") # "ü" as ASCII "u" plus COMBINING DIAERESIS
-    I18n.backend.store_translations(:de, i18n: {transliterate: {rule: {"ü" => "ue"}}})
+    I18n.backend.store_translations(:de, i18n: { transliterate: { rule: { "ü" => "ue" } } })
     default_locale, I18n.locale = I18n.locale, :de
     assert_equal "ue", ActiveSupport::Inflector.transliterate(char)
   ensure
diff --git a/activesupport/test/xml_mini/rexml_engine_test.rb b/activesupport/test/xml_mini/rexml_engine_test.rb
index e616b73162..dc62f3f671 100644
--- a/activesupport/test/xml_mini/rexml_engine_test.rb
+++ b/activesupport/test/xml_mini/rexml_engine_test.rb
@@ -39,6 +39,6 @@ class REXMLEngineTest < ActiveSupport::TestCase
   def test_parse_from_frozen_string
     ActiveSupport::XmlMini.backend = "REXML"
     xml_string = "<root></root>".freeze
-    assert_equal({"root" => {}}, ActiveSupport::XmlMini.parse(xml_string))
+    assert_equal({ "root" => {} }, ActiveSupport::XmlMini.parse(xml_string))
   end
 end
diff --git a/activesupport/test/xml_mini_test.rb b/activesupport/test/xml_mini_test.rb
index 2d79e71343..b15ccfb764 100644
--- a/activesupport/test/xml_mini_test.rb
+++ b/activesupport/test/xml_mini_test.rb
@@ -63,16 +63,16 @@ module XmlMiniTest
 
     def setup
       @xml = ActiveSupport::XmlMini
-      @options = {skip_instruct: true, builder: Builder::XmlMarkup.new}
+      @options = { skip_instruct: true, builder: Builder::XmlMarkup.new }
     end
 
     test "#to_tag accepts a callable object and passes options with the builder" do
-      @xml.to_tag(:some_tag, lambda {|o| o[:builder].br }, @options)
+      @xml.to_tag(:some_tag, lambda { |o| o[:builder].br }, @options)
       assert_xml "<br/>"
     end
 
     test "#to_tag accepts a callable object and passes options and tag name" do
-      @xml.to_tag(:tag, lambda {|o, t| o[:builder].b(t) }, @options)
+      @xml.to_tag(:tag, lambda { |o, t| o[:builder].b(t) }, @options)
       assert_xml "<b>tag</b>"
     end
 
@@ -317,13 +317,13 @@ product:
 YAML
       expected = {
         "product"=> [
-          {"sku"=>"BL394D", "quantity"=>4, "description"=>"Basketball"}
+          { "sku"=>"BL394D", "quantity"=>4, "description"=>"Basketball" }
         ]
       }
       parser = @parsing["yaml"]
       assert_equal(expected, parser.call(yaml))
-      assert_equal({1 => "test"}, parser.call(1 => "test"))
-      assert_equal({"1 => 'test'"=>nil}, parser.call("{1 => 'test'}"))
+      assert_equal({ 1 => "test" }, parser.call(1 => "test"))
+      assert_equal({ "1 => 'test'"=>nil }, parser.call("{1 => 'test'}"))
     end
 
     def test_base64Binary_and_binary