From a68d1d35f86da04290a501748b35d7d6b3bb6ef3 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 1 Jan 2007 00:25:58 +0000 Subject: [PATCH] Merge [5816] from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5817 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/test/dependencies_test.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index c0b6d89c66064..755cff2e3fc42 100644 --- 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),