diff test/unit/default_data_test.rb @ 524:1248a47e81b3 feature_36

Merge from branch "luisf"

--- a/test/unit/default_data_test.rb	Fri Jul 15 17:21:05 2011 +0100
+++ b/test/unit/default_data_test.rb	Mon Jul 25 14:39:38 2011 +0100
@@ -1,26 +1,26 @@
-# redMine - project management software
-# Copyright (C) 2006-2008  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # 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.
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class DefaultDataTest < ActiveSupport::TestCase
   include Redmine::I18n
   fixtures :roles
-  
+
   def test_no_data
     assert !Redmine::DefaultData::Loader::no_data?
     Role.delete_all("builtin = 0")
@@ -29,7 +29,7 @@
     Enumeration.delete_all
     assert Redmine::DefaultData::Loader::no_data?
   end
-  
+
   def test_load
     valid_languages.each do |lang|
       begin