summaryrefslogtreecommitdiffstats
path: root/test/test_helper.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-06-23 11:19:05 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-06-23 11:19:05 +0000
commitee527ab47c3f94dd7853a586b14314b456ffa553 (patch)
tree6a50ea2f6a1b12e04c01418930e1307d86d2fe7b /test/test_helper.rb
parentf2629db043ae720fca91230164d0ffc4c650357a (diff)
downloadredmine-ee527ab47c3f94dd7853a586b14314b456ffa553.tar.gz
redmine-ee527ab47c3f94dd7853a586b14314b456ffa553.zip
replace RAILS_ROOT to Rails.root at test/test_helper.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6123 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/test_helper.rb')
-rw-r--r--test/test_helper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1bb45bc97..0c082034b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -5,12 +5,12 @@
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -19,7 +19,7 @@ ENV["RAILS_ENV"] = "test"
require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
require 'test_help'
require File.expand_path(File.dirname(__FILE__) + '/helper_testcase')
-require File.join(RAILS_ROOT,'test', 'mocks', 'open_id_authentication_mock.rb')
+require Rails.root.join('test', 'mocks', 'open_id_authentication_mock.rb')
require File.expand_path(File.dirname(__FILE__) + '/object_daddy_helpers')
include ObjectDaddyHelpers