From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 10 Jun 2011 12:54:02 +0000 (+0000)
Subject: scm: cvs: replace RAILS_ROOT to Rails.root in functional test.
X-Git-Tag: 1.3.0~1826
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=204eabba419a58ec8764b43ac9f2c22a8949246c;p=redmine.git

scm: cvs: replace RAILS_ROOT to Rails.root in functional test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6061 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index 35f5ef669..728a38020 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -22,10 +22,10 @@ require 'repositories_controller'
 class RepositoriesController; def rescue_action(e) raise e end; end
 
 class RepositoriesCvsControllerTest < ActionController::TestCase
-  fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules
+  fixtures :projects, :users, :roles, :members, :member_roles,
+           :repositories, :enabled_modules
 
-  # No '..' in the repository path
-  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
+  REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
   REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
   # CVS module
   MODULE_NAME = 'test'