Dependencies clean up

Cleans up four items I came across in ActiveSupport::Dependencies:

- DependenciesTest#
  test_dependency_which_raises_exception_isnt_added_to_loaded_set:
  Fixes current implementation which will pass no matter what since the
  filepath is never added to "loaded" or "history" without being
  expanded first.
- Remove DependenciesTest#test_unhook. Seems leftover from when
  alias_method_chain was used in Loadable and ModuleConstMissing.
  The test will always pass since Module never responds to those methods
- WatchStack#new_constants documentation: update self to @stack.
  Looks like self was leftover from when WatchStack inherited from Hash
- Remove ActiveSupport namespace from call to
  Dependencies.constant_watch_stack.watching? since the namespace is not
  needed, Dependencies is called two other times in the same method
  without it (even on the same line) and it brings the line to within
  80 characters

2 files changed, 6 insertions, 13 deletions

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index af18ff746f..fd9fbff96a 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -145,9 +145,9 @@ module ActiveSupport #:nodoc:
           # Get a list of the constants that were added
           new_constants = mod.local_constants - original_constants
 
-          # self[namespace] returns an Array of the constants that are being evaluated
+          # @stack[namespace] returns an Array of the constants that are being evaluated
           # for that namespace. For instance, if parent.rb requires child.rb, the first
-          # element of self[Object] will be an Array of the constants that were present
+          # element of @stack[Object] will be an Array of the constants that were present
           # before parent.rb was required. The second element will be an Array of the
           # constants that were present before child.rb was required.
           @stack[namespace].each do |namespace_constants|
@@ -262,7 +262,7 @@ module ActiveSupport #:nodoc:
       end
 
       def load_dependency(file)
-        if Dependencies.load? && ActiveSupport::Dependencies.constant_watch_stack.watching?
+        if Dependencies.load? && Dependencies.constant_watch_stack.watching?
           Dependencies.new_constants_in(Object) { yield }
         else
           yield
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 757e600646..b7a5747f1b 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -76,6 +76,7 @@ class DependenciesTest < ActiveSupport::TestCase
   def test_dependency_which_raises_exception_isnt_added_to_loaded_set
     with_loading do
       filename = 'dependencies/raises_exception'
+      expanded = File.expand_path(filename)
       $raises_exception_load_count = 0
 
       5.times do |count|
@@ -86,8 +87,8 @@ class DependenciesTest < ActiveSupport::TestCase
         assert_equal 'Loading me failed, so do not add to loaded or history.', e.message
         assert_equal count + 1, $raises_exception_load_count
 
-        assert_not ActiveSupport::Dependencies.loaded.include?(filename)
-        assert_not ActiveSupport::Dependencies.history.include?(filename)
+        assert_not ActiveSupport::Dependencies.loaded.include?(expanded)
+        assert_not ActiveSupport::Dependencies.history.include?(expanded)
       end
     end
   end
@@ -1047,12 +1048,4 @@ class DependenciesTest < ActiveSupport::TestCase
   ensure
     ActiveSupport::Dependencies.hook!
   end
-
-  def test_unhook
-    ActiveSupport::Dependencies.unhook!
-    assert !Module.new.respond_to?(:const_missing_without_dependencies)
-    assert !Module.new.respond_to?(:load_without_new_constant_marking)
-  ensure
-    ActiveSupport::Dependencies.hook!
-  end
 end