diff options
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/dependencies_test.rb | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 8b77ede4e2..2fc164b65e 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix broken tests caused by incomplete loading of active support. [Nicholas Seckar] + * Fix status pluralization bug so status_codes doesn't get pluralized as statuses_code. #2758 [keithm@infused.org] * Added Kernel#silence_stderr to silence stderr for the duration of the given block [Sam Stephenson] diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 152db5b189..26466097e8 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -1,4 +1,5 @@ require File.dirname(__FILE__) + '/module_attribute_accessors' +require File.dirname(__FILE__) + '/core_ext/load_error' module Dependencies #:nodoc: extend self diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index a34fc0d323..767795f6ac 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -20,7 +20,7 @@ class DependenciesTest < Test::Unit::TestCase end def test_require_missing_dependency - assert_raises(LoadError) { require_dependency("missing_service") } + assert_raises(MissingSourceFile) { require_dependency("missing_service") } end def test_require_missing_association |