Fix logic error in determining what was loaded by a given file. Closes #6039.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5035 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 18 insertions, 0 deletions

diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index c80e35c5f6..fcd2889ac2 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -428,4 +428,22 @@ class DependenciesTest < Test::Unit::TestCase
     end
   end
   
+  def test_preexisting_constants_are_not_marked_as_autoloaded
+    with_loading 'autoloading_fixtures' do
+      require_dependency 'e'
+      assert Dependencies.autoloaded?(:E)
+      Dependencies.clear
+    end
+    
+    Object.const_set :E, Class.new
+    with_loading 'autoloading_fixtures' do
+      require_dependency 'e'
+      assert ! Dependencies.autoloaded?(:E), "E shouldn't be marked autoloaded!"
+      Dependencies.clear
+    end
+    
+  ensure
+    Object.send :remove_const, :E if Object.const_defined?(:E)
+  end
+  
 end