Merge [5816] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5817 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Jan 1, 2007 · a68d1d3 · a68d1d3
1 parent a4e70d3
commit a68d1d3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
@@ -725,9 +725,10 @@ def test_load_once_constants_should_not_be_unloaded
   def test_load_once_paths_should_behave_when_recursively_loading
     with_loading 'dependencies', 'autoloading_fixtures' do
       Dependencies.load_once_paths = [Dependencies.load_paths.last]
-      CrossSiteDepender.nil?
+      assert !defined?(CrossSiteDependency)
+      assert_nothing_raised { CrossSiteDepender.nil? }
       assert defined?(CrossSiteDependency)
-      assert ! Dependencies.autoloaded?(CrossSiteDependency),
+      assert !Dependencies.autoloaded?(CrossSiteDependency),
         "CrossSiteDependency shouldn't be marked as autoloaded!"
       Dependencies.clear
       assert defined?(CrossSiteDependency),