diff options
| author | Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> | 2010-12-12 23:24:34 +0000 |
|---|---|---|
| committer | Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> | 2010-12-12 23:24:34 +0000 |
| commit | 17f86d964fe05e677714baa35ec319abe13ae8bf (patch) | |
| tree | 0b5c1d07883152cfe5ed8b1a7b76c2388d97583d | |
| parent | f9f1bd58d6a6563e99b067195975c7b101817ab0 (diff) | |
| download | redmine-17f86d964fe05e677714baa35ec319abe13ae8bf.tar.gz redmine-17f86d964fe05e677714baa35ec319abe13ae8bf.zip | |
Use absolute paths in test/**/* requires for Ruby 1.9.2 compatibility. #4050
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4509 e93f8b46-1217-0410-a6f0-8f06a7374b81
159 files changed, 159 insertions, 159 deletions
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index ac8af4abb..2abc2fc3a 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'account_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb index ba9c33985..c8baea49e 100644 --- a/test/functional/activities_controller_test.rb +++ b/test/functional/activities_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class ActivitiesControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb index 513353cc2..06a41032f 100644 --- a/test/functional/admin_controller_test.rb +++ b/test/functional/admin_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'admin_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb index 7e221c252..a37f7de23 100644 --- a/test/functional/application_controller_test.rb +++ b/test/functional/application_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'application_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb index 3cc393ba1..be452bd43 100644 --- a/test/functional/attachments_controller_test.rb +++ b/test/functional/attachments_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'attachments_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/auth_sources_controller_test.rb b/test/functional/auth_sources_controller_test.rb index 348e0e098..eadbaa73c 100644 --- a/test/functional/auth_sources_controller_test.rb +++ b/test/functional/auth_sources_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class AuthSourcesControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb index e5e898b15..bad8c3bd6 100644 --- a/test/functional/auto_completes_controller_test.rb +++ b/test/functional/auto_completes_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class AutoCompletesControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/boards_controller_test.rb b/test/functional/boards_controller_test.rb index 1904427ea..597a3df27 100644 --- a/test/functional/boards_controller_test.rb +++ b/test/functional/boards_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'boards_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb index 3fb9ad1f0..a8c0e2af1 100644 --- a/test/functional/calendars_controller_test.rb +++ b/test/functional/calendars_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class CalendarsControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb index 7f3f2508f..ef4eb1178 100644 --- a/test/functional/comments_controller_test.rb +++ b/test/functional/comments_controller_test.rb @@ -15,7 +15,7 @@ # 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 CommentsControllerTest < ActionController::TestCase fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :news, :comments diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb index 6d2b45bad..9eacdbba8 100644 --- a/test/functional/context_menus_controller_test.rb +++ b/test/functional/context_menus_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class ContextMenusControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/custom_fields_controller_test.rb b/test/functional/custom_fields_controller_test.rb index 1caf98fd9..d1e251b5c 100644 --- a/test/functional/custom_fields_controller_test.rb +++ b/test/functional/custom_fields_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'custom_fields_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb index 594bd980b..a774494b5 100644 --- a/test/functional/documents_controller_test.rb +++ b/test/functional/documents_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'documents_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb index 8c66186f1..dcec63e99 100644 --- a/test/functional/enumerations_controller_test.rb +++ b/test/functional/enumerations_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'enumerations_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/files_controller_test.rb b/test/functional/files_controller_test.rb index e2efde5e3..7e1805697 100644 --- a/test/functional/files_controller_test.rb +++ b/test/functional/files_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class FilesControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb index 30ef14e09..25113b063 100644 --- a/test/functional/gantts_controller_test.rb +++ b/test/functional/gantts_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class GanttsControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/groups_controller_test.rb b/test/functional/groups_controller_test.rb index d836375a2..a1a164b07 100644 --- a/test/functional/groups_controller_test.rb +++ b/test/functional/groups_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'groups_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/issue_categories_controller_test.rb b/test/functional/issue_categories_controller_test.rb index cce81ec0d..7418ca28d 100644 --- a/test/functional/issue_categories_controller_test.rb +++ b/test/functional/issue_categories_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'issue_categories_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/issue_moves_controller_test.rb b/test/functional/issue_moves_controller_test.rb index 7bb95f7e8..5c3b8165b 100644 --- a/test/functional/issue_moves_controller_test.rb +++ b/test/functional/issue_moves_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class IssueMovesControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/issue_relations_controller_test.rb b/test/functional/issue_relations_controller_test.rb index 870d893df..6c50b707f 100644 --- a/test/functional/issue_relations_controller_test.rb +++ b/test/functional/issue_relations_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) require 'issue_relations_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/issue_statuses_controller_test.rb b/test/functional/issue_statuses_controller_test.rb index 4e48afb29..e2deed45e 100644 --- a/test/functional/issue_statuses_controller_test.rb +++ b/test/functional/issue_statuses_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) require 'issue_statuses_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index b86eee07e..3aeb95bd2 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'issues_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/issues_controller_transaction_test.rb b/test/functional/issues_controller_transaction_test.rb index dbd085bf5..db783b6a0 100644 --- a/test/functional/issues_controller_transaction_test.rb +++ b/test/functional/issues_controller_transaction_test.rb @@ -15,7 +15,7 @@ # 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__) require 'issues_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb index 83e015af6..9aa8fe277 100644 --- a/test/functional/journals_controller_test.rb +++ b/test/functional/journals_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'journals_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/mail_handler_controller_test.rb b/test/functional/mail_handler_controller_test.rb index 8365f3170..f8b1efea0 100644 --- a/test/functional/mail_handler_controller_test.rb +++ b/test/functional/mail_handler_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'mail_handler_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/members_controller_test.rb b/test/functional/members_controller_test.rb index 213a01730..4138217f6 100644 --- a/test/functional/members_controller_test.rb +++ b/test/functional/members_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'members_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb index 59dc704e4..8c4fc8628 100644 --- a/test/functional/messages_controller_test.rb +++ b/test/functional/messages_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'messages_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb index 69a5b3e13..2e969760f 100644 --- a/test/functional/my_controller_test.rb +++ b/test/functional/my_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'my_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb index 5a20e8973..56725013b 100644 --- a/test/functional/news_controller_test.rb +++ b/test/functional/news_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'news_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/previews_controller_test.rb b/test/functional/previews_controller_test.rb index 4140f1428..45f51f61d 100644 --- a/test/functional/previews_controller_test.rb +++ b/test/functional/previews_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class PreviewsControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/project_enumerations_controller_test.rb b/test/functional/project_enumerations_controller_test.rb index ae39f3e55..e39ee77a7 100644 --- a/test/functional/project_enumerations_controller_test.rb +++ b/test/functional/project_enumerations_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class ProjectEnumerationsControllerTest < ActionController::TestCase fixtures :all diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 5392ffb12..ba0a3aae8 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'projects_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb index af2a86e11..7c5d7ca56 100644 --- a/test/functional/queries_controller_test.rb +++ b/test/functional/queries_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'queries_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/reports_controller_test.rb b/test/functional/reports_controller_test.rb index db9d9cda7..183f5c583 100644 --- a/test/functional/reports_controller_test.rb +++ b/test/functional/reports_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'reports_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb index 18841d54e..5f7de1de8 100644 --- a/test/functional/repositories_bazaar_controller_test.rb +++ b/test/functional/repositories_bazaar_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'repositories_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb index 2409e5005..629be69ed 100644 --- a/test/functional/repositories_controller_test.rb +++ b/test/functional/repositories_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'repositories_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb index fa604dc81..57b616616 100644 --- a/test/functional/repositories_cvs_controller_test.rb +++ b/test/functional/repositories_cvs_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'repositories_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/repositories_darcs_controller_test.rb b/test/functional/repositories_darcs_controller_test.rb index b605ff82b..0a5d57a8b 100644 --- a/test/functional/repositories_darcs_controller_test.rb +++ b/test/functional/repositories_darcs_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'repositories_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index 326a53038..da85da65c 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'repositories_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb index f2639ee92..a37acfa18 100644 --- a/test/functional/repositories_mercurial_controller_test.rb +++ b/test/functional/repositories_mercurial_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'repositories_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb index 7cc2cbfc2..b4ad377f7 100644 --- a/test/functional/repositories_subversion_controller_test.rb +++ b/test/functional/repositories_subversion_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'repositories_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb index 1e0e3ea64..810cafda8 100644 --- a/test/functional/roles_controller_test.rb +++ b/test/functional/roles_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'roles_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb index ea29daf0f..3d0e75652 100644 --- a/test/functional/search_controller_test.rb +++ b/test/functional/search_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) require 'search_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb index d7be054f3..5e37ed538 100644 --- a/test/functional/settings_controller_test.rb +++ b/test/functional/settings_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'settings_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/sys_controller_test.rb b/test/functional/sys_controller_test.rb index 179740190..6a3da29a1 100644 --- a/test/functional/sys_controller_test.rb +++ b/test/functional/sys_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'sys_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/time_entry_reports_controller_test.rb b/test/functional/time_entry_reports_controller_test.rb index 0465c88ec..70a3d1c72 100644 --- a/test/functional/time_entry_reports_controller_test.rb +++ b/test/functional/time_entry_reports_controller_test.rb @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class TimeEntryReportsControllerTest < ActionController::TestCase fixtures :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses, :custom_fields, :custom_values diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index d35b98c71..80eaf707c 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -16,7 +16,7 @@ # 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__) require 'timelog_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/trackers_controller_test.rb b/test/functional/trackers_controller_test.rb index 90d398318..bbae03370 100644 --- a/test/functional/trackers_controller_test.rb +++ b/test/functional/trackers_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'trackers_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index dbc4dba46..0272e1fdb 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'users_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb index 50f33c69f..96ab49443 100644 --- a/test/functional/versions_controller_test.rb +++ b/test/functional/versions_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'versions_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/watchers_controller_test.rb b/test/functional/watchers_controller_test.rb index 01dee3747..41cc9fda3 100644 --- a/test/functional/watchers_controller_test.rb +++ b/test/functional/watchers_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'watchers_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb index 07faf5004..7a53c8b6a 100644 --- a/test/functional/welcome_controller_test.rb +++ b/test/functional/welcome_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'welcome_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb index 857975b82..c40b2f392 100644 --- a/test/functional/wiki_controller_test.rb +++ b/test/functional/wiki_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'wiki_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb index 0be324836..e3e0dfea1 100644 --- a/test/functional/wikis_controller_test.rb +++ b/test/functional/wikis_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'wikis_controller' # Re-raise errors caught by the controller. diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb index 802d10d6c..64d606a8a 100644 --- a/test/functional/workflows_controller_test.rb +++ b/test/functional/workflows_controller_test.rb @@ -15,7 +15,7 @@ # 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__) require 'workflows_controller' # Re-raise errors caught by the controller. diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb index 69e42f6d1..4943f862e 100644 --- a/test/integration/account_test.rb +++ b/test/integration/account_test.rb @@ -15,7 +15,7 @@ # 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__) begin require 'mocha' diff --git a/test/integration/admin_test.rb b/test/integration/admin_test.rb index af44d5226..b2664af02 100644 --- a/test/integration/admin_test.rb +++ b/test/integration/admin_test.rb @@ -15,7 +15,7 @@ # 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 AdminTest < ActionController::IntegrationTest fixtures :all diff --git a/test/integration/api_test/disabled_rest_api_test.rb b/test/integration/api_test/disabled_rest_api_test.rb index d94d14b6e..13ad4a00d 100644 --- a/test/integration/api_test/disabled_rest_api_test.rb +++ b/test/integration/api_test/disabled_rest_api_test.rb @@ -1,4 +1,4 @@ -require "#{File.dirname(__FILE__)}/../../test_helper" +require File.expand_path('../../../test_helper', __FILE__) class ApiTest::DisabledRestApiTest < ActionController::IntegrationTest fixtures :all diff --git a/test/integration/api_test/http_basic_login_test.rb b/test/integration/api_test/http_basic_login_test.rb index 21b584c79..a27331da4 100644 --- a/test/integration/api_test/http_basic_login_test.rb +++ b/test/integration/api_test/http_basic_login_test.rb @@ -1,4 +1,4 @@ -require "#{File.dirname(__FILE__)}/../../test_helper" +require File.expand_path('../../../test_helper', __FILE__) class ApiTest::HttpBasicLoginTest < ActionController::IntegrationTest fixtures :all diff --git a/test/integration/api_test/http_basic_login_with_api_token_test.rb b/test/integration/api_test/http_basic_login_with_api_token_test.rb index 42c0be287..e47f7365a 100644 --- a/test/integration/api_test/http_basic_login_with_api_token_test.rb +++ b/test/integration/api_test/http_basic_login_with_api_token_test.rb @@ -1,4 +1,4 @@ -require "#{File.dirname(__FILE__)}/../../test_helper" +require File.expand_path('../../../test_helper', __FILE__) class ApiTest::HttpBasicLoginWithApiTokenTest < ActionController::IntegrationTest fixtures :all diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb index a5bda05c1..bfcd63e2a 100644 --- a/test/integration/api_test/issues_test.rb +++ b/test/integration/api_test/issues_test.rb @@ -15,7 +15,7 @@ # 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 ApiTest::IssuesTest < ActionController::IntegrationTest fixtures :projects, diff --git a/test/integration/api_test/news_test.rb b/test/integration/api_test/news_test.rb index 2d09e6d4c..646c06fbe 100644 --- a/test/integration/api_test/news_test.rb +++ b/test/integration/api_test/news_test.rb @@ -15,7 +15,7 @@ # 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__) require 'pp' class ApiTest::NewsTest < ActionController::IntegrationTest fixtures :all diff --git a/test/integration/api_test/projects_test.rb b/test/integration/api_test/projects_test.rb index aaf40e1d5..e40d6584a 100644 --- a/test/integration/api_test/projects_test.rb +++ b/test/integration/api_test/projects_test.rb @@ -15,7 +15,7 @@ # 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 ApiTest::ProjectsTest < ActionController::IntegrationTest fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details, diff --git a/test/integration/api_test/time_entries_test.rb b/test/integration/api_test/time_entries_test.rb index 317baba67..60a9dba62 100644 --- a/test/integration/api_test/time_entries_test.rb +++ b/test/integration/api_test/time_entries_test.rb @@ -15,7 +15,7 @@ # 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 ApiTest::TimeEntriesTest < ActionController::IntegrationTest fixtures :all diff --git a/test/integration/api_test/token_authentication_test.rb b/test/integration/api_test/token_authentication_test.rb index 5c116c161..dbd8c8e36 100644 --- a/test/integration/api_test/token_authentication_test.rb +++ b/test/integration/api_test/token_authentication_test.rb @@ -1,4 +1,4 @@ -require "#{File.dirname(__FILE__)}/../../test_helper" +require File.expand_path('../../../test_helper', __FILE__) class ApiTest::TokenAuthenticationTest < ActionController::IntegrationTest fixtures :all diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb index f19a64989..b1687b7ed 100644 --- a/test/integration/api_test/users_test.rb +++ b/test/integration/api_test/users_test.rb @@ -15,7 +15,7 @@ # 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__) require 'pp' class ApiTest::UsersTest < ActionController::IntegrationTest fixtures :users diff --git a/test/integration/application_test.rb b/test/integration/application_test.rb index fba11e049..f6bb2f24e 100644 --- a/test/integration/application_test.rb +++ b/test/integration/application_test.rb @@ -15,7 +15,7 @@ # 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 ApplicationTest < ActionController::IntegrationTest include Redmine::I18n diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb index 61024ce22..b6955d252 100644 --- a/test/integration/issues_test.rb +++ b/test/integration/issues_test.rb @@ -15,7 +15,7 @@ # 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 IssuesTest < ActionController::IntegrationTest fixtures :projects, diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb index 001bf50d2..cb6371601 100644 --- a/test/integration/layout_test.rb +++ b/test/integration/layout_test.rb @@ -1,4 +1,4 @@ -require "#{File.dirname(__FILE__)}/../test_helper" +require File.expand_path('../../test_helper', __FILE__) class LayoutTest < ActionController::IntegrationTest fixtures :all diff --git a/test/integration/lib/redmine/menu_manager_test.rb b/test/integration/lib/redmine/menu_manager_test.rb index 0ff59cf48..ae814caf5 100644 --- a/test/integration/lib/redmine/menu_manager_test.rb +++ b/test/integration/lib/redmine/menu_manager_test.rb @@ -15,7 +15,7 @@ # 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 MenuManagerTest < ActionController::IntegrationTest include Redmine::I18n diff --git a/test/integration/projects_test.rb b/test/integration/projects_test.rb index 26b1a5ca9..5c4602a5f 100644 --- a/test/integration/projects_test.rb +++ b/test/integration/projects_test.rb @@ -15,7 +15,7 @@ # 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 ProjectsTest < ActionController::IntegrationTest fixtures :projects, :users, :members diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index 7d467b5d3..01462a74e 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -15,7 +15,7 @@ # 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 RoutingTest < ActionController::IntegrationTest context "activities" do diff --git a/test/unit/activity_test.rb b/test/unit/activity_test.rb index 86a07e6a5..838a0bbfe 100644 --- a/test/unit/activity_test.rb +++ b/test/unit/activity_test.rb @@ -15,7 +15,7 @@ # 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 ActivityTest < ActiveSupport::TestCase fixtures :projects, :versions, :attachments, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details, diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb index b9ebbb67f..4ac10e31f 100644 --- a/test/unit/attachment_test.rb +++ b/test/unit/attachment_test.rb @@ -17,7 +17,7 @@ # 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 AttachmentTest < ActiveSupport::TestCase fixtures :issues, :users diff --git a/test/unit/auth_source_ldap_test.rb b/test/unit/auth_source_ldap_test.rb index 885272c11..79fc0e8ac 100644 --- a/test/unit/auth_source_ldap_test.rb +++ b/test/unit/auth_source_ldap_test.rb @@ -15,7 +15,7 @@ # 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 AuthSourceLdapTest < ActiveSupport::TestCase fixtures :auth_sources diff --git a/test/unit/board_test.rb b/test/unit/board_test.rb index d3073ec82..4ad0c2ba2 100644 --- a/test/unit/board_test.rb +++ b/test/unit/board_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require File.expand_path('../../test_helper', __FILE__) class BoardTest < ActiveSupport::TestCase fixtures :projects, :boards, :messages, :attachments, :watchers diff --git a/test/unit/calendar_test.rb b/test/unit/calendar_test.rb index 05e1d0bad..ac6a651ef 100644 --- a/test/unit/calendar_test.rb +++ b/test/unit/calendar_test.rb @@ -15,7 +15,7 @@ # 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 CalendarTest < ActiveSupport::TestCase diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb index 47f5d5fc4..9265fe9c5 100644 --- a/test/unit/changeset_test.rb +++ b/test/unit/changeset_test.rb @@ -17,7 +17,7 @@ # 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 ChangesetTest < ActiveSupport::TestCase fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :users, :members, :member_roles, :trackers diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb index 0a62148c3..43265c474 100644 --- a/test/unit/comment_test.rb +++ b/test/unit/comment_test.rb @@ -15,7 +15,7 @@ # 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 CommentTest < ActiveSupport::TestCase fixtures :users, :news, :comments diff --git a/test/unit/custom_field_test.rb b/test/unit/custom_field_test.rb index 513c6fb2e..4d80f5f3a 100644 --- a/test/unit/custom_field_test.rb +++ b/test/unit/custom_field_test.rb @@ -15,7 +15,7 @@ # 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 CustomFieldTest < ActiveSupport::TestCase fixtures :custom_fields diff --git a/test/unit/custom_value_test.rb b/test/unit/custom_value_test.rb index 332c92644..49ae28cec 100644 --- a/test/unit/custom_value_test.rb +++ b/test/unit/custom_value_test.rb @@ -15,7 +15,7 @@ # 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 CustomValueTest < ActiveSupport::TestCase fixtures :custom_fields, :custom_values, :users diff --git a/test/unit/default_data_test.rb b/test/unit/default_data_test.rb index a63d205c1..bd10ebf97 100644 --- a/test/unit/default_data_test.rb +++ b/test/unit/default_data_test.rb @@ -15,7 +15,7 @@ # 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 diff --git a/test/unit/document_category_test.rb b/test/unit/document_category_test.rb index 9b09dc094..537c64273 100644 --- a/test/unit/document_category_test.rb +++ b/test/unit/document_category_test.rb @@ -15,7 +15,7 @@ # 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 DocumentCategoryTest < ActiveSupport::TestCase fixtures :enumerations, :documents, :issues diff --git a/test/unit/document_test.rb b/test/unit/document_test.rb index 9e76311bd..2478ea71d 100644 --- a/test/unit/document_test.rb +++ b/test/unit/document_test.rb @@ -15,7 +15,7 @@ # 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 DocumentTest < ActiveSupport::TestCase fixtures :projects, :enumerations, :documents, :attachments diff --git a/test/unit/enabled_module_test.rb b/test/unit/enabled_module_test.rb index 5e662ebc7..ccf6566d8 100644 --- a/test/unit/enabled_module_test.rb +++ b/test/unit/enabled_module_test.rb @@ -15,7 +15,7 @@ # 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 EnabledModuleTest < ActiveSupport::TestCase fixtures :projects, :wikis diff --git a/test/unit/enumeration_test.rb b/test/unit/enumeration_test.rb index d9d330721..db7e2b04d 100644 --- a/test/unit/enumeration_test.rb +++ b/test/unit/enumeration_test.rb @@ -15,7 +15,7 @@ # 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 EnumerationTest < ActiveSupport::TestCase fixtures :enumerations, :issues, :custom_fields, :custom_values diff --git a/test/unit/group_test.rb b/test/unit/group_test.rb index 4b26f8f2c..a7670aab0 100644 --- a/test/unit/group_test.rb +++ b/test/unit/group_test.rb @@ -15,7 +15,7 @@ # 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 GroupTest < ActiveSupport::TestCase fixtures :all diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 6327442c6..4835b340a 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -15,7 +15,7 @@ # 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 ApplicationHelperTest < ActionView::TestCase diff --git a/test/unit/helpers/custom_fields_helper_test.rb b/test/unit/helpers/custom_fields_helper_test.rb index 18bc2ff50..6baff742c 100644 --- a/test/unit/helpers/custom_fields_helper_test.rb +++ b/test/unit/helpers/custom_fields_helper_test.rb @@ -15,7 +15,7 @@ # 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 CustomFieldsHelperTest < HelperTestCase include CustomFieldsHelper diff --git a/test/unit/helpers/issues_helper_test.rb b/test/unit/helpers/issues_helper_test.rb index 5e405a8c9..617cc1d60 100644 --- a/test/unit/helpers/issues_helper_test.rb +++ b/test/unit/helpers/issues_helper_test.rb @@ -15,7 +15,7 @@ # 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 IssuesHelperTest < HelperTestCase include ApplicationHelper diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb index ff99a15c9..e1d6bc1aa 100644 --- a/test/unit/helpers/projects_helper_test.rb +++ b/test/unit/helpers/projects_helper_test.rb @@ -15,7 +15,7 @@ # 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 ProjectsHelperTest < HelperTestCase include ApplicationHelper diff --git a/test/unit/helpers/search_helper_test.rb b/test/unit/helpers/search_helper_test.rb index 258e6a34b..fa7a685ea 100644 --- a/test/unit/helpers/search_helper_test.rb +++ b/test/unit/helpers/search_helper_test.rb @@ -17,7 +17,7 @@ # 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 SearchHelperTest < HelperTestCase include SearchHelper diff --git a/test/unit/helpers/sort_helper_test.rb b/test/unit/helpers/sort_helper_test.rb index ee6080306..f9ff7f1ce 100644 --- a/test/unit/helpers/sort_helper_test.rb +++ b/test/unit/helpers/sort_helper_test.rb @@ -15,7 +15,7 @@ # 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 SortHelperTest < HelperTestCase include SortHelper diff --git a/test/unit/helpers/timelog_helper_test.rb b/test/unit/helpers/timelog_helper_test.rb index 0056a0d92..6f4a0823f 100644 --- a/test/unit/helpers/timelog_helper_test.rb +++ b/test/unit/helpers/timelog_helper_test.rb @@ -15,7 +15,7 @@ # 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 TimelogHelperTest < HelperTestCase include TimelogHelper diff --git a/test/unit/issue_category_test.rb b/test/unit/issue_category_test.rb index ebb9f0f13..947f15f0d 100644 --- a/test/unit/issue_category_test.rb +++ b/test/unit/issue_category_test.rb @@ -15,7 +15,7 @@ # 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 IssueCategoryTest < ActiveSupport::TestCase fixtures :issue_categories, :issues diff --git a/test/unit/issue_nested_set_test.rb b/test/unit/issue_nested_set_test.rb index cda8c4e58..df9adbe38 100644 --- a/test/unit/issue_nested_set_test.rb +++ b/test/unit/issue_nested_set_test.rb @@ -15,7 +15,7 @@ # 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 IssueNestedSetTest < ActiveSupport::TestCase fixtures :projects, :users, :members, :member_roles, :roles, diff --git a/test/unit/issue_priority_test.rb b/test/unit/issue_priority_test.rb index 51a6b82e3..7667a4ce6 100644 --- a/test/unit/issue_priority_test.rb +++ b/test/unit/issue_priority_test.rb @@ -15,7 +15,7 @@ # 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 IssuePriorityTest < ActiveSupport::TestCase fixtures :enumerations, :issues diff --git a/test/unit/issue_relation_test.rb b/test/unit/issue_relation_test.rb index f8859dfc6..0bc45f31e 100644 --- a/test/unit/issue_relation_test.rb +++ b/test/unit/issue_relation_test.rb @@ -15,7 +15,7 @@ # 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 IssueRelationTest < ActiveSupport::TestCase fixtures :issue_relations, :issues diff --git a/test/unit/issue_status_test.rb b/test/unit/issue_status_test.rb index bcc50a480..4fc6de1e2 100644 --- a/test/unit/issue_status_test.rb +++ b/test/unit/issue_status_test.rb @@ -15,7 +15,7 @@ # 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 IssueStatusTest < ActiveSupport::TestCase fixtures :issue_statuses, :issues diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index a09da8fbb..4d771d9b7 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -15,7 +15,7 @@ # 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 IssueTest < ActiveSupport::TestCase fixtures :projects, :users, :members, :member_roles, :roles, diff --git a/test/unit/journal_observer_test.rb b/test/unit/journal_observer_test.rb index 1b1c1cc3f..77179b24f 100644 --- a/test/unit/journal_observer_test.rb +++ b/test/unit/journal_observer_test.rb @@ -15,7 +15,7 @@ # 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 JournalObserverTest < ActiveSupport::TestCase fixtures :issues, :issue_statuses, :journals, :journal_details diff --git a/test/unit/journal_test.rb b/test/unit/journal_test.rb index 87273ad46..67e719df7 100644 --- a/test/unit/journal_test.rb +++ b/test/unit/journal_test.rb @@ -15,7 +15,7 @@ # 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 JournalTest < ActiveSupport::TestCase fixtures :issues, :issue_statuses, :journals, :journal_details diff --git a/test/unit/lib/redmine/access_control_test.rb b/test/unit/lib/redmine/access_control_test.rb index dcc84c19f..51891c0f8 100644 --- a/test/unit/lib/redmine/access_control_test.rb +++ b/test/unit/lib/redmine/access_control_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::AccessControlTest < ActiveSupport::TestCase diff --git a/test/unit/lib/redmine/helpers/gantt_test.rb b/test/unit/lib/redmine/helpers/gantt_test.rb index 6b97b083f..f54dfe350 100644 --- a/test/unit/lib/redmine/helpers/gantt_test.rb +++ b/test/unit/lib/redmine/helpers/gantt_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::Helpers::GanttTest < ActiveSupport::TestCase # Utility methods and classes so assert_select can be used. diff --git a/test/unit/lib/redmine/hook_test.rb b/test/unit/lib/redmine/hook_test.rb index 79ecb9dda..82f507f23 100644 --- a/test/unit/lib/redmine/hook_test.rb +++ b/test/unit/lib/redmine/hook_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::Hook::ManagerTest < ActiveSupport::TestCase diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb index df1942e95..1439ac9e3 100644 --- a/test/unit/lib/redmine/i18n_test.rb +++ b/test/unit/lib/redmine/i18n_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::I18nTest < ActiveSupport::TestCase include Redmine::I18n diff --git a/test/unit/lib/redmine/menu_manager/mapper_test.rb b/test/unit/lib/redmine/menu_manager/mapper_test.rb index a23b624f7..0691b014f 100644 --- a/test/unit/lib/redmine/menu_manager/mapper_test.rb +++ b/test/unit/lib/redmine/menu_manager/mapper_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::MenuManager::MapperTest < ActiveSupport::TestCase context "Mapper#initialize" do diff --git a/test/unit/lib/redmine/menu_manager/menu_helper_test.rb b/test/unit/lib/redmine/menu_manager/menu_helper_test.rb index d93a891c7..6eda978e0 100644 --- a/test/unit/lib/redmine/menu_manager/menu_helper_test.rb +++ b/test/unit/lib/redmine/menu_manager/menu_helper_test.rb @@ -15,7 +15,7 @@ # 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__) diff --git a/test/unit/lib/redmine/menu_manager/menu_item_test.rb b/test/unit/lib/redmine/menu_manager/menu_item_test.rb index ab17d4a4b..4458a3df8 100644 --- a/test/unit/lib/redmine/menu_manager/menu_item_test.rb +++ b/test/unit/lib/redmine/menu_manager/menu_item_test.rb @@ -15,7 +15,7 @@ # 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__) module RedmineMenuTestHelper # Helpers diff --git a/test/unit/lib/redmine/menu_manager_test.rb b/test/unit/lib/redmine/menu_manager_test.rb index 200ed3976..9d732951a 100644 --- a/test/unit/lib/redmine/menu_manager_test.rb +++ b/test/unit/lib/redmine/menu_manager_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::MenuManagerTest < ActiveSupport::TestCase context "MenuManager#map" do diff --git a/test/unit/lib/redmine/mime_type_test.rb b/test/unit/lib/redmine/mime_type_test.rb index 2cf151841..fe81f65d4 100644 --- a/test/unit/lib/redmine/mime_type_test.rb +++ b/test/unit/lib/redmine/mime_type_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::MimeTypeTest < ActiveSupport::TestCase diff --git a/test/unit/lib/redmine/notifiable_test.rb b/test/unit/lib/redmine/notifiable_test.rb index 494d16b95..fe02fbfcd 100644 --- a/test/unit/lib/redmine/notifiable_test.rb +++ b/test/unit/lib/redmine/notifiable_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::NotifiableTest < ActiveSupport::TestCase def setup diff --git a/test/unit/lib/redmine/plugin_test.rb b/test/unit/lib/redmine/plugin_test.rb index 57e2b985e..07986e490 100644 --- a/test/unit/lib/redmine/plugin_test.rb +++ b/test/unit/lib/redmine/plugin_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::PluginTest < ActiveSupport::TestCase diff --git a/test/unit/lib/redmine/safe_attributes_test.rb b/test/unit/lib/redmine/safe_attributes_test.rb index 0821e795d..9498a438e 100644 --- a/test/unit/lib/redmine/safe_attributes_test.rb +++ b/test/unit/lib/redmine/safe_attributes_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::SafeAttributesTest < ActiveSupport::TestCase diff --git a/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb index 6e3b4cbb7..fc37254e2 100644 --- a/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../../test_helper' +require File.expand_path('../../../../../../test_helper', __FILE__) class FilesystemAdapterTest < ActiveSupport::TestCase diff --git a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb index 45e3a5adb..9c5ead48b 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test_helper' +require File.expand_path('../../../../../../test_helper', __FILE__) class GitAdapterTest < ActiveSupport::TestCase REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository' diff --git a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb index 311262a46..72e0dcc56 100644 --- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test_helper' +require File.expand_path('../../../../../../test_helper', __FILE__) begin require 'mocha' diff --git a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb index 4fc56cbc3..99e8ceb22 100644 --- a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb @@ -15,7 +15,7 @@ # 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 SubversionAdapterTest < ActiveSupport::TestCase diff --git a/test/unit/lib/redmine/themes_test.rb b/test/unit/lib/redmine/themes_test.rb index a2e9236e3..ab482277a 100644 --- a/test/unit/lib/redmine/themes_test.rb +++ b/test/unit/lib/redmine/themes_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::ThemesTest < ActiveSupport::TestCase diff --git a/test/unit/lib/redmine/unified_diff_test.rb b/test/unit/lib/redmine/unified_diff_test.rb index 7193b230a..7bac78d81 100644 --- a/test/unit/lib/redmine/unified_diff_test.rb +++ b/test/unit/lib/redmine/unified_diff_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::UnifiedDiffTest < ActiveSupport::TestCase diff --git a/test/unit/lib/redmine/views/builders/json_test.rb b/test/unit/lib/redmine/views/builders/json_test.rb index 448965b91..1be392d63 100644 --- a/test/unit/lib/redmine/views/builders/json_test.rb +++ b/test/unit/lib/redmine/views/builders/json_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::Views::Builders::JsonTest < HelperTestCase diff --git a/test/unit/lib/redmine/views/builders/xml_test.rb b/test/unit/lib/redmine/views/builders/xml_test.rb index 3f251bf3b..6d69a6db3 100644 --- a/test/unit/lib/redmine/views/builders/xml_test.rb +++ b/test/unit/lib/redmine/views/builders/xml_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::Views::Builders::XmlTest < HelperTestCase diff --git a/test/unit/lib/redmine/wiki_formatting.rb b/test/unit/lib/redmine/wiki_formatting.rb index deedebae1..76a8f16ee 100644 --- a/test/unit/lib/redmine/wiki_formatting.rb +++ b/test/unit/lib/redmine/wiki_formatting.rb @@ -15,7 +15,7 @@ # 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 Redmine::WikiFormattingTest < ActiveSupport::TestCase diff --git a/test/unit/lib/redmine/wiki_formatting/macros_test.rb b/test/unit/lib/redmine/wiki_formatting/macros_test.rb index da062d68b..238e5a7ae 100644 --- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/macros_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::WikiFormatting::MacrosTest < HelperTestCase include ApplicationHelper diff --git a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb index a85687dca..72cb9dc55 100644 --- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb @@ -15,7 +15,7 @@ # 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 Redmine::WikiFormatting::TextileFormatterTest < HelperTestCase diff --git a/test/unit/lib/redmine_test.rb b/test/unit/lib/redmine_test.rb index 5fdf05540..073fd819c 100644 --- a/test/unit/lib/redmine_test.rb +++ b/test/unit/lib/redmine_test.rb @@ -15,7 +15,7 @@ # 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__) module RedmineMenuTestHelper # Assertions diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb index bad8655b7..feb09e12e 100644 --- a/test/unit/mail_handler_test.rb +++ b/test/unit/mail_handler_test.rb @@ -17,7 +17,7 @@ # 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 MailHandlerTest < ActiveSupport::TestCase fixtures :users, :projects, diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index 0d0808563..ae7c06d3e 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -15,7 +15,7 @@ # 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 MailerTest < ActiveSupport::TestCase include Redmine::I18n diff --git a/test/unit/member_test.rb b/test/unit/member_test.rb index 7b9d401f3..45f157487 100644 --- a/test/unit/member_test.rb +++ b/test/unit/member_test.rb @@ -15,7 +15,7 @@ # 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 MemberTest < ActiveSupport::TestCase fixtures :all diff --git a/test/unit/message_test.rb b/test/unit/message_test.rb index 5bce8a899..3bab21a3d 100644 --- a/test/unit/message_test.rb +++ b/test/unit/message_test.rb @@ -15,7 +15,7 @@ # 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 MessageTest < ActiveSupport::TestCase fixtures :projects, :roles, :members, :member_roles, :boards, :messages, :users, :watchers diff --git a/test/unit/news_test.rb b/test/unit/news_test.rb index b1b608dfc..2dba2c345 100644 --- a/test/unit/news_test.rb +++ b/test/unit/news_test.rb @@ -15,7 +15,7 @@ # 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 NewsTest < ActiveSupport::TestCase fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :news diff --git a/test/unit/principal_test.rb b/test/unit/principal_test.rb index e44f77177..8a7e3644c 100644 --- a/test/unit/principal_test.rb +++ b/test/unit/principal_test.rb @@ -15,7 +15,7 @@ # 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 PrincipalTest < ActiveSupport::TestCase diff --git a/test/unit/project_nested_set_test.rb b/test/unit/project_nested_set_test.rb index 6aa09d61c..d6bc528a9 100644 --- a/test/unit/project_nested_set_test.rb +++ b/test/unit/project_nested_set_test.rb @@ -15,7 +15,7 @@ # 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 ProjectNestedSetTest < ActiveSupport::TestCase diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb index 87452ceb9..61ae3be32 100644 --- a/test/unit/project_test.rb +++ b/test/unit/project_test.rb @@ -15,7 +15,7 @@ # 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 ProjectTest < ActiveSupport::TestCase fixtures :all diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 85bf9b173..f5d9847d6 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -15,7 +15,7 @@ # 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 QueryTest < ActiveSupport::TestCase fixtures :projects, :enabled_modules, :users, :members, :member_roles, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :watchers, :custom_fields, :custom_values, :versions, :queries diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb index c29e04ede..bd1c9a9b4 100644 --- a/test/unit/repository_bazaar_test.rb +++ b/test/unit/repository_bazaar_test.rb @@ -15,7 +15,7 @@ # 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 RepositoryBazaarTest < ActiveSupport::TestCase fixtures :projects diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb index d240a6efd..5174f2c29 100644 --- a/test/unit/repository_cvs_test.rb +++ b/test/unit/repository_cvs_test.rb @@ -15,7 +15,7 @@ # 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__) require 'pp' class RepositoryCvsTest < ActiveSupport::TestCase fixtures :projects diff --git a/test/unit/repository_darcs_test.rb b/test/unit/repository_darcs_test.rb index b9ad95db6..c612a716e 100644 --- a/test/unit/repository_darcs_test.rb +++ b/test/unit/repository_darcs_test.rb @@ -15,7 +15,7 @@ # 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 RepositoryDarcsTest < ActiveSupport::TestCase fixtures :projects diff --git a/test/unit/repository_filesystem_test.rb b/test/unit/repository_filesystem_test.rb index 7688dd4ee..0ba8f54a2 100644 --- a/test/unit/repository_filesystem_test.rb +++ b/test/unit/repository_filesystem_test.rb @@ -15,7 +15,7 @@ # 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 RepositoryFilesystemTest < ActiveSupport::TestCase fixtures :projects diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb index 5ae889492..acf4f174a 100644 --- a/test/unit/repository_git_test.rb +++ b/test/unit/repository_git_test.rb @@ -15,7 +15,7 @@ # 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 RepositoryGitTest < ActiveSupport::TestCase fixtures :projects diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb index 6ce3d5fa0..3e2f56925 100644 --- a/test/unit/repository_mercurial_test.rb +++ b/test/unit/repository_mercurial_test.rb @@ -15,7 +15,7 @@ # 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 RepositoryMercurialTest < ActiveSupport::TestCase fixtures :projects diff --git a/test/unit/repository_subversion_test.rb b/test/unit/repository_subversion_test.rb index ca4d2ce04..903cdd049 100644 --- a/test/unit/repository_subversion_test.rb +++ b/test/unit/repository_subversion_test.rb @@ -15,7 +15,7 @@ # 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 RepositorySubversionTest < ActiveSupport::TestCase fixtures :projects, :repositories diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb index 5299dc9d9..02db9b5a5 100644 --- a/test/unit/repository_test.rb +++ b/test/unit/repository_test.rb @@ -15,7 +15,7 @@ # 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 RepositoryTest < ActiveSupport::TestCase fixtures :projects, diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb index df751eb49..41ad7e883 100644 --- a/test/unit/role_test.rb +++ b/test/unit/role_test.rb @@ -15,7 +15,7 @@ # 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 RoleTest < ActiveSupport::TestCase fixtures :roles, :workflows diff --git a/test/unit/search_test.rb b/test/unit/search_test.rb index 71ed7ad08..2cf041772 100644 --- a/test/unit/search_test.rb +++ b/test/unit/search_test.rb @@ -15,7 +15,7 @@ # 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 SearchTest < ActiveSupport::TestCase fixtures :users, diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb index 25ec41701..d139e320f 100644 --- a/test/unit/setting_test.rb +++ b/test/unit/setting_test.rb @@ -15,7 +15,7 @@ # 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 SettingTest < ActiveSupport::TestCase diff --git a/test/unit/testing_test.rb b/test/unit/testing_test.rb index 7c78288e5..ed3b71a3e 100644 --- a/test/unit/testing_test.rb +++ b/test/unit/testing_test.rb @@ -15,7 +15,7 @@ # 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__) # Test case that checks that the testing infrastructure is setup correctly. class TestingTest < ActiveSupport::TestCase diff --git a/test/unit/time_entry_activity_test.rb b/test/unit/time_entry_activity_test.rb index 16077c0c9..4d343bcb9 100644 --- a/test/unit/time_entry_activity_test.rb +++ b/test/unit/time_entry_activity_test.rb @@ -15,7 +15,7 @@ # 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 TimeEntryActivityTest < ActiveSupport::TestCase fixtures :enumerations, :time_entries diff --git a/test/unit/time_entry_test.rb b/test/unit/time_entry_test.rb index 3069f9368..ef4ad81b2 100644 --- a/test/unit/time_entry_test.rb +++ b/test/unit/time_entry_test.rb @@ -15,7 +15,7 @@ # 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 TimeEntryTest < ActiveSupport::TestCase fixtures :issues, :projects, :users, :time_entries diff --git a/test/unit/token_test.rb b/test/unit/token_test.rb index 42791e6a7..370c5d725 100644 --- a/test/unit/token_test.rb +++ b/test/unit/token_test.rb @@ -15,7 +15,7 @@ # 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 TokenTest < ActiveSupport::TestCase fixtures :tokens diff --git a/test/unit/tracker_test.rb b/test/unit/tracker_test.rb index f27550aa6..a5da0cdfb 100644 --- a/test/unit/tracker_test.rb +++ b/test/unit/tracker_test.rb @@ -15,7 +15,7 @@ # 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 TrackerTest < ActiveSupport::TestCase fixtures :trackers, :workflows, :issue_statuses, :roles diff --git a/test/unit/user_preference_test.rb b/test/unit/user_preference_test.rb index 19dc63ff8..371eb025b 100644 --- a/test/unit/user_preference_test.rb +++ b/test/unit/user_preference_test.rb @@ -15,7 +15,7 @@ # 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 UserPreferenceTest < ActiveSupport::TestCase fixtures :users, :user_preferences diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index ee5df0ee7..5f1e41a65 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -15,7 +15,7 @@ # 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 UserTest < ActiveSupport::TestCase fixtures :users, :members, :projects, :roles, :member_roles, :auth_sources diff --git a/test/unit/version_test.rb b/test/unit/version_test.rb index b30eedaea..fa98c0098 100644 --- a/test/unit/version_test.rb +++ b/test/unit/version_test.rb @@ -15,7 +15,7 @@ # 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 VersionTest < ActiveSupport::TestCase fixtures :projects, :users, :issues, :issue_statuses, :trackers, :enumerations, :versions diff --git a/test/unit/watcher_test.rb b/test/unit/watcher_test.rb index d0fe588bf..48c303135 100644 --- a/test/unit/watcher_test.rb +++ b/test/unit/watcher_test.rb @@ -15,7 +15,7 @@ # 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 WatcherTest < ActiveSupport::TestCase fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules, diff --git a/test/unit/wiki_content_test.rb b/test/unit/wiki_content_test.rb index 0261678ab..7ce5ef375 100644 --- a/test/unit/wiki_content_test.rb +++ b/test/unit/wiki_content_test.rb @@ -15,7 +15,7 @@ # 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 WikiContentTest < ActiveSupport::TestCase fixtures :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions, :users diff --git a/test/unit/wiki_page_test.rb b/test/unit/wiki_page_test.rb index c8fd1b298..20c6d383e 100644 --- a/test/unit/wiki_page_test.rb +++ b/test/unit/wiki_page_test.rb @@ -15,7 +15,7 @@ # 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 WikiPageTest < ActiveSupport::TestCase fixtures :projects, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions diff --git a/test/unit/wiki_redirect_test.rb b/test/unit/wiki_redirect_test.rb index 3e19d4958..387de9bbf 100644 --- a/test/unit/wiki_redirect_test.rb +++ b/test/unit/wiki_redirect_test.rb @@ -15,7 +15,7 @@ # 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 WikiRedirectTest < ActiveSupport::TestCase fixtures :projects, :wikis, :wiki_pages diff --git a/test/unit/wiki_test.rb b/test/unit/wiki_test.rb index 82a08b4c4..bc5ad8a08 100644 --- a/test/unit/wiki_test.rb +++ b/test/unit/wiki_test.rb @@ -17,7 +17,7 @@ # 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 WikiTest < ActiveSupport::TestCase fixtures :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions |