aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-01-01 00:25:30 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-01-01 00:25:30 +0000
commit0a06ffc08e918383e4bc81eaa68b512d763e97be (patch)
tree60fb15e6b35c9288bee018cba6c115cf8d79993b
parentcbe0c3c54f342ec74ced50f272be3f8d6ff7a2dd (diff)
downloadrails-0a06ffc08e918383e4bc81eaa68b512d763e97be.tar.gz
rails-0a06ffc08e918383e4bc81eaa68b512d763e97be.tar.bz2
rails-0a06ffc08e918383e4bc81eaa68b512d763e97be.zip
tighten test_load_once_paths_should_behave_when_recursively_loading
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5816 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--activesupport/test/dependencies_test.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index c0b6d89c66..755cff2e3f 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -725,9 +725,10 @@ class DependenciesTest < Test::Unit::TestCase
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),