aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2011-06-01 01:05:17 +0100
committerAndrew White <andyw@pixeltrix.co.uk>2011-06-01 01:16:20 +0100
commitcf3364a03c665374f6419a8875474ebf8623ea67 (patch)
tree29d501af200663c0367df2c3754f3bacebbd2079 /activesupport/test
parenteb7ef2ccd618bc87451b980722ec73ee41c203a1 (diff)
downloadrails-cf3364a03c665374f6419a8875474ebf8623ea67.tar.gz
rails-cf3364a03c665374f6419a8875474ebf8623ea67.tar.bz2
rails-cf3364a03c665374f6419a8875474ebf8623ea67.zip
Raise NameError instead of ArgumentError in ActiveSupport::Dependencies
ActiveSupport::Dependencies now raises NameError if it finds an existing constant in load_missing_constant. This better reflects the nature of the error which is usually caused by calling constantize on a nested constant. Closes #1423
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/dependencies_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 2ddbce5150..b4edf0f51d 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -441,7 +441,7 @@ class DependenciesTest < Test::Unit::TestCase
with_autoloading_fixtures do
require_dependency '././counting_loader'
assert_equal 1, $counting_loaded_times
- assert_raise(ArgumentError) { ActiveSupport::Dependencies.load_missing_constant Object, :CountingLoader }
+ assert_raise(NameError) { ActiveSupport::Dependencies.load_missing_constant Object, :CountingLoader }
assert_equal 1, $counting_loaded_times
end
end