5 files changed, 45 insertions, 4 deletions
diff --git a/activesupport/test/autoloading_fixtures/typo.rb b/activesupport/test/autoloading_fixtures/typo.rb
new file mode 100644
index 0000000000..8e047f5fd4
--- /dev/null
+++ b/activesupport/test/autoloading_fixtures/typo.rb
@@ -0,0 +1,2 @@
+TypO = 1
+
diff --git a/activesupport/test/core_ext/object/try_test.rb b/activesupport/test/core_ext/object/try_test.rb
index 225c20fa36..efc6beaf02 100644
--- a/activesupport/test/core_ext/object/try_test.rb
+++ b/activesupport/test/core_ext/object/try_test.rb
@@ -30,10 +30,6 @@ class ObjectTryTest < ActiveSupport::TestCase
     assert_raise(NoMethodError) { @string.try!(method, 'llo', 'y') }
   end
 
-  def test_try_only_block_bang
-    assert_equal @string.reverse, @string.try! { |s| s.reverse }
-  end
-
   def test_valid_method
     assert_equal 5, @string.try(:size)
   end
@@ -59,6 +55,10 @@ class ObjectTryTest < ActiveSupport::TestCase
     assert_equal @string.reverse, @string.try { |s| s.reverse }
   end
 
+  def test_try_only_block_bang
+    assert_equal @string.reverse, @string.try! { |s| s.reverse }
+  end
+
   def test_try_only_block_nil
     ran = false
     nil.try { ran = true }
@@ -69,6 +69,10 @@ class ObjectTryTest < ActiveSupport::TestCase
     assert_equal @string.reverse, @string.try { reverse }
   end
 
+  def test_try_with_instance_eval_block_bang
+    assert_equal @string.reverse, @string.try! { reverse }
+  end
+
   def test_try_with_private_method_bang
     klass = Class.new do
       private
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 899bb75eae..f2f60167c4 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -157,6 +157,31 @@ class DependenciesTest < ActiveSupport::TestCase
     end
   end
 
+  def test_ensures_the_expected_constant_is_defined
+    with_autoloading_fixtures do
+      e = assert_raise(LoadError) { Typo }
+      assert_match %r{Unable to autoload constant Typo, expected .*activesupport/test/autoloading_fixtures/typo.rb to define it}, e.message
+    end
+  end
+
+  def test_require_dependency_does_not_assume_any_particular_constant_is_defined
+    with_autoloading_fixtures do
+      require_dependency 'typo'
+      assert_equal 1, TypO
+    end
+  end
+
+  # Regression, see https://github.com/rails/rails/issues/16468.
+  def test_require_dependency_interaction_with_autoloading
+    with_autoloading_fixtures do
+      require_dependency 'typo'
+      assert_equal 1, TypO
+
+      e = assert_raise(LoadError) { Typo }
+      assert_match %r{Unable to autoload constant Typo, expected .*activesupport/test/autoloading_fixtures/typo.rb to define it}, e.message
+    end
+  end
+
   def test_module_loading
     with_autoloading_fixtures do
       assert_kind_of Module, A
diff --git a/activesupport/test/dependencies_test_helpers.rb b/activesupport/test/dependencies_test_helpers.rb
index 9268512a97..e4d5197112 100644
--- a/activesupport/test/dependencies_test_helpers.rb
+++ b/activesupport/test/dependencies_test_helpers.rb
@@ -13,6 +13,7 @@ module DependenciesTestHelpers
     ActiveSupport::Dependencies.autoload_paths = prior_autoload_paths
     ActiveSupport::Dependencies.mechanism = old_mechanism
     ActiveSupport::Dependencies.explicitly_unloadable_constants = []
+    ActiveSupport::Dependencies.clear
   end
 
   def with_autoloading_fixtures(&block)
diff --git a/activesupport/test/security_utils_test.rb b/activesupport/test/security_utils_test.rb
new file mode 100644
index 0000000000..08d2e3baa6
--- /dev/null
+++ b/activesupport/test/security_utils_test.rb
@@ -0,0 +1,9 @@
+require 'abstract_unit'
+require 'active_support/security_utils'
+
+class SecurityUtilsTest < ActiveSupport::TestCase
+  def test_secure_compare_should_perform_string_comparison
+    assert ActiveSupport::SecurityUtils.secure_compare('a', 'a')
+    assert !ActiveSupport::SecurityUtils.secure_compare('a', 'b')
+  end
+end