diff options
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/app_rails_loader_test.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/railties/test/app_rails_loader_test.rb b/railties/test/app_rails_loader_test.rb index 12e5558915..a16b8d3302 100644 --- a/railties/test/app_rails_loader_test.rb +++ b/railties/test/app_rails_loader_test.rb @@ -1,3 +1,4 @@ +require 'tmpdir' require 'pathname' require 'abstract_unit' require 'rails/app_rails_loader' @@ -12,6 +13,10 @@ class AppRailsLoaderTest < ActiveSupport::TestCase Rails::AppRailsLoader.expects(:exec).with(Rails::AppRailsLoader::RUBY, exe) end + def realpath(filename) + Pathname.new(filename).realpath + end + setup do @tmp = Dir.mktmpdir('railties-rails-loader-test-suite') @cwd = Dir.pwd @@ -50,7 +55,13 @@ class AppRailsLoaderTest < ActiveSupport::TestCase expects_exec exe Rails::AppRailsLoader.exec_app_rails - assert_equal File.join(@tmp, 'foo'), Dir.pwd + + # Compare the realpath in case either of them has symlinks. + # + # This happens in particular in Mac OS X, where @tmp starts + # with "/var", and Dir.pwd with "/private/var", due to a + # default system symlink var -> private/var. + assert_equal realpath("#@tmp/foo"), realpath(Dir.pwd) end end end |