aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-11-30 15:59:30 -0600
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-11-30 15:59:30 -0600
commitbe140e8c6be966349c6fa35a87f84d5a73995b9a (patch)
tree9c64dcd3e01e7c3e093eaa971217aad7c8e5ae2a /railties/test
parent668872efd85291895d3e68f3a5af312973a1be74 (diff)
downloadrails-be140e8c6be966349c6fa35a87f84d5a73995b9a.tar.gz
rails-be140e8c6be966349c6fa35a87f84d5a73995b9a.tar.bz2
rails-be140e8c6be966349c6fa35a87f84d5a73995b9a.zip
Changed Rails.root to return a Pathname object (allows for Rails.root.join("app", "controllers") => "#{RAILS_ROOT}/app/controllers") [#1482]
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/initializer_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index 33c81bc5ad..99f69a1575 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -317,7 +317,7 @@ class RailsRootTest < Test::Unit::TestCase
assert_equal RAILS_ROOT, Rails.root
end
- def test_rails_dot_root_accepts_arguments_for_file_dot_join
- assert_equal File.join(RAILS_ROOT, 'app', 'controllers'), Rails.root('app', 'controllers')
+ def test_rails_dot_root_should_be_a_pathname
+ assert_equal File.join(RAILS_ROOT, 'app', 'controllers'), Rails.root.join('app', 'controllers')
end
end \ No newline at end of file