12 files changed, 60 insertions, 47 deletions
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index acd320dbe0..571be5f296 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -405,7 +405,7 @@ module CacheStoreBehavior
 end
 
 # https://rails.lighthouseapp.com/projects/8994/tickets/6225-memcachestore-cant-deal-with-umlauts-and-special-characters
-# The error is caused by charcter encodings that can't be compared with ASCII-8BIT regular expressions and by special
+# The error is caused by character encodings that can't be compared with ASCII-8BIT regular expressions and by special
 # characters like the umlaut in UTF-8.
 module EncodedKeyCacheBehavior
   Encoding.list.each do |encoding|
diff --git a/activesupport/test/callback_inheritance_test.rb b/activesupport/test/callback_inheritance_test.rb
index 6be8ea8b84..1adfe4edf4 100644
--- a/activesupport/test/callback_inheritance_test.rb
+++ b/activesupport/test/callback_inheritance_test.rb
@@ -109,7 +109,6 @@ class BasicCallbacksTest < ActiveSupport::TestCase
     @index    = GrandParent.new("index").dispatch
     @update   = GrandParent.new("update").dispatch
     @delete   = GrandParent.new("delete").dispatch
-    @unknown  = GrandParent.new("unknown").dispatch
   end
 
   def test_basic_conditional_callback1
@@ -130,7 +129,6 @@ class InheritedCallbacksTest < ActiveSupport::TestCase
     @index    = Parent.new("index").dispatch
     @update   = Parent.new("update").dispatch
     @delete   = Parent.new("delete").dispatch
-    @unknown  = Parent.new("unknown").dispatch
   end
 
   def test_inherited_excluded
diff --git a/activesupport/test/core_ext/class/attribute_test.rb b/activesupport/test/core_ext/class/attribute_test.rb
index 1c3ba8a7a0..e7a1334db3 100644
--- a/activesupport/test/core_ext/class/attribute_test.rb
+++ b/activesupport/test/core_ext/class/attribute_test.rb
@@ -27,7 +27,7 @@ class ClassAttributeTest < ActiveSupport::TestCase
     assert_equal 1, Class.new(@sub).setting
   end
 
-  test 'query method' do
+  test 'predicate method' do
     assert_equal false, @klass.setting?
     @klass.setting = 1
     assert_equal true, @klass.setting?
@@ -48,7 +48,7 @@ class ClassAttributeTest < ActiveSupport::TestCase
     assert_equal 1, object.setting
   end
 
-  test 'instance query' do
+  test 'instance predicate' do
     object = @klass.new
     assert_equal false, object.setting?
     object.setting = 1
@@ -73,6 +73,11 @@ class ClassAttributeTest < ActiveSupport::TestCase
     assert_raise(NoMethodError) { object.setting = 'boom' }
   end
 
+  test 'disabling instance predicate' do
+    object = Class.new { class_attribute :setting, instance_predicate: false }.new
+    assert_raise(NoMethodError) { object.setting? }
+  end
+
   test 'works well with singleton classes' do
     object = @klass.new
     object.singleton_class.setting = 'foo'
diff --git a/activesupport/test/core_ext/enumerable_test.rb b/activesupport/test/core_ext/enumerable_test.rb
index 0a1abac767..6781e3c20e 100644
--- a/activesupport/test/core_ext/enumerable_test.rb
+++ b/activesupport/test/core_ext/enumerable_test.rb
@@ -24,10 +24,8 @@ class EnumerableTests < ActiveSupport::TestCase
   def test_group_by
     names = %w(marcel sam david jeremy)
     klass = Struct.new(:name)
-    objects = (1..50).inject([]) do |people,|
-      p = klass.new
-      p.name = names.sort_by { rand }.first
-      people << p
+    objects = (1..50).map do
+      klass.new names.sample
     end
 
     enum = GenericEnumerable.new(objects)
diff --git a/activesupport/test/descendants_tracker_with_autoloading_test.rb b/activesupport/test/descendants_tracker_with_autoloading_test.rb
index ab1be296f8..a2ae066a21 100644
--- a/activesupport/test/descendants_tracker_with_autoloading_test.rb
+++ b/activesupport/test/descendants_tracker_with_autoloading_test.rb
@@ -6,7 +6,7 @@ require 'descendants_tracker_test_cases'
 class DescendantsTrackerWithAutoloadingTest < ActiveSupport::TestCase
   include DescendantsTrackerTestCases
 
-  def test_clear_with_autoloaded_parent_children_and_granchildren
+  def test_clear_with_autoloaded_parent_children_and_grandchildren
     mark_as_autoloaded(*ALL) do
       ActiveSupport::DescendantsTracker.clear
       ALL.each do |k|
