Merge commit 'mainstream/master'

2 files changed, 7 insertions, 1 deletions

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index eaba46dd9c..25225d5615 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -384,7 +384,7 @@ module Dependencies #:nodoc:
     return new_constants
   ensure
     # Remove the stack frames that we added.
-    if defined?(watch_frames) && ! watch_frames.empty?
+    if defined?(watch_frames) && ! watch_frames.blank?
       frame_ids = watch_frames.collect(&:object_id)
       constant_watch_stack.delete_if do |watch_frame|
         frame_ids.include? watch_frame.object_id
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 9e98e764fd..1e19e12da9 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -584,6 +584,12 @@ class DependenciesTest < Test::Unit::TestCase
     assert_equal [], m
   end
 
+  def test_new_constants_in_with_illegal_module_name_raises_correct_error
+    assert_raises(NameError) do
+      Dependencies.new_constants_in("Illegal-Name") {}
+    end
+  end
+
   def test_file_with_multiple_constants_and_require_dependency
     with_loading 'autoloading_fixtures' do
       assert ! defined?(MultipleConstantFile)