3 files changed, 30 insertions, 0 deletions
diff --git a/activesupport/test/autoloading_fixtures/raises_arbitrary_exception.rb b/activesupport/test/autoloading_fixtures/raises_arbitrary_exception.rb
new file mode 100644
index 0000000000..404ae289c6
--- /dev/null
+++ b/activesupport/test/autoloading_fixtures/raises_arbitrary_exception.rb
@@ -0,0 +1,4 @@
+RaisesArbitraryException = 1
+A::B # Autoloading recursion, also expected to be watched and discarded.
+
+raise Exception, 'arbitray exception message'
diff --git a/activesupport/test/autoloading_fixtures/throws.rb b/activesupport/test/autoloading_fixtures/throws.rb
new file mode 100644
index 0000000000..5e47b9699b
--- /dev/null
+++ b/activesupport/test/autoloading_fixtures/throws.rb
@@ -0,0 +1,4 @@
+Throws = 1
+A::B # Autoloading recursion, expected to be discarded.
+
+throw :t
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index b7a5747f1b..04e7b24d30 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -269,6 +269,28 @@ class DependenciesTest < ActiveSupport::TestCase
     remove_constants(:ModuleFolder)
   end
 
+  def test_raising_discards_autoloaded_constants
+    with_autoloading_fixtures do
+      assert_raises(Exception, 'arbitray exception message') { RaisesArbitraryException }
+      assert_not defined?(A)
+      assert_not defined?(RaisesArbitraryException)
+    end
+  ensure
+    remove_constants(:A, :RaisesArbitraryException)
+  end
+
+  def test_throwing_discards_autoloaded_constants
+    with_autoloading_fixtures do
+      catch :t do
+        Throws
+      end
+      assert_not defined?(A)
+      assert_not defined?(Throws)
+    end
+  ensure
+    remove_constants(:A, :Throws)
+  end
+
   def test_doesnt_break_normal_require
     path = File.expand_path("../autoloading_fixtures/load_path", __FILE__)
     original_path = $:.dup