diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-11 10:22:09 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-11 10:22:09 -0800 |
commit | 5d2b5ba23e93f4fd4992c418c9bb2fc721df4206 (patch) | |
tree | fea6d6473015f03499388e0a60ee13680179695c /activesupport/test | |
parent | 17ac2a248282ed34b694ebd4fc651d6a0eb1a23d (diff) | |
parent | cbb38bbdba0f7cfb628a0f8716e79d0d079fd7bf (diff) | |
download | rails-5d2b5ba23e93f4fd4992c418c9bb2fc721df4206.tar.gz rails-5d2b5ba23e93f4fd4992c418c9bb2fc721df4206.tar.bz2 rails-5d2b5ba23e93f4fd4992c418c9bb2fc721df4206.zip |
Merge branch 'master' into testing
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/dependencies_test.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index 6c3bd1a4fd..fe04b91f2b 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -694,17 +694,17 @@ class DependenciesTest < Test::Unit::TestCase with_loading 'autoloading_fixtures' do ActiveSupport::Dependencies.mechanism = :require 2.times do - assert_raise(NameError) {"RaisesNameError".constantize} + assert_raise(NameError) { assert_equal 123, ::RaisesNameError::FooBarBaz } end end end def test_autoload_doesnt_shadow_name_error with_loading 'autoloading_fixtures' do - assert !defined?(::RaisesNameError), "::RaisesNameError is defined but it hasn't been referenced yet!" + Object.send(:remove_const, :RaisesNameError) if defined?(::RaisesNameError) 2.times do begin - ::RaisesNameError.object_id + ::RaisesNameError::FooBarBaz.object_id flunk 'should have raised NameError when autoloaded file referenced FooBarBaz' rescue NameError => e assert_equal 'uninitialized constant RaisesNameError::FooBarBaz', e.message @@ -712,9 +712,9 @@ class DependenciesTest < Test::Unit::TestCase assert !defined?(::RaisesNameError), "::RaisesNameError is defined but it should have failed!" end - assert !defined?(RaisesNameError) + assert !defined?(::RaisesNameError) 2.times do - assert_raise(NameError) { RaisesNameError } + assert_raise(NameError) { ::RaisesNameError } assert !defined?(::RaisesNameError), "::RaisesNameError is defined but it should have failed!" end end |