Permalink
Browse files

Merge [5816] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5817 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent a4e70d3 commit a68d1d35f86da04290a501748b35d7d6b3bb6ef3 @jeremy jeremy committed Jan 1, 2007
Showing with 3 additions and 2 deletions.
  1. +3 −2 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),

0 comments on commit a68d1d3

Please sign in to comment.