@@ -15,7 +15,7 @@ class DescendantsTrackerWithAutoloadingTest < ActiveSupport::TestCase
     end
   end
 
-  def test_clear_with_autoloaded_children_and_granchildren
+  def test_clear_with_autoloaded_children_and_grandchildren
     mark_as_autoloaded Child1, Grandchild1, Grandchild2 do
       ActiveSupport::DescendantsTracker.clear
       assert_equal_sets [Child2], Parent.descendants
@@ -23,7 +23,7 @@ class DescendantsTrackerWithAutoloadingTest < ActiveSupport::TestCase
     end
   end
 
-  def test_clear_with_autoloaded_granchildren
+  def test_clear_with_autoloaded_grandchildren
     mark_as_autoloaded Grandchild1, Grandchild2 do
       ActiveSupport::DescendantsTracker.clear
       assert_equal_sets [Child1, Child2], Parent.descendants
diff --git a/activesupport/test/ordered_options_test.rb b/activesupport/test/ordered_options_test.rb
index f60f9a58e3..fdc745b23b 100644
--- a/activesupport/test/ordered_options_test.rb
+++ b/activesupport/test/ordered_options_test.rb
@@ -7,13 +7,13 @@ class OrderedOptionsTest < ActiveSupport::TestCase
 
     assert_nil a[:not_set]
 
-    a[:allow_concurreny] = true
+    a[:allow_concurrency] = true
     assert_equal 1, a.size
-    assert a[:allow_concurreny]
+    assert a[:allow_concurrency]
 
-    a[:allow_concurreny] = false
+    a[:allow_concurrency] = false
     assert_equal 1, a.size
-    assert !a[:allow_concurreny]
+    assert !a[:allow_concurrency]
 
     a["else_where"] = 56
     assert_equal 2, a.size
@@ -23,10 +23,10 @@ class OrderedOptionsTest < ActiveSupport::TestCase
   def test_looping
     a = ActiveSupport::OrderedOptions.new
 
-    a[:allow_concurreny] = true
+    a[:allow_concurrency] = true
     a["else_where"] = 56
 
-    test = [[:allow_concurreny, true], [:else_where, 56]]
+    test = [[:allow_concurrency, true], [:else_where, 56]]
 
     a.each_with_index do |(key, value), index|
       assert_equal test[index].first, key
@@ -39,13 +39,13 @@ class OrderedOptionsTest < ActiveSupport::TestCase
 
     assert_nil a.not_set
 
-    a.allow_concurreny = true
+    a.allow_concurrency = true
     assert_equal 1, a.size
-    assert a.allow_concurreny
+    assert a.allow_concurrency
 
-    a.allow_concurreny = false
+    a.allow_concurrency = false
     assert_equal 1, a.size
-    assert !a.allow_concurreny
+    assert !a.allow_concurrency
 
     a.else_where = 56
     assert_equal 2, a.size
diff --git a/activesupport/test/xml_mini/jdom_engine_test.rb b/activesupport/test/xml_mini/jdom_engine_test.rb
index 2dfdde5c62..904ef7b208 100644
--- a/activesupport/test/xml_mini/jdom_engine_test.rb
+++ b/activesupport/test/xml_mini/jdom_engine_test.rb
@@ -176,10 +176,11 @@ if RUBY_PLATFORM =~ /java/
     end
 
     private
-    def assert_equal_rexml(xml)
-      hash = XmlMini.with_backend('REXML') { XmlMini.parse(xml) }
-      assert_equal(hash, XmlMini.parse(xml))
-    end
+      def assert_equal_rexml(xml)
+        parsed_xml = XmlMini.parse(xml)
+        hash = XmlMini.with_backend('REXML') { parsed_xml }
+        assert_equal(hash, parsed_xml)
+      end
   end
 
 else
diff --git a/activesupport/test/xml_mini/libxml_engine_test.rb b/activesupport/test/xml_mini/libxml_engine_test.rb
index 36ac4161ea..e7cb350663 100644
--- a/activesupport/test/xml_mini/libxml_engine_test.rb
+++ b/activesupport/test/xml_mini/libxml_engine_test.rb
@@ -141,7 +141,7 @@ class LibxmlEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-    XmlMini.parse(io)
+    assert_equal_rexml(io)
   end
 
   def test_children_with_simple_cdata
@@ -193,10 +193,11 @@ class LibxmlEngineTest < ActiveSupport::TestCase
 
 
   private
