aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/initializer_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-11-29 15:59:47 -0600
committerJoshua Peek <josh@joshpeek.com>2008-11-29 15:59:47 -0600
commitcec8a92a6d37699a2dbc8fdeb5393113d3621ef9 (patch)
treec712add3aa6d70c9ba75e0963a79984e0aff750f /railties/test/initializer_test.rb
parent9fccf72725a72baeda508eccd6113b44329e0a7c (diff)
parentfdfcdf467387c4db3d79c1f46eadbb55a88ef814 (diff)
downloadrails-cec8a92a6d37699a2dbc8fdeb5393113d3621ef9.tar.gz
rails-cec8a92a6d37699a2dbc8fdeb5393113d3621ef9.tar.bz2
rails-cec8a92a6d37699a2dbc8fdeb5393113d3621ef9.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/test/initializer_test.rb')
-rw-r--r--railties/test/initializer_test.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index 2104412c54..33c81bc5ad 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -311,3 +311,13 @@ uses_mocha 'i18n settings' do
end
end
end
+
+class RailsRootTest < Test::Unit::TestCase
+ def test_rails_dot_root_equals_rails_root
+ 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')
+ end
+end \ No newline at end of file