aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/dependencies_test.rb
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-08-16 20:33:31 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-08-16 20:33:31 +0000
commit38f598ec0b28919ff0d996bcb9ed923fbd99316f (patch)
treed0701ccbe7c68a3fdd8becb0c5c5946ad56ffa73 /activesupport/test/dependencies_test.rb
parent50be89b609a5d37ed0ab2e3ddbbea8082989a772 (diff)
downloadrails-38f598ec0b28919ff0d996bcb9ed923fbd99316f.tar.gz
rails-38f598ec0b28919ff0d996bcb9ed923fbd99316f.tar.bz2
rails-38f598ec0b28919ff0d996bcb9ed923fbd99316f.zip
Update require_dependency to return true or false as require does.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4778 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/test/dependencies_test.rb')
-rw-r--r--activesupport/test/dependencies_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 3d0ada47f1..f4b173101b 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -61,11 +61,11 @@ class DependenciesTest < Test::Unit::TestCase
end
def test_warnings_should_be_enabled_on_first_load
- with_loading do
+ with_loading 'dependencies' do
old_warnings, Dependencies.warnings_on_first_load = Dependencies.warnings_on_first_load, true
- filename = "#{File.dirname(__FILE__)}/dependencies/check_warnings"
- expanded = File.expand_path(filename)
+ filename = "check_warnings"
+ expanded = File.expand_path("test/dependencies/#{filename}")
$check_warnings_load_count = 0
assert !Dependencies.loaded.include?(expanded)