-  def assert_equal_rexml(xml)
-    hash = XmlMini.with_backend('REXML') { XmlMini.parse(xml) }
-    assert_equal(hash, XmlMini.parse(xml))
-  end
+    def assert_equal_rexml(xml)
+      parsed_xml = XmlMini.parse(xml)
+      hash = XmlMini.with_backend('REXML') { parsed_xml }
+      assert_equal(hash, parsed_xml)
+    end
 end
 
 end
diff --git a/activesupport/test/xml_mini/libxmlsax_engine_test.rb b/activesupport/test/xml_mini/libxmlsax_engine_test.rb
index 82337961a1..07485911c9 100644
--- a/activesupport/test/xml_mini/libxmlsax_engine_test.rb
+++ b/activesupport/test/xml_mini/libxmlsax_engine_test.rb
@@ -141,7 +141,7 @@ class LibXMLSAXEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-    XmlMini.parse(io)
+    assert_equal_rexml(io)
   end
 
   def test_children_with_simple_cdata
@@ -184,10 +184,11 @@ class LibXMLSAXEngineTest < ActiveSupport::TestCase
   end
 
   private
-  def assert_equal_rexml(xml)
-    hash = XmlMini.with_backend('REXML') { XmlMini.parse(xml) }
-    assert_equal(hash, XmlMini.parse(xml))
-  end
+    def assert_equal_rexml(xml)
+      parsed_xml = XmlMini.parse(xml)
+      hash = XmlMini.with_backend('REXML') { parsed_xml }
+      assert_equal(hash, parsed_xml)
+    end
 end
 
 end
diff --git a/activesupport/test/xml_mini/nokogiri_engine_test.rb b/activesupport/test/xml_mini/nokogiri_engine_test.rb
index 71f57e43d2..937517786e 100644
--- a/activesupport/test/xml_mini/nokogiri_engine_test.rb
+++ b/activesupport/test/xml_mini/nokogiri_engine_test.rb
@@ -155,7 +155,7 @@ class NokogiriEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-    XmlMini.parse(io)
+    assert_equal_rexml(io)
   end
 
   def test_children_with_simple_cdata
@@ -206,10 +206,11 @@ class NokogiriEngineTest < ActiveSupport::TestCase
   end
 
   private
-  def assert_equal_rexml(xml)
-    hash = XmlMini.with_backend('REXML') { XmlMini.parse(xml) }
-    assert_equal(hash, XmlMini.parse(xml))
-  end
+    def assert_equal_rexml(xml)
+      parsed_xml = XmlMini.parse(xml)
+      hash = XmlMini.with_backend('REXML') { parsed_xml }
+      assert_equal(hash, parsed_xml)
+    end
 end
 
 end
diff --git a/activesupport/test/xml_mini/nokogirisax_engine_test.rb b/activesupport/test/xml_mini/nokogirisax_engine_test.rb
index 884494e95e..d4f63f6bd0 100644
--- a/activesupport/test/xml_mini/nokogirisax_engine_test.rb
+++ b/activesupport/test/xml_mini/nokogirisax_engine_test.rb
@@ -156,7 +156,7 @@ class NokogiriSAXEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-    XmlMini.parse(io)
+    assert_equal_rexml(io)
   end
 
   def test_children_with_simple_cdata
@@ -207,10 +207,11 @@ class NokogiriSAXEngineTest < ActiveSupport::TestCase
   end
 
   private
-  def assert_equal_rexml(xml)
-    hash = XmlMini.with_backend('REXML') { XmlMini.parse(xml) }
-    assert_equal(hash, XmlMini.parse(xml))
-  end
+    def assert_equal_rexml(xml)
+      parsed_xml = XmlMini.parse(xml)
+      hash = XmlMini.with_backend('REXML') { parsed_xml }
+      assert_equal(hash, parsed_xml)
+    end
 end
 
 end
diff --git a/activesupport/test/xml_mini/rexml_engine_test.rb b/activesupport/test/xml_mini/rexml_engine_test.rb
index c4770405f2..70a3b918fd 100644
--- a/activesupport/test/xml_mini/rexml_engine_test.rb
+++ b/activesupport/test/xml_mini/rexml_engine_test.rb
@@ -24,6 +24,13 @@ class REXMLEngineTest < ActiveSupport::TestCase
       morning
     </root>
     eoxml
-    XmlMini.parse(io)
+    assert_equal_rexml(io)
   end
+
+  private
+    def assert_equal_rexml(xml)
+      parsed_xml = XmlMini.parse(xml)
+      hash = XmlMini.with_backend('REXML') { parsed_xml }
+      assert_equal(hash, parsed_xml)
+    end
 end