Use `require_relative` instead of `require File.expand_path(..., __FILE__)` (#38093).

Patch by Go MAEDA.

git-svn-id: https://svn.redmine.org/redmine/trunk@22016 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/extra/sample_plugin/test/integration/routing_test.rb b/extra/sample_plugin/test/integration/routing_test.rb
index 50ad4603f5104ce41a52ec0f1d092147dd370129..916fbd2c327c4be58426fcab4757fc81f86d571e 100644 (file)
--- a/extra/sample_plugin/test/integration/routing_test.rb
+++ b/extra/sample_plugin/test/integration/routing_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '../../../../../test/test_helper')
+require_relative '../../../../test/test_helper'
 
 class SamplePluginRoutingTest < ActionDispatch::IntegrationTest
   def test_example

diff --git a/lib/generators/redmine_plugin/templates/test_helper.rb.erb b/lib/generators/redmine_plugin/templates/test_helper.rb.erb
index 54685d33ca58645c65e0566b7d3a93d166f71f44..55b016f6c0b1d1ae22ffa69a2cc0a9a907ce5a0f 100644 (file)
--- a/lib/generators/redmine_plugin/templates/test_helper.rb.erb
+++ b/lib/generators/redmine_plugin/templates/test_helper.rb.erb
@@ -1,2 +1,2 @@
 # Load the Redmine helper
-require File.expand_path(File.dirname(__FILE__) + '/../../../test/test_helper')
+require_relative '../../../test/test_helper'

diff --git a/lib/generators/redmine_plugin_controller/templates/functional_test.rb.erb b/lib/generators/redmine_plugin_controller/templates/functional_test.rb.erb
index 0499b6970727bf77f381e785a2f571bd69a728a7..89cd961aeaa213c86c8907972587a62dd28a6f44 100644 (file)
--- a/lib/generators/redmine_plugin_controller/templates/functional_test.rb.erb
+++ b/lib/generators/redmine_plugin_controller/templates/functional_test.rb.erb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class <%= @controller_class %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.

diff --git a/lib/generators/redmine_plugin_model/templates/unit_test.rb.erb b/lib/generators/redmine_plugin_model/templates/unit_test.rb.erb
index ad15149fa73de8ebd19e3fb96e4013d4d6399625..304516a35a468966c6571dac769870ef66fe5986 100644 (file)
--- a/lib/generators/redmine_plugin_model/templates/unit_test.rb.erb
+++ b/lib/generators/redmine_plugin_model/templates/unit_test.rb.erb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class <%= @model_class %>Test < ActiveSupport::TestCase
 

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index f27327a4ab5c0e082eff338cc7e63d4512407f0b..28b1ea1302ad3bb0e7aaf98a875f1b2dff8c960e 100644 (file)
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.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.expand_path('../wiki_formatting/textile/redcloth3', __FILE__)
+require_relative 'wiki_formatting/textile/redcloth3'
 require 'digest/md5'
 
 module Redmine

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 68a4e44cf80f9df2092962e8579850f0bb7e80bc..52dd2fc45fdd315bf530bc019576ba33dcd21736 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.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.expand_path('../test_helper', __FILE__)
+require_relative 'test_helper'
 require 'webdrivers/chromedriver'
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase

diff --git a/test/extra/redmine_pm/repository_git_test_pm.rb b/test/extra/redmine_pm/repository_git_test_pm.rb
index 4f9edf72583507b74304c5765be55fd9eb33fd3f..c76df823839fbd8247ba086bf4cfb5486e47abbc 100644 (file)
--- a/test/extra/redmine_pm/repository_git_test_pm.rb
+++ b/test/extra/redmine_pm/repository_git_test_pm.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.expand_path('../test_case', __FILE__)
+require_relative 'test_case'
 require 'tmpdir'
 
 class RedminePmTest::RepositoryGitTest < RedminePmTest::TestCase

diff --git a/test/extra/redmine_pm/repository_subversion_test_pm.rb b/test/extra/redmine_pm/repository_subversion_test_pm.rb
index 8970beba00a689cddf526b2eb7c36412cf42e528..e9f24695c0200506cb419c40a537ddff78b7167e 100644 (file)
--- a/test/extra/redmine_pm/repository_subversion_test_pm.rb
+++ b/test/extra/redmine_pm/repository_subversion_test_pm.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.expand_path('../test_case', __FILE__)
+require_relative 'test_case'
 require 'tmpdir'
 
 class RedminePmTest::RepositorySubversionTest < RedminePmTest::TestCase

diff --git a/test/extra/redmine_pm/test_case.rb b/test/extra/redmine_pm/test_case.rb
index cc731c9df619fe18f73629870421d8e3b7ee3c0c..4d69cb9b263e3429e41f09c535d248e736b49097 100644 (file)
--- a/test/extra/redmine_pm/test_case.rb
+++ b/test/extra/redmine_pm/test_case.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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 module RedminePmTest
   class TestCase < ActiveSupport::TestCase

diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index 295435f4ed9428d9711d3cb6d6231e87a8a1cbde..f539f4619b6736faea7faf6e7263cb97589b016c 100644 (file)
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AccountControllerTest < Redmine::ControllerTest
   fixtures :users, :email_addresses, :roles

diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb
index 1d31ed1ffdf8cea08226f6b59c50be724d2e1ff5..fbbf9e601e76482a87a14466db482fb12489fbfb 100644 (file)
--- a/test/functional/activities_controller_test.rb
+++ b/test/functional/activities_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ActivitiesControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index 76241c4cbb310b2308de8de329f29008b663a4e0..78631b3096e853f2587645175d00273f9d372a81 100644 (file)
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AdminControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :roles

diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index 4f6cd93ad8812505491acdedb4014cba859b8fc0..1ac44e60e503af26445c55ba2608b080eef13e11 100644 (file)
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ApplicationControllerTest < Redmine::ControllerTest
   def test_back_url_should_remove_utf8_checkmark_from_referer

diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index 2cbaf830d5e60a19f44a3135ef9617b3011cd66c..82d0b18ad4e114104aa247cdeeff0f46d23fa738 100644 (file)
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AttachmentsControllerTest < Redmine::ControllerTest
   fixtures :users, :user_preferences, :projects, :roles, :members, :member_roles,

diff --git a/test/functional/attachments_visibility_test.rb b/test/functional/attachments_visibility_test.rb
index 57514ebb76fdd0d54bb6d7acb2de9123bca6c77b..d64a6053e347e0bd36462cd08b5a6f47d8769ac2 100644 (file)
--- a/test/functional/attachments_visibility_test.rb
+++ b/test/functional/attachments_visibility_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AttachmentsVisibilityTest < Redmine::ControllerTest
   tests AttachmentsController

diff --git a/test/functional/auth_sources_controller_test.rb b/test/functional/auth_sources_controller_test.rb
index 914cdf78dfb7879514e8af11d5a74b831f2f7b3e..606c33b86d9204778ee2577255f4455d514a81f6 100644 (file)
--- a/test/functional/auth_sources_controller_test.rb
+++ b/test/functional/auth_sources_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AuthSourcesControllerTest < Redmine::ControllerTest
   fixtures :users, :auth_sources

diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb
index e30436f3f1a101e943a8bf87ed297d5771fa8dd6..0240a391d7b25cab670cd94787481b2b75e6cd23 100644 (file)
--- a/test/functional/auto_completes_controller_test.rb
+++ b/test/functional/auto_completes_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AutoCompletesControllerTest < Redmine::ControllerTest
   fixtures :projects, :issues, :issue_statuses,

diff --git a/test/functional/boards_controller_test.rb b/test/functional/boards_controller_test.rb
index 132ddf8ffed28fb3d86ca105a5aad26025ab8b09..57f1aff904d0a8e5ee81257a6469ee3cd9f3ebba 100644 (file)
--- a/test/functional/boards_controller_test.rb
+++ b/test/functional/boards_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class BoardsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :members, :member_roles, :roles, :boards, :messages, :enabled_modules

diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index 98ee771bdc82eced41a7295a14f69b39c3c5a9b4..dc7698e9aca1c68b93bf1298e84fd63fc5cb8e9b 100644 (file)
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class CalendarsControllerTest < Redmine::ControllerTest
   fixtures :projects,

diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index ac37197cdd84206a0dc73740f803af9cbc2d52d7..64a6f1209b5a0ef48e180066d1adf328e0b0a65a 100644 (file)
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class CommentsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :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 e2d0baf3c5de77ab6356378935c916a00a612411..b604c280211be67f0a3b85d42a1c939ed8f30f30 100644 (file)
--- a/test/functional/context_menus_controller_test.rb
+++ b/test/functional/context_menus_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ContextMenusControllerTest < Redmine::ControllerTest
   fixtures :projects,

diff --git a/test/functional/custom_field_enumerations_controller_test.rb b/test/functional/custom_field_enumerations_controller_test.rb
index 7427e11fe3d9f8fc94f3f84c6fe03432418c73e3..034e4979764c7b103cfdba67e7fc0a2ed6dab6e4 100644 (file)
--- a/test/functional/custom_field_enumerations_controller_test.rb
+++ b/test/functional/custom_field_enumerations_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class CustomFieldEnumerationsControllerTest < Redmine::ControllerTest
   fixtures :users, :email_addresses

diff --git a/test/functional/custom_fields_controller_test.rb b/test/functional/custom_fields_controller_test.rb
index ad686047f6d0426f3030728b45cc39fbd8a664ec..8ab392b5a514b3b1dddbb1758da88a3907c5b07d 100644 (file)
--- a/test/functional/custom_fields_controller_test.rb
+++ b/test/functional/custom_fields_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class CustomFieldsControllerTest < Redmine::ControllerTest
   fixtures :custom_fields, :custom_values,

diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb
index 5b480360f9b01e272b205ec90bf4313ea9144981..099683640d76c44bb12e1bd04cc402a1c890adc4 100644 (file)
--- a/test/functional/documents_controller_test.rb
+++ b/test/functional/documents_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class DocumentsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,

diff --git a/test/functional/email_addresses_controller_test.rb b/test/functional/email_addresses_controller_test.rb
index 2cb5032264826ebe48d9a125cc848dbddc594e8d..b01c8233e13328d1d77bff9d30df2872269860e6 100644 (file)
--- a/test/functional/email_addresses_controller_test.rb
+++ b/test/functional/email_addresses_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class EmailAddressesControllerTest < Redmine::ControllerTest
   fixtures :users, :email_addresses

diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb
index 076694e35ba8488f43fe7e39fb70043511996b8a..686de39cba63bf59b5ff46608753d7071d15ab02 100644 (file)
--- a/test/functional/enumerations_controller_test.rb
+++ b/test/functional/enumerations_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class EnumerationsControllerTest < Redmine::ControllerTest
   fixtures :enumerations, :issues, :users

diff --git a/test/functional/files_controller_test.rb b/test/functional/files_controller_test.rb
index 070f1cc42b51aa56a37412b8faec048907b2cc09..dcab66d9acc85c7b18615c6cf656c11d17408a8a 100644 (file)
--- a/test/functional/files_controller_test.rb
+++ b/test/functional/files_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class FilesControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb
index ab4a2ff439fde64d791694d5af2bb7d7cc400b73..b3a68c4831aa4531f7c3ef68b305ab5dba480d51 100644 (file)
--- a/test/functional/gantts_controller_test.rb
+++ b/test/functional/gantts_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class GanttsControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/functional/groups_controller_test.rb b/test/functional/groups_controller_test.rb
index 556037888fed6fed7d8d9ff0de8db89f1cc27c58..1f4e6b35f35a0e52981455623d9f635edff8a877 100644 (file)
--- a/test/functional/groups_controller_test.rb
+++ b/test/functional/groups_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class GroupsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :members, :member_roles, :roles, :groups_users

diff --git a/test/functional/imports_controller_test.rb b/test/functional/imports_controller_test.rb
index 9eb9c70abbf5e40a42aad6e8f1819967f88810bd..0297eca6e0001a5d7d8e3d16be8e99e17b93255f 100644 (file)
--- a/test/functional/imports_controller_test.rb
+++ b/test/functional/imports_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ImportsControllerTest < Redmine::ControllerTest
   fixtures :projects, :enabled_modules,

diff --git a/test/functional/issue_categories_controller_test.rb b/test/functional/issue_categories_controller_test.rb
index c686ce6e6b862a93aa8c189dda79d6f0c38fd173..49163ef6e4977fd26b713f3d33f076d0d25c431a 100644 (file)
--- a/test/functional/issue_categories_controller_test.rb
+++ b/test/functional/issue_categories_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueCategoriesControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules, :issue_categories,

diff --git a/test/functional/issue_relations_controller_test.rb b/test/functional/issue_relations_controller_test.rb
index 342103029d57dd5b043dc18cd650a10333b4cb12..7bb269ce9b17cfb2078ec9fb19667f3e93eefde1 100644 (file)
--- a/test/functional/issue_relations_controller_test.rb
+++ b/test/functional/issue_relations_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueRelationsControllerTest < Redmine::ControllerTest
   fixtures :projects,

diff --git a/test/functional/issue_statuses_controller_test.rb b/test/functional/issue_statuses_controller_test.rb
index 9e7f1b5f11150160be76c4f641adcbffcad66f04..b6a3dfab0dcc0a5ad21daf32db448492f456ac74 100644 (file)
--- a/test/functional/issue_statuses_controller_test.rb
+++ b/test/functional/issue_statuses_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueStatusesControllerTest < Redmine::ControllerTest
   fixtures :issue_statuses, :issues, :users, :trackers, :workflows

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 7ff2e043da6351444bd22d4d94e1016ce294af18..5078dbf449a6b0c66b76c44867ca74282208c38e 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssuesControllerTest < Redmine::ControllerTest
   fixtures :projects,

diff --git a/test/functional/issues_controller_transaction_test.rb b/test/functional/issues_controller_transaction_test.rb
index c45114ff2d5041af9b82bb96900999c8129dc200..b822ccbe1a8b1cb4389fcc63a6ed349632f5aeb7 100644 (file)
--- a/test/functional/issues_controller_transaction_test.rb
+++ b/test/functional/issues_controller_transaction_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 require 'issues_controller'
 
 class IssuesControllerTransactionTest < Redmine::ControllerTest

diff --git a/test/functional/issues_custom_fields_visibility_test.rb b/test/functional/issues_custom_fields_visibility_test.rb
index bc9cd8a7cf3fd001c69b016234586d7c7c30e20d..46ca01100309f0f420d2a638dcb6d68cf3eed79b 100644 (file)
--- a/test/functional/issues_custom_fields_visibility_test.rb
+++ b/test/functional/issues_custom_fields_visibility_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
   tests IssuesController

diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
index ac80cfcaf88dc587a2c22fad4934f1f011d8b1d8..8f4f27ee91673c3fb5468e9a4091162a08a738e4 100644 (file)
--- a/test/functional/journals_controller_test.rb
+++ b/test/functional/journals_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class JournalsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :members, :member_roles, :roles,

diff --git a/test/functional/mail_handler_controller_test.rb b/test/functional/mail_handler_controller_test.rb
index da696ce4718546348710f04354ce8d8bc4f73669..b8089f982c08756d098e928eb760a3683578b352 100644 (file)
--- a/test/functional/mail_handler_controller_test.rb
+++ b/test/functional/mail_handler_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class MailHandlerControllerTest < Redmine::ControllerTest
   fixtures :users, :email_addresses, :projects, :enabled_modules,

diff --git a/test/functional/members_controller_test.rb b/test/functional/members_controller_test.rb
index de04fa18acf47c3bfe40963adad59f765fd18550..e28f50d2e6917f5185a95fa9a4419381d3c8d116 100644 (file)
--- a/test/functional/members_controller_test.rb
+++ b/test/functional/members_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class MembersControllerTest < Redmine::ControllerTest
   fixtures :projects, :members, :member_roles, :roles, :users

diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index b3d7ae7963a2a5a863d204ce7ad3015fc2a38ab5..2535e570b80228464b972f2614c7e39a19aedc92 100644 (file)
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class MessagesControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :user_preferences, :members, :member_roles, :roles, :boards, :messages, :enabled_modules,

diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb
index 65cb7f864bfb3e26570602fb3ef09b6403627ff8..a48ae8b3d390dda0de1ced3c4cdec0daf4de998b 100644 (file)
--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class MyControllerTest < Redmine::ControllerTest
   fixtures :users, :email_addresses, :user_preferences,

diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index 0d62b8f196321d95c0c3ea2a5723dc81b970f074..ffa439073c82c5c9098d6ac7b1df38d115f6a881 100644 (file)
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class NewsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,

diff --git a/test/functional/previews_controller_test.rb b/test/functional/previews_controller_test.rb
index dd439e370d0ab7a2690dccb9e3aa2f6774a285ca..766442f4d10a736018fe76013df8d4f68bbe48ea 100644 (file)
--- a/test/functional/previews_controller_test.rb
+++ b/test/functional/previews_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class PreviewsControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/functional/principal_memberships_controller_test.rb b/test/functional/principal_memberships_controller_test.rb
index 2dc3cfac8e59af0b2bea3bf7656a893e532b6a37..95663b4f541b2a02765bb3d8c1cc7773e0bf28af 100644 (file)
--- a/test/functional/principal_memberships_controller_test.rb
+++ b/test/functional/principal_memberships_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class PrincipalMembershipsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :members, :member_roles, :roles, :groups_users

diff --git a/test/functional/project_enumerations_controller_test.rb b/test/functional/project_enumerations_controller_test.rb
index 62380dd68a4993e09d1ec7ad3fa9ef58c01979ad..52388286384a72a92826b5f7c439572f1fc761e1 100644 (file)
--- a/test/functional/project_enumerations_controller_test.rb
+++ b/test/functional/project_enumerations_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ProjectEnumerationsControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 5c09a329615b219bc3f0abd47d905b6f88015786..a18850e662f208f39190d746c7b8614a0e9d0412 100644 (file)
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ProjectsControllerTest < Redmine::ControllerTest
   fixtures :projects, :versions, :users, :email_addresses, :roles, :members,

diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
index a67b8be0d767307a8ce54dbecb01345257c631eb..0d15c4087c90854402540e606196c6826f99fb00 100644 (file)
--- a/test/functional/queries_controller_test.rb
+++ b/test/functional/queries_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class QueriesControllerTest < Redmine::ControllerTest
   fixtures :projects, :enabled_modules,

diff --git a/test/functional/reports_controller_test.rb b/test/functional/reports_controller_test.rb
index e3ce50f0116ca36cdfa5021b4710131f84851f27..c83fc6b37aae965af31555142a8ad72adf47337f 100644 (file)
--- a/test/functional/reports_controller_test.rb
+++ b/test/functional/reports_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ReportsControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb
index cc0dc9be509a01c796c87304efe07127306a736f..9b59c330ede0b1a09f65a8344051b4d884db84b3 100644 (file)
--- a/test/functional/repositories_bazaar_controller_test.rb
+++ b/test/functional/repositories_bazaar_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoriesBazaarControllerTest < Redmine::RepositoryControllerTest
   tests RepositoriesController

diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb
index 50da54324226b59f740a5d1ccf06ab19fcbfb19d..17d9a50c4c0997c813b659c82fa85f536115d856 100644 (file)
--- a/test/functional/repositories_controller_test.rb
+++ b/test/functional/repositories_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoriesControllerTest < Redmine::RepositoryControllerTest
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles, :enabled_modules,

diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index b81378c7446986b7a8482c47ff06d098ffd179e7..1bac8023a2a36a26b49d947dd9b02439fa685bac 100644 (file)
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoriesCvsControllerTest < Redmine::RepositoryControllerTest
   tests RepositoriesController

diff --git a/test/functional/repositories_filesystem_controller_test.rb b/test/functional/repositories_filesystem_controller_test.rb
index 0ec4c819dc9e567bd4eb5b5b1fa1b5e9b5fb093e..8866eeb12f0dd9438eb49ae195f08fe038dab0f5 100644 (file)
--- a/test/functional/repositories_filesystem_controller_test.rb
+++ b/test/functional/repositories_filesystem_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoriesFilesystemControllerTest < Redmine::RepositoryControllerTest
   tests RepositoriesController

diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index fe7da0b8ec3112f8764c2fb6541857739f1f924f..0ffd3134c4ff8509e9a6caeced5c67f1326c4857 100644 (file)
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
   tests RepositoriesController

diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index a2e5caa5c4533dca910111da69dee07a8b5404ce..afaff18a872fa3d54470ceb7de7e58b28a4d1adc 100644 (file)
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoriesMercurialControllerTest < Redmine::RepositoryControllerTest
   tests RepositoriesController

diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index 3c748c32aba5a88eb423996eaaf93224998daf7a..62b52a3b10be5bcb65034b49b956dc2fe90cc6b9 100644 (file)
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoriesSubversionControllerTest < Redmine::RepositoryControllerTest
   tests RepositoriesController

diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb
index efcd05cdeb29c93615e7e644dc9b34e2b00ee69d..d827713545a8ac329d9f00238e312415580b47c9 100644 (file)
--- a/test/functional/roles_controller_test.rb
+++ b/test/functional/roles_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RolesControllerTest < Redmine::ControllerTest
   fixtures :roles, :users, :members, :member_roles, :workflows, :trackers

diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 0b5bc98386cccf6491c32662ecdfbfd848fb6724..022ad29e9f1417ff53a82de6fe480e02e65494b1 100644 (file)
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SearchControllerTest < Redmine::ControllerTest
   fixtures :projects, :projects_trackers,

diff --git a/test/functional/search_custom_fields_visibility_test.rb b/test/functional/search_custom_fields_visibility_test.rb
index b0b21620bc48e823b47accb5f335e05858c06a54..59c25d07c61406747a33d0f9951a15fdbeafa7cd 100644 (file)
--- a/test/functional/search_custom_fields_visibility_test.rb
+++ b/test/functional/search_custom_fields_visibility_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SearchCustomFieldsVisibilityTest < Redmine::ControllerTest
   tests SearchController

diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
index ccbea8301df7249d3445ea2d4755d2d6b8a3879e..f1ad6201f4067cf6961fd70b5581ec90895ba421 100644 (file)
--- a/test/functional/sessions_controller_test.rb
+++ b/test/functional/sessions_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SessionsControllerTest < Redmine::ControllerTest
   include Redmine::I18n

diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb
index b719cb13dc1bb67362610d8dbfff4604c5ee4229..23f65bc002c97a9cb61ece06a9c096c95ac568f7 100644 (file)
--- a/test/functional/settings_controller_test.rb
+++ b/test/functional/settings_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SettingsControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/functional/sys_controller_test.rb b/test/functional/sys_controller_test.rb
index dec852ef6c0c412023de181e7d70258b80fb29e0..06d139dfc0bbd46a553d0fdc815ba7b2a11f2a26 100644 (file)
--- a/test/functional/sys_controller_test.rb
+++ b/test/functional/sys_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SysControllerTest < Redmine::ControllerTest
   fixtures :projects, :repositories, :enabled_modules

diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 44323796236393375d70e80d81037fb945b8ff45..c0c923377aeca7c0e19e53a586cfe6a399c740ff 100644 (file)
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TimelogControllerTest < Redmine::ControllerTest
   fixtures :projects, :enabled_modules, :roles, :members,

diff --git a/test/functional/timelog_custom_fields_visibility_test.rb b/test/functional/timelog_custom_fields_visibility_test.rb
index cd21c1e42294773dd51a13f364a8b10f5011c957..84039aec3c1798213daa5d389c2ec43712a9bff6 100644 (file)
--- a/test/functional/timelog_custom_fields_visibility_test.rb
+++ b/test/functional/timelog_custom_fields_visibility_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TimelogCustomFieldsVisibilityTest < Redmine::ControllerTest
   tests TimelogController

diff --git a/test/functional/timelog_report_test.rb b/test/functional/timelog_report_test.rb
index 670ad8e379aaf76b8742b5416773a8148805976b..52f1630283a5d9c698f9158cb7b53f2180ea2725 100644 (file)
--- a/test/functional/timelog_report_test.rb
+++ b/test/functional/timelog_report_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TimelogReportTest < Redmine::ControllerTest
   tests TimelogController

diff --git a/test/functional/trackers_controller_test.rb b/test/functional/trackers_controller_test.rb
index f359c785bbaf656238019cb8c7b0e953f8364562..24bd3bff3d560ff17a6de650278202ce06309cd0 100644 (file)
--- a/test/functional/trackers_controller_test.rb
+++ b/test/functional/trackers_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TrackersControllerTest < Redmine::ControllerTest
   fixtures :trackers, :projects, :projects_trackers, :users, :issues, :custom_fields, :issue_statuses

diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index a46f53adc4538441b6707d03bc7d1d48fae3ddf7..ccb40ce4cd331c887ed972d51aa1a9df33517dfc 100644 (file)
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class UsersControllerTest < Redmine::ControllerTest
   include Redmine::I18n

diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index d0403b9a8cea8ccd539efbe2d790906b6661145d..b997a04a4ca88da2b92e053db6c1ed3848961607 100644 (file)
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class VersionsControllerTest < Redmine::ControllerTest
   fixtures :projects, :enabled_modules,

diff --git a/test/functional/versions_custom_fields_visibility_test.rb b/test/functional/versions_custom_fields_visibility_test.rb
index d03cfca65a99f42a76e126d9bfabe7fe71ecd584..cc43e027aa701a19507451100160b6cbc565580a 100644 (file)
--- a/test/functional/versions_custom_fields_visibility_test.rb
+++ b/test/functional/versions_custom_fields_visibility_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class VersionsCustomFieldsVisibilityTest < Redmine::ControllerTest
   tests VersionsController

diff --git a/test/functional/watchers_controller_test.rb b/test/functional/watchers_controller_test.rb
index 38d0039d75a4016f9a4e3fbb927631c82fd03d87..239a0418c650bd6f65284af986424bf36cf94d70 100644 (file)
--- a/test/functional/watchers_controller_test.rb
+++ b/test/functional/watchers_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WatchersControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,

diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb
index 650328e106d824f78248128e72c5af1b0677e7a8..45cbc08ae15ffc144afe04bbe9f75267a964461e 100644 (file)
--- a/test/functional/welcome_controller_test.rb
+++ b/test/functional/welcome_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WelcomeControllerTest < Redmine::ControllerTest
   fixtures :projects, :news, :users, :members, :roles, :member_roles, :enabled_modules

diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 28f36b37f8b358ae90758e4df85b7690f0bbcfef..3765ac8676287bc741e871b07279a80e9f6449ef 100644 (file)
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WikiControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,

diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb
index 4d49372bada5bdc8302d577ee0eacaa9109c0df1..9f3f9bffbd4cab9012e3d24ca7834562237f3e46 100644 (file)
--- a/test/functional/wikis_controller_test.rb
+++ b/test/functional/wikis_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WikisControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :wikis

diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb
index d130135d3d66acdd3c117015781b6f8e92564cdd..b368939d836c566ea5d979f648d805260d76bb28 100644 (file)
--- a/test/functional/workflows_controller_test.rb
+++ b/test/functional/workflows_controller_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WorkflowsControllerTest < Redmine::ControllerTest
   fixtures :roles, :trackers, :workflows, :users, :issue_statuses, :custom_fields

diff --git a/test/helpers/activities_helper_test.rb b/test/helpers/activities_helper_test.rb
index b5116fe5a249c1d9c846d7f64221711a2b075c7e..67a9bbc9a7504f3777bfc30e975212cd6cf08ed3 100644 (file)
--- a/test/helpers/activities_helper_test.rb
+++ b/test/helpers/activities_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ActivitiesHelperTest < Redmine::HelperTest
   include ActivitiesHelper

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 99e1652df2a733340c76b912d6160906c8bcf435..bb6b373906aa7423e8d7155a1527082639e2bbe8 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ApplicationHelperTest < Redmine::HelperTest
   include ERB::Util

diff --git a/test/helpers/avatars_helper_test.rb b/test/helpers/avatars_helper_test.rb
index d6110f9e5a21b2d0d7a5e56e37609163f5898a96..ab28a6d6546155c20c03d4eb05d74cf39485e7b4 100644 (file)
--- a/test/helpers/avatars_helper_test.rb
+++ b/test/helpers/avatars_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AvatarsHelperTest < Redmine::HelperTest
   include ERB::Util

diff --git a/test/helpers/custom_fields_helper_test.rb b/test/helpers/custom_fields_helper_test.rb
index 12ec7d39071a22de01a8e64ff7665d453a8bf2cc..522c843afb39ab49e13c073de7eb5a8430453dbc 100644 (file)
--- a/test/helpers/custom_fields_helper_test.rb
+++ b/test/helpers/custom_fields_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class CustomFieldsHelperTest < Redmine::HelperTest
   include ApplicationHelper

diff --git a/test/helpers/groups_helper_test.rb b/test/helpers/groups_helper_test.rb
index fb8d98132fc050fabdb43b7de4279959f44ca4b7..65debf9d160e020cef52761068071fabfca505ff 100644 (file)
--- a/test/helpers/groups_helper_test.rb
+++ b/test/helpers/groups_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class GroupsHelperTest < Redmine::HelperTest
   include ERB::Util

diff --git a/test/helpers/issues_helper_test.rb b/test/helpers/issues_helper_test.rb
index acbda6439235148d8bade95ae7f59e318708416c..01466bac42dec7eff5fae5240136d99ed7da186f 100644 (file)
--- a/test/helpers/issues_helper_test.rb
+++ b/test/helpers/issues_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssuesHelperTest < Redmine::HelperTest
   include IssuesHelper

diff --git a/test/helpers/journals_helper_test.rb b/test/helpers/journals_helper_test.rb
index 104e5652329331c8f26ab32e06a64363b34c5537..5d158a88645da82f2dc2fce20f1531710f5562e5 100644 (file)
--- a/test/helpers/journals_helper_test.rb
+++ b/test/helpers/journals_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class JournalsHelperTest < Redmine::HelperTest
   include JournalsHelper

diff --git a/test/helpers/members_helper_test.rb b/test/helpers/members_helper_test.rb
index 7aa8fedb680db933fa31a1942ffc139298e5140b..9851ecc85170f961ec28204231a94deebbd815ed 100644 (file)
--- a/test/helpers/members_helper_test.rb
+++ b/test/helpers/members_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class MembersHelperTest < Redmine::HelperTest
   include ERB::Util

diff --git a/test/helpers/projects_helper_test.rb b/test/helpers/projects_helper_test.rb
index 68814f1ead3051fd159801c5cbc0337f533b5e24..33b6d09f70498e09e3611b1917f8f7bb75509ead 100644 (file)
--- a/test/helpers/projects_helper_test.rb
+++ b/test/helpers/projects_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ProjectsHelperTest < Redmine::HelperTest
   include ApplicationHelper

diff --git a/test/helpers/projects_queries_helper_test.rb b/test/helpers/projects_queries_helper_test.rb
index 043a450eecaa7fb4eb704a90dba0448b2e5a0777..f8be430075f724ab065b630cea2a75b62fc0db42 100644 (file)
--- a/test/helpers/projects_queries_helper_test.rb
+++ b/test/helpers/projects_queries_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ProjectsQueriesHelperTest < Redmine::HelperTest
   include ProjectsQueriesHelper

diff --git a/test/helpers/queries_helper_test.rb b/test/helpers/queries_helper_test.rb
index bbbb947001fe6de19d54281dedc4ed5b1a7ce3a8..35d0919a0375f544994d04500dddb4e27943241e 100644 (file)
--- a/test/helpers/queries_helper_test.rb
+++ b/test/helpers/queries_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class QueriesHelperTest < Redmine::HelperTest
   include QueriesHelper

diff --git a/test/helpers/reports_helper_test.rb b/test/helpers/reports_helper_test.rb
index d323a1b042b6184b434cd45342712e6fe84e7d19..c8acc6a20c0c690f90cb33e3101978f5abced98d 100644 (file)
--- a/test/helpers/reports_helper_test.rb
+++ b/test/helpers/reports_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ReportsHlperTest < Redmine::HelperTest
   include ReportsHelper

diff --git a/test/helpers/routes_helper_test.rb b/test/helpers/routes_helper_test.rb
index ad3ad2977debb10c5a497af87c5a1967d6469f0d..55b49c9cc1d6c924acf8eb7c231b50040fbca874 100644 (file)
--- a/test/helpers/routes_helper_test.rb
+++ b/test/helpers/routes_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RoutesHelperTest < Redmine::HelperTest
   fixtures :projects, :issues

diff --git a/test/helpers/search_helper_test.rb b/test/helpers/search_helper_test.rb
index acb871acd5a0a0f3bf8618b12e8437b42ad00527..33fe56a7bb9c5fb8a76b4da01dbe888369a19c0c 100644 (file)
--- a/test/helpers/search_helper_test.rb
+++ b/test/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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SearchHelperTest < Redmine::HelperTest
   include SearchHelper

diff --git a/test/helpers/settings_helper_test.rb b/test/helpers/settings_helper_test.rb
index a203f12cb90b3a9826bbe0b597466196f90e225b..ef9bb05788535c0463d9f47fa648396f49b541f1 100644 (file)
--- a/test/helpers/settings_helper_test.rb
+++ b/test/helpers/settings_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SettingsHelperTest < Redmine::HelperTest
   include SettingsHelper

diff --git a/test/helpers/sort_helper_test.rb b/test/helpers/sort_helper_test.rb
index d49f9d56433063788ed619d9f801d9c2c8f0981b..b9ff8ad3940731a965e099e9340b2f257e69d304 100644 (file)
--- a/test/helpers/sort_helper_test.rb
+++ b/test/helpers/sort_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SortHelperTest < Redmine::HelperTest
   include SortHelper

diff --git a/test/helpers/timelog_helper_test.rb b/test/helpers/timelog_helper_test.rb
index f7a002ba7b825a0ebca2701da73bd1c38092b2d2..07b63084f039fa6d7e7e248f81aa6d6ebc5e7118 100644 (file)
--- a/test/helpers/timelog_helper_test.rb
+++ b/test/helpers/timelog_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TimelogHelperTest < Redmine::HelperTest
   include TimelogHelper

diff --git a/test/helpers/version_helper_test.rb b/test/helpers/version_helper_test.rb
index 09557a32ea3445d0f3dd9974e5522a2b263d8402..73100316e50746c08c34951824d6827366f6aad4 100644 (file)
--- a/test/helpers/version_helper_test.rb
+++ b/test/helpers/version_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class VersionsHelperTest < Redmine::HelperTest
   include Rails.application.routes.url_helpers

diff --git a/test/helpers/watchers_helper_test.rb b/test/helpers/watchers_helper_test.rb
index cb4799826434bc158d6f0059ae53523b52987d52..88aac77de5a14012aaa2d6ea9a1fa846281e5d75 100644 (file)
--- a/test/helpers/watchers_helper_test.rb
+++ b/test/helpers/watchers_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WatchersHelperTest < Redmine::HelperTest
   include WatchersHelper

diff --git a/test/helpers/wiki_helper_test.rb b/test/helpers/wiki_helper_test.rb
index 1d9bf5b034a0b2cc5e42c08eb2e583d60928b0bb..8028b77c1265135fb840156d34a799eafef6e628 100644 (file)
--- a/test/helpers/wiki_helper_test.rb
+++ b/test/helpers/wiki_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WikiHelperTest < Redmine::HelperTest
   include WikiHelper

diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index ba93dad9224f2c7ec9160f3824ddeba5d3e35e96..04bca2d2ca49c609b16e10fa3037800460429549 100644 (file)
--- a/test/integration/account_test.rb
+++ b/test/integration/account_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AccountTest < Redmine::IntegrationTest
   fixtures :users, :email_addresses, :roles

diff --git a/test/integration/admin_test.rb b/test/integration/admin_test.rb
index bb775a5fca93920c177475571d91b2f2f0f0d022..efca29e66a8b661bcbdde13771b3b5abee308f4c 100644 (file)
--- a/test/integration/admin_test.rb
+++ b/test/integration/admin_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AdminTest < Redmine::IntegrationTest
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/api_test/api_routing_test.rb b/test/integration/api_test/api_routing_test.rb
index e4b320f7831fe71e7792382f71a30be34273dbc8..b9526aa4e05b1ee4df1cc8047ebfc5343b150905 100644 (file)
--- a/test/integration/api_test/api_routing_test.rb
+++ b/test/integration/api_test/api_routing_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::ApiRoutingTest < Redmine::ApiTest::Routing
 

diff --git a/test/integration/api_test/api_test.rb b/test/integration/api_test/api_test.rb
index 120c4f8a05011ee9817f5b3a6765e12edca791b1..45925c48bfc54365438cf78507c33a7f559c2934 100644 (file)
--- a/test/integration/api_test/api_test.rb
+++ b/test/integration/api_test/api_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::ApiTest < Redmine::ApiTest::Base
   fixtures :users, :email_addresses, :members, :member_roles, :roles, :projects

diff --git a/test/integration/api_test/attachments_test.rb b/test/integration/api_test/attachments_test.rb
index 1a16e0a4b6b0118f7a6dc66fbef926693cfd4a69..6de463843e6fbdab81c99330ce884dc4e58e4cbd 100644 (file)
--- a/test/integration/api_test/attachments_test.rb
+++ b/test/integration/api_test/attachments_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::AttachmentsTest < Redmine::ApiTest::Base
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/api_test/authentication_test.rb b/test/integration/api_test/authentication_test.rb
index 9ff4aedb56567c19ae82623b5169aba76c8a71f3..ffabf9ff210778c005d28d2339ee3a0756bd5cc2 100644 (file)
--- a/test/integration/api_test/authentication_test.rb
+++ b/test/integration/api_test/authentication_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::AuthenticationTest < Redmine::ApiTest::Base
   fixtures :users

diff --git a/test/integration/api_test/custom_fields_attribute_test.rb b/test/integration/api_test/custom_fields_attribute_test.rb
index 2905a3b6f82ab6b898b78388401d3b4404f933ec..ffa4a4d4302377c6547c2a8b019a5e3b8401f61c 100644 (file)
--- a/test/integration/api_test/custom_fields_attribute_test.rb
+++ b/test/integration/api_test/custom_fields_attribute_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::CustomFieldsAttributeTest < Redmine::ApiTest::Base
   fixtures :users

diff --git a/test/integration/api_test/custom_fields_test.rb b/test/integration/api_test/custom_fields_test.rb
index c020b7a4e603089ae386e295dbe9961704eba65a..5cdbd88160287e11d3c85435426f2c630a4a060e 100644 (file)
--- a/test/integration/api_test/custom_fields_test.rb
+++ b/test/integration/api_test/custom_fields_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::CustomFieldsTest < Redmine::ApiTest::Base
   fixtures :users, :custom_fields

diff --git a/test/integration/api_test/disabled_rest_api_test.rb b/test/integration/api_test/disabled_rest_api_test.rb
index 3b14a6e38218c34e7b4cdc159d93a79badf07815..63b0aa913fa2a52635e12b9aee174e49813b3513 100644 (file)
--- a/test/integration/api_test/disabled_rest_api_test.rb
+++ b/test/integration/api_test/disabled_rest_api_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::DisabledRestApiTest < Redmine::ApiTest::Base
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/api_test/enumerations_test.rb b/test/integration/api_test/enumerations_test.rb
index 791b7369b095f0d6ac22eb9157786993489d73a9..c96a39893a18071c64a08f93902daaae7ec74d11 100644 (file)
--- a/test/integration/api_test/enumerations_test.rb
+++ b/test/integration/api_test/enumerations_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::EnumerationsTest < Redmine::ApiTest::Base
   fixtures :enumerations

diff --git a/test/integration/api_test/files_test.rb b/test/integration/api_test/files_test.rb
index 7226db497afc51c3cf1212470b5092f2155e8ba1..00d0b96e44f1b1d4f1e94fb567ec495344ae5fa0 100644 (file)
--- a/test/integration/api_test/files_test.rb
+++ b/test/integration/api_test/files_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::FilesTest < Redmine::ApiTest::Base
   fixtures :projects,

diff --git a/test/integration/api_test/groups_test.rb b/test/integration/api_test/groups_test.rb
index 198ac02c32b818d035431871eb4e10ce2472f5b3..1278731612f5148994ba97ffdd5ac475842963b7 100644 (file)
--- a/test/integration/api_test/groups_test.rb
+++ b/test/integration/api_test/groups_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::GroupsTest < Redmine::ApiTest::Base
   fixtures :users, :groups_users, :email_addresses

diff --git a/test/integration/api_test/issue_categories_test.rb b/test/integration/api_test/issue_categories_test.rb
index 5ec44eb6bc1c7f27d31d3554e1cac3ed3cdb4feb..fb4e18f93c79244b1de04d4a6b3c9ee7f70571e7 100644 (file)
--- a/test/integration/api_test/issue_categories_test.rb
+++ b/test/integration/api_test/issue_categories_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::IssueCategoriesTest < Redmine::ApiTest::Base
   fixtures :projects, :users, :issue_categories, :issues,

diff --git a/test/integration/api_test/issue_relations_test.rb b/test/integration/api_test/issue_relations_test.rb
index f229a0bfae18d4602dd7d259dd40d872d301b488..4978b6f5b7be152b6d1a6c0a79e2dc3611e9a703 100644 (file)
--- a/test/integration/api_test/issue_relations_test.rb
+++ b/test/integration/api_test/issue_relations_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::IssueRelationsTest < Redmine::ApiTest::Base
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/api_test/issue_statuses_test.rb b/test/integration/api_test/issue_statuses_test.rb
index cb764758594d8903a273934b0162a5f21af73bf6..c92ba55a97dad9d815d9d0bf12482172153e67e5 100644 (file)
--- a/test/integration/api_test/issue_statuses_test.rb
+++ b/test/integration/api_test/issue_statuses_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::IssueStatusesTest < Redmine::ApiTest::Base
   fixtures :issue_statuses

diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb
index 8c13c19ca360d7930ab8c507f8bc5b15247486b5..132b6f815993d6804b971909acdc6eb468572957 100644 (file)
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
   fixtures(

diff --git a/test/integration/api_test/journals_test.rb b/test/integration/api_test/journals_test.rb
index f637d90f45864d462502bb0eddf65ba8c1f0d3c1..c5d71162455795ac864013d67975e2a31891098a 100644 (file)
--- a/test/integration/api_test/journals_test.rb
+++ b/test/integration/api_test/journals_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::JournalTest < Redmine::ApiTest::Base
   fixtures :projects, :issues, :issue_statuses, :journals, :journal_details,

diff --git a/test/integration/api_test/jsonp_test.rb b/test/integration/api_test/jsonp_test.rb
index 59f19a65051069ff0a77f5b9622ce9287e76dfcc..628125735e5c135eb0e9b910e0a162b9455add5c 100644 (file)
--- a/test/integration/api_test/jsonp_test.rb
+++ b/test/integration/api_test/jsonp_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::JsonpTest < Redmine::ApiTest::Base
   fixtures :trackers

diff --git a/test/integration/api_test/memberships_test.rb b/test/integration/api_test/memberships_test.rb
index bb9b213c73b4918c5c8f2a3dc681419baed516a6..01ebbf610891a00c5c0fc0983971b37f5ea1a5d0 100644 (file)
--- a/test/integration/api_test/memberships_test.rb
+++ b/test/integration/api_test/memberships_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::MembershipsTest < Redmine::ApiTest::Base
   fixtures :projects, :users, :roles, :members, :member_roles

diff --git a/test/integration/api_test/my_test.rb b/test/integration/api_test/my_test.rb
index 33e2f59a2656eaff846f46a6c7e69c9b4dc257da..76a2087e9a30accec4c0d449c387d7afa8cc529b 100644 (file)
--- a/test/integration/api_test/my_test.rb
+++ b/test/integration/api_test/my_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::MyTest < Redmine::ApiTest::Base
   fixtures :users, :email_addresses, :members, :member_roles, :roles, :projects

diff --git a/test/integration/api_test/news_test.rb b/test/integration/api_test/news_test.rb
index 1827c8829d89bb3beaed82ea27aab35f41b264d5..7bdc8f839150e06826b22ce28f1879816d02e73c 100644 (file)
--- a/test/integration/api_test/news_test.rb
+++ b/test/integration/api_test/news_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::NewsTest < Redmine::ApiTest::Base
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/api_test/projects_test.rb b/test/integration/api_test/projects_test.rb
index d8ae42576848ffa2de3ef961315418d1bbe539ea..f0c1973cb1906a4334e6662af895dd3b84777335 100644 (file)
--- a/test/integration/api_test/projects_test.rb
+++ b/test/integration/api_test/projects_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::ProjectsTest < Redmine::ApiTest::Base
   include ActiveJob::TestHelper

diff --git a/test/integration/api_test/queries_test.rb b/test/integration/api_test/queries_test.rb
index 01f0ac901633dad137dd25699ab8123d2cca86fc..268f3be7497b8b74b6b4c8f8e572cbb33d57a4d5 100644 (file)
--- a/test/integration/api_test/queries_test.rb
+++ b/test/integration/api_test/queries_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::QueriesTest < Redmine::ApiTest::Base
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/api_test/repositories_test.rb b/test/integration/api_test/repositories_test.rb
index 7a96c8373001039ebad39b85e261edeeca731751..01d46a5fd8468e2ea47965022bc4f3661f22db21 100644 (file)
--- a/test/integration/api_test/repositories_test.rb
+++ b/test/integration/api_test/repositories_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::RepositoriesTest < Redmine::ApiTest::Base
   fixtures :users,

diff --git a/test/integration/api_test/roles_test.rb b/test/integration/api_test/roles_test.rb
index 34b0ec784dc052db1bcae9672ea37cccef5836cd..cdd9c2803229ef3e55f0691b2bbb157e59305adc 100644 (file)
--- a/test/integration/api_test/roles_test.rb
+++ b/test/integration/api_test/roles_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::RolesTest < Redmine::ApiTest::Base
   fixtures :roles

diff --git a/test/integration/api_test/search_test.rb b/test/integration/api_test/search_test.rb
index d1e5de8eab62cde77b056b35227d13809699b6d3..e1871f89315c256923fa56554a899a67ea94fee4 100644 (file)
--- a/test/integration/api_test/search_test.rb
+++ b/test/integration/api_test/search_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::SearchTest < Redmine::ApiTest::Base
   fixtures :projects, :projects_trackers,

diff --git a/test/integration/api_test/time_entries_test.rb b/test/integration/api_test/time_entries_test.rb
index 797a6655ac77143d710707c850218637d5eed863..1cd5765c8dec79772496dcf1deece7ef4b3417e0 100644 (file)
--- a/test/integration/api_test/time_entries_test.rb
+++ b/test/integration/api_test/time_entries_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::TimeEntriesTest < Redmine::ApiTest::Base
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/api_test/trackers_test.rb b/test/integration/api_test/trackers_test.rb
index 7322cd2ee0b5d20c93e5b5e8addfb8e4494dfe20..d239aabb697503e56b4242fee57de3c4892e866e 100644 (file)
--- a/test/integration/api_test/trackers_test.rb
+++ b/test/integration/api_test/trackers_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::TrackersTest < Redmine::ApiTest::Base
   fixtures :trackers

diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb
index 34bc51f75d1f1422ca7afafc3b0739286290aef3..81ac487ac40d13c7db73a763ac9567b8afc41007 100644 (file)
--- a/test/integration/api_test/users_test.rb
+++ b/test/integration/api_test/users_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
   fixtures :users, :email_addresses, :members, :member_roles, :roles, :projects

diff --git a/test/integration/api_test/versions_test.rb b/test/integration/api_test/versions_test.rb
index 1c0b07e59630519365387c604950ccffe7c9bb9b..267a4bef98fdd43f25fd4a60bb7dc379cc1e16e1 100644 (file)
--- a/test/integration/api_test/versions_test.rb
+++ b/test/integration/api_test/versions_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::VersionsTest < Redmine::ApiTest::Base
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/api_test/wiki_pages_test.rb b/test/integration/api_test/wiki_pages_test.rb
index 571edc1b0fc53444dc55f773e899ab0b6a36b5cf..98c11e7f22587bb36d99e1d7e316cdd79d8a17ed 100644 (file)
--- a/test/integration/api_test/wiki_pages_test.rb
+++ b/test/integration/api_test/wiki_pages_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class Redmine::ApiTest::WikiPagesTest < Redmine::ApiTest::Base
   fixtures :projects, :users, :roles, :members, :member_roles,

diff --git a/test/integration/application_test.rb b/test/integration/application_test.rb
index f7abae80b7f892e1162b68d73abbcbfd2056dd5f..d6caac41a6bab9326385ede248bbea55e47c8955 100644 (file)
--- a/test/integration/application_test.rb
+++ b/test/integration/application_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ApplicationTest < Redmine::IntegrationTest
   include Redmine::I18n

diff --git a/test/integration/attachments_test.rb b/test/integration/attachments_test.rb
index a7755ac293f30b2c1663ff3d9ce328ebbc3ed6aa..9060a0fb3a72bdeb8c16784d8e08dab32d1a10c4 100644 (file)
--- a/test/integration/attachments_test.rb
+++ b/test/integration/attachments_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AttachmentsTest < Redmine::IntegrationTest
   fixtures :projects, :enabled_modules,

diff --git a/test/integration/feeds_test.rb b/test/integration/feeds_test.rb
index 265a1db17b5311d61c4f62ce65af19ab08fd8257..febaa14e65cbf6385f68234062262f185a3e2d87 100644 (file)
--- a/test/integration/feeds_test.rb
+++ b/test/integration/feeds_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class FeedsTest < Redmine::IntegrationTest
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index 93ab661b3f51820acaa3a3cd0ffddd61d8b0ea2a..c9f5c35375752854b16eba03f678067f6dbe4a79 100644 (file)
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssuesTest < Redmine::IntegrationTest
   fixtures :projects,

diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb
index 89dff619bdf0e3c26573414f77211ba3df41ee8b..6918b11f92cd1aab5efc0d9a78f4dd7e747f72a3 100644 (file)
--- a/test/integration/layout_test.rb
+++ b/test/integration/layout_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class LayoutTest < Redmine::IntegrationTest
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/integration/lib/redmine/field_format/attachment_format_test.rb b/test/integration/lib/redmine/field_format/attachment_format_test.rb
index eb86dfb123c48e9e76717bc6727ee8b7f6a3aeb2..2b962ec79e215292b653cfefafc7946213415eac 100644 (file)
--- a/test/integration/lib/redmine/field_format/attachment_format_test.rb
+++ b/test/integration/lib/redmine/field_format/attachment_format_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class AttachmentFieldFormatTest < Redmine::IntegrationTest
   fixtures :projects,

diff --git a/test/integration/lib/redmine/hook_test.rb b/test/integration/lib/redmine/hook_test.rb
index ae24f5bd1e49955beeaa2644d76487d49dcbb404..9eacded52e9efc073b0f29875a4dcb19fe84aee4 100644 (file)
--- a/test/integration/lib/redmine/hook_test.rb
+++ b/test/integration/lib/redmine/hook_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class HookTest < Redmine::IntegrationTest
   fixtures :users, :roles, :projects, :members, :member_roles

diff --git a/test/integration/lib/redmine/menu_manager_test.rb b/test/integration/lib/redmine/menu_manager_test.rb
index 533c3eb4b719d8307f80d7b8b5e61b90ff90967b..3bc01ee8f64cc5bdf45c8e7d20696b6124875508 100644 (file)
--- a/test/integration/lib/redmine/menu_manager_test.rb
+++ b/test/integration/lib/redmine/menu_manager_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class MenuManagerTest < Redmine::IntegrationTest
   include Redmine::I18n

diff --git a/test/integration/lib/redmine/themes_test.rb b/test/integration/lib/redmine/themes_test.rb
index 9c5cefb7aeff006d1ea29061489d7625b5a3e5b8..f7434468f8c5a58ee7bdf17b74474839f915e9ef 100644 (file)
--- a/test/integration/lib/redmine/themes_test.rb
+++ b/test/integration/lib/redmine/themes_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class ThemesTest < Redmine::IntegrationTest
 

diff --git a/test/integration/projects_test.rb b/test/integration/projects_test.rb
index c5a16d954a317193894fb11eb89402295ed07880..600c65484fcfb1e50338bdc8bc40e47b90cce83c 100644 (file)
--- a/test/integration/projects_test.rb
+++ b/test/integration/projects_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ProjectsTest < Redmine::IntegrationTest
   fixtures :projects, :users, :members, :enabled_modules

diff --git a/test/integration/repositories_git_test.rb b/test/integration/repositories_git_test.rb
index 05eef97a7e5594949c2ea709b9706bd3af60f0b1..cffd6035636d0dd498306226c1525dd73842a5c9 100644 (file)
--- a/test/integration/repositories_git_test.rb
+++ b/test/integration/repositories_git_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoriesGitTest < Redmine::IntegrationTest
   fixtures :projects, :users, :roles, :members, :member_roles,

diff --git a/test/integration/routing/account_test.rb b/test/integration/routing/account_test.rb
index 285748d65215f9f6b32a989b99707373936ea4bc..6219a6367fff4e3749b69faa184ea69a41eee042 100644 (file)
--- a/test/integration/routing/account_test.rb
+++ b/test/integration/routing/account_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingAccountTest < Redmine::RoutingTest
   def test_account

diff --git a/test/integration/routing/activities_test.rb b/test/integration/routing/activities_test.rb
index f145e56d1a477d1b7626ef2ef4aecf35aa672b10..b2dcc2def9950fc7139dca90626c2e94af629880 100644 (file)
--- a/test/integration/routing/activities_test.rb
+++ b/test/integration/routing/activities_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingActivitiesTest < Redmine::RoutingTest
 

diff --git a/test/integration/routing/admin_test.rb b/test/integration/routing/admin_test.rb
index 7ed9149299326caec1c7d00c6b1ab4f569b76c13..af56e372c728519c6ca494722f88670b13d96bb8 100644 (file)
--- a/test/integration/routing/admin_test.rb
+++ b/test/integration/routing/admin_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingAdminTest < Redmine::RoutingTest
   def test_administration_panel

diff --git a/test/integration/routing/attachments_test.rb b/test/integration/routing/attachments_test.rb
index 8976f8b89a12737ac0f9daa995e90c54e3cc2596..0715c0cbc06ec4696e56a4879cf999d45bc997f7 100644 (file)
--- a/test/integration/routing/attachments_test.rb
+++ b/test/integration/routing/attachments_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingAttachmentsTest < Redmine::RoutingTest
   def test_attachments

diff --git a/test/integration/routing/auth_sources_test.rb b/test/integration/routing/auth_sources_test.rb
index c5d8dc99f994f0ebfe7d1815914e73e15dae277e..281fddb86899926d7a1238c60925f25b7489fe5c 100644 (file)
--- a/test/integration/routing/auth_sources_test.rb
+++ b/test/integration/routing/auth_sources_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingAuthSourcesTest < Redmine::RoutingTest
   def test_auth_sources

diff --git a/test/integration/routing/auto_completes_test.rb b/test/integration/routing/auto_completes_test.rb
index e01e4d19b8acaef2447f49a87002d2513122f0b5..ea5080d19e5af16e1eb10c2f17cce5a5ee3d60ad 100644 (file)
--- a/test/integration/routing/auto_completes_test.rb
+++ b/test/integration/routing/auto_completes_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingAutoCompletesTest < Redmine::RoutingTest
   def test_auto_completes

diff --git a/test/integration/routing/boards_test.rb b/test/integration/routing/boards_test.rb
index cca82b29c072df8eb515d89e86116a19a5234d95..b00cd5649b420b40ea2f82c4f9608444c6f75fc3 100644 (file)
--- a/test/integration/routing/boards_test.rb
+++ b/test/integration/routing/boards_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingBoardsTest < Redmine::RoutingTest
   def test_boards

diff --git a/test/integration/routing/calendars_test.rb b/test/integration/routing/calendars_test.rb
index a020cfe5e6ab05c1b82e23c1e6b5879b62bb8f39..53ad75e0421d1aed2ffd01a8c68fac4ed61af427 100644 (file)
--- a/test/integration/routing/calendars_test.rb
+++ b/test/integration/routing/calendars_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingCalendarsTest < Redmine::RoutingTest
   def test_calendars

diff --git a/test/integration/routing/comments_test.rb b/test/integration/routing/comments_test.rb
index 376da97ed0b4872de9890e7383d3c211282d371f..5242699d712e019294e778c7858826aff1bca43f 100644 (file)
--- a/test/integration/routing/comments_test.rb
+++ b/test/integration/routing/comments_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingCommentsTest < Redmine::RoutingTest
   def test_comments

diff --git a/test/integration/routing/context_menus_test.rb b/test/integration/routing/context_menus_test.rb
index cbd517e5fc62215211dfedf010f31c316e936a20..43d03f88aa7e79447ea03f2a05e30a671df71f01 100644 (file)
--- a/test/integration/routing/context_menus_test.rb
+++ b/test/integration/routing/context_menus_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingContextMenusTest < Redmine::RoutingTest
   def test_context_menus_time_entries

diff --git a/test/integration/routing/custom_fields_test.rb b/test/integration/routing/custom_fields_test.rb
index 81fd6325e0e1b5e6ed791ce451abc00e375fc1c6..5d1814fc33c7151e03d741f96b9f1d0c3948c658 100644 (file)
--- a/test/integration/routing/custom_fields_test.rb
+++ b/test/integration/routing/custom_fields_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingCustomFieldsTest < Redmine::RoutingTest
   def test_custom_fields

diff --git a/test/integration/routing/documents_test.rb b/test/integration/routing/documents_test.rb
index d968ae81f154dfabd1ec1cbf653d5fd13bd32ceb..04315f1081714c19c817983ab4a9ed4334af3905 100644 (file)
--- a/test/integration/routing/documents_test.rb
+++ b/test/integration/routing/documents_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingDocumentsTest < Redmine::RoutingTest
   def test_documents_scoped_under_project

diff --git a/test/integration/routing/enumerations_test.rb b/test/integration/routing/enumerations_test.rb
index 2704513dfd06762145afa47a668ddf9c83ce0775..6eb6f6535a73bb92f8bf56a3a4894675a0131e54 100644 (file)
--- a/test/integration/routing/enumerations_test.rb
+++ b/test/integration/routing/enumerations_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingEnumerationsTest < Redmine::RoutingTest
   def test_enumerations

diff --git a/test/integration/routing/files_test.rb b/test/integration/routing/files_test.rb
index 2c08ef9cddb3926fd3ca3a2209a81a9b109f4b34..e90322d882b0422699d10c743f70b811ee274c75 100644 (file)
--- a/test/integration/routing/files_test.rb
+++ b/test/integration/routing/files_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingFilesTest < Redmine::RoutingTest
   def test_files

diff --git a/test/integration/routing/gantts_test.rb b/test/integration/routing/gantts_test.rb
index 421edaacbff510c0f53499af4316a5f64532b62c..205e8b1d971374ab5b40fbab7d9eea5a6f448fc4 100644 (file)
--- a/test/integration/routing/gantts_test.rb
+++ b/test/integration/routing/gantts_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingGanttsTest < Redmine::RoutingTest
   def test_gantts

diff --git a/test/integration/routing/groups_test.rb b/test/integration/routing/groups_test.rb
index 440a213b8d66f1bd888c33208cd6354a6d6521aa..11612d1739312adad63ebac0636c2baadd3d73d7 100644 (file)
--- a/test/integration/routing/groups_test.rb
+++ b/test/integration/routing/groups_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingGroupsTest < Redmine::RoutingTest
   def test_groups

diff --git a/test/integration/routing/imports_test.rb b/test/integration/routing/imports_test.rb
index 300301308be054872365d2e31b2b6590997377d6..6894aea4e03ef37988db18029dfc0461d980f9a1 100644 (file)
--- a/test/integration/routing/imports_test.rb
+++ b/test/integration/routing/imports_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingImportsTest < Redmine::RoutingTest
   def test_imports

diff --git a/test/integration/routing/issue_categories_test.rb b/test/integration/routing/issue_categories_test.rb
index ad64ebf317a408179c5dc2054fc5dabae3b32a65..69ba843a729d484e5d95f82bc0338ecbd54aa037 100644 (file)
--- a/test/integration/routing/issue_categories_test.rb
+++ b/test/integration/routing/issue_categories_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingIssueCategoriesTest < Redmine::RoutingTest
   def test_issue_categories_scoped_under_project

diff --git a/test/integration/routing/issue_relations_test.rb b/test/integration/routing/issue_relations_test.rb
index 7400d7eb8327709235cbbdc71b671da6d283e9f1..17f685ad2754144247c8f6e209d524c4621c4114 100644 (file)
--- a/test/integration/routing/issue_relations_test.rb
+++ b/test/integration/routing/issue_relations_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingIssueRelationsTest < Redmine::RoutingTest
   def test_issue_relations

diff --git a/test/integration/routing/issue_statuses_test.rb b/test/integration/routing/issue_statuses_test.rb
index d4d7f7f8f8f005b87c8d5a911cbebde7c7d3b0c6..d8e92ea3125979dba402f1b035bc93b6b210f1ee 100644 (file)
--- a/test/integration/routing/issue_statuses_test.rb
+++ b/test/integration/routing/issue_statuses_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingIssueStatusesTest < Redmine::RoutingTest
   def test_issue_statuses

diff --git a/test/integration/routing/issues_test.rb b/test/integration/routing/issues_test.rb
index 0b91d30ade786435f3f3b6d1436b29b03f6d4686..7a2bc3f11e23c80c672d000fbac898f7649d0a43 100644 (file)
--- a/test/integration/routing/issues_test.rb
+++ b/test/integration/routing/issues_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingIssuesTest < Redmine::RoutingTest
   def test_issues

diff --git a/test/integration/routing/journals_test.rb b/test/integration/routing/journals_test.rb
index 6c41286dc137c3ea0c3a714bc1598ad33347a240..de7d5b81153cfb3ce253f7e9fc42a632a87070d2 100644 (file)
--- a/test/integration/routing/journals_test.rb
+++ b/test/integration/routing/journals_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingJournalsTest < Redmine::RoutingTest
   def test_journals

diff --git a/test/integration/routing/mail_handler_test.rb b/test/integration/routing/mail_handler_test.rb
index 430f60d64d02c6b08f186bc5055c9c06260db1c3..979de312b1ac5d8b67674494035289c86bcd8176 100644 (file)
--- a/test/integration/routing/mail_handler_test.rb
+++ b/test/integration/routing/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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingMailHandlerTest < Redmine::RoutingTest
   def test_mail_handler

diff --git a/test/integration/routing/members_test.rb b/test/integration/routing/members_test.rb
index 8fd671784b1d187dce4e321986c8394968bf1122..8dd50161cc14fd1fd97dca2a5c1f9786fb3731a6 100644 (file)
--- a/test/integration/routing/members_test.rb
+++ b/test/integration/routing/members_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingMembersTest < Redmine::RoutingTest
   def test_members

diff --git a/test/integration/routing/messages_test.rb b/test/integration/routing/messages_test.rb
index 6ef1b37bda1bb17cc8ff5735a380f4b56d3d8f6a..3935278bc6110f595f2e73c4638448649fc5f595 100644 (file)
--- a/test/integration/routing/messages_test.rb
+++ b/test/integration/routing/messages_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingMessagesTest < Redmine::RoutingTest
   def test_messages

diff --git a/test/integration/routing/my_test.rb b/test/integration/routing/my_test.rb
index 4edd8b1fe66bb5d41c786946b98ca164a5b2289d..023eddd1c2392906ec00a71c7934f88bf96653c9 100644 (file)
--- a/test/integration/routing/my_test.rb
+++ b/test/integration/routing/my_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingMyTest < Redmine::RoutingTest
   def test_my

diff --git a/test/integration/routing/news_test.rb b/test/integration/routing/news_test.rb
index 854a36ae8a376d9c1219ab5884f3781f2cbf9a88..46055da7c43e914db15c49cb2c91b9e0539a0c19 100644 (file)
--- a/test/integration/routing/news_test.rb
+++ b/test/integration/routing/news_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingNewsTest < Redmine::RoutingTest
   def test_news_scoped_under_project

diff --git a/test/integration/routing/previews_test.rb b/test/integration/routing/previews_test.rb
index c1064cedccc062c2607a351c452c15e00e644f30..e3895a634ee4e06991f895385db8b78228e61443 100644 (file)
--- a/test/integration/routing/previews_test.rb
+++ b/test/integration/routing/previews_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingPreviewsTest < Redmine::RoutingTest
   def test_previews

diff --git a/test/integration/routing/principal_memberships_test.rb b/test/integration/routing/principal_memberships_test.rb
index b2a7c9b204e05f79cf0d6002f56af45f62759d7f..da39f83c4ae7b694801c41a81a4e391745fae575 100644 (file)
--- a/test/integration/routing/principal_memberships_test.rb
+++ b/test/integration/routing/principal_memberships_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingPrincipalMembershipsTest < Redmine::RoutingTest
   def test_user_memberships

diff --git a/test/integration/routing/project_enumerations_test.rb b/test/integration/routing/project_enumerations_test.rb
index b889278f33e97f3365986d9d47d2a68249e1c6f5..3a12119b4907da38f1117e32b07b6c425221e522 100644 (file)
--- a/test/integration/routing/project_enumerations_test.rb
+++ b/test/integration/routing/project_enumerations_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingProjectEnumerationsTest < Redmine::RoutingTest
   def test_project_enumerations

diff --git a/test/integration/routing/projects_test.rb b/test/integration/routing/projects_test.rb
index c8ab6aa937a0488c96c7c254b6a6d68345cc3e49..e4116691c6ee0db7017cb4a9a448d7944cb72a2d 100644 (file)
--- a/test/integration/routing/projects_test.rb
+++ b/test/integration/routing/projects_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingProjectsTest < Redmine::RoutingTest
   def test_projects

diff --git a/test/integration/routing/queries_test.rb b/test/integration/routing/queries_test.rb
index 9895ec5112660eb3eca721139712c2f25f177aa0..c2087bfbe0ce31ace26ffc70e39251763e615c3c 100644 (file)
--- a/test/integration/routing/queries_test.rb
+++ b/test/integration/routing/queries_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingQueriesTest < Redmine::RoutingTest
   def test_queries

diff --git a/test/integration/routing/reports_test.rb b/test/integration/routing/reports_test.rb
index a15b1adea54f573e5d385776739244c6b5fb5702..00335897538312c02bce1b0765f0733484e744d8 100644 (file)
--- a/test/integration/routing/reports_test.rb
+++ b/test/integration/routing/reports_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingReportsTest < Redmine::RoutingTest
   def test_reports

diff --git a/test/integration/routing/repositories_test.rb b/test/integration/routing/repositories_test.rb
index 79a4a1bb0d01a39cda0dbf6ba0a5352d8b787c61..f0d2e9cdb2aa84c4769c7e4585830fbc6b8b20e8 100644 (file)
--- a/test/integration/routing/repositories_test.rb
+++ b/test/integration/routing/repositories_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingRepositoriesTest < Redmine::RoutingTest
 

diff --git a/test/integration/routing/roles_test.rb b/test/integration/routing/roles_test.rb
index 302b02c5649d72eecaacad87f6a2d66c8768830a..c8d3c8026b30ca9b53e8b3edfe69411845b61b20 100644 (file)
--- a/test/integration/routing/roles_test.rb
+++ b/test/integration/routing/roles_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingRolesTest < Redmine::RoutingTest
   def test_roles

diff --git a/test/integration/routing/search_test.rb b/test/integration/routing/search_test.rb
index 5130b18cb7221cdcc80b0edd97d3b2d1eb86ab4d..f90c965af9a93de7b1f6ef44de6eb272fd172b89 100644 (file)
--- a/test/integration/routing/search_test.rb
+++ b/test/integration/routing/search_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingSearchTest < Redmine::RoutingTest
   def test_search

diff --git a/test/integration/routing/settings_test.rb b/test/integration/routing/settings_test.rb
index d1438258ce873564872c6cc90d261a4c6b19de87..9f5246fd5c9fb3f338db64b283e04be389b369b5 100644 (file)
--- a/test/integration/routing/settings_test.rb
+++ b/test/integration/routing/settings_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingSettingsTest < Redmine::RoutingTest
   def test_settings

diff --git a/test/integration/routing/sys_test.rb b/test/integration/routing/sys_test.rb
index 0437866278565f2ff1e6c1873cd767d498f97627..208b935eae799a9bc4b963024e79f8179624f3f1 100644 (file)
--- a/test/integration/routing/sys_test.rb
+++ b/test/integration/routing/sys_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingSysTest < Redmine::RoutingTest
   def test_sys

diff --git a/test/integration/routing/timelog_test.rb b/test/integration/routing/timelog_test.rb
index 56cb4f57f9d4b4d5bafe0ca3dece2b7fe8d14b1a..6caeced1395f64ec755b2cc00e82f2bf73669487 100644 (file)
--- a/test/integration/routing/timelog_test.rb
+++ b/test/integration/routing/timelog_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingTimelogsTest < Redmine::RoutingTest
   def test_timelogs_global

diff --git a/test/integration/routing/trackers_test.rb b/test/integration/routing/trackers_test.rb
index 546f77354f3b7583542f93509305cf79b9af96ec..cacf2860ab8d14384a3507181f15074e5b8c2f83 100644 (file)
--- a/test/integration/routing/trackers_test.rb
+++ b/test/integration/routing/trackers_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingTrackersTest < Redmine::RoutingTest
   def test_trackers

diff --git a/test/integration/routing/users_test.rb b/test/integration/routing/users_test.rb
index f2ac6162c8cb5acf1e4834179dc45e58e7460420..18c674f4f1e834ebf329fd89afb33f9544f4970f 100644 (file)
--- a/test/integration/routing/users_test.rb
+++ b/test/integration/routing/users_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingUsersTest < Redmine::RoutingTest
   def test_users

diff --git a/test/integration/routing/versions_test.rb b/test/integration/routing/versions_test.rb
index 8af3fb1f0ad503b8bcc1cc0233d8245a16020e74..b4ba669694da206b2965da07b37a5df665102054 100644 (file)
--- a/test/integration/routing/versions_test.rb
+++ b/test/integration/routing/versions_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingVersionsTest < Redmine::RoutingTest
   def test_project_versions

diff --git a/test/integration/routing/watchers_test.rb b/test/integration/routing/watchers_test.rb
index 8f2b7afdfff5472d996e5f6f19a9ba9326cbbd35..ff41832be9addb34d31fcb9929a544a18e479629 100644 (file)
--- a/test/integration/routing/watchers_test.rb
+++ b/test/integration/routing/watchers_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingWatchersTest < Redmine::RoutingTest
   def test_watchers

diff --git a/test/integration/routing/welcome_test.rb b/test/integration/routing/welcome_test.rb
index c123046e4a760f60dc95854d039d40373e156576..c46784766f30a15be7733c7ba87fcd359841e814 100644 (file)
--- a/test/integration/routing/welcome_test.rb
+++ b/test/integration/routing/welcome_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingWelcomeTest < Redmine::RoutingTest
   def test_welcome

diff --git a/test/integration/routing/wiki_test.rb b/test/integration/routing/wiki_test.rb
index a1fe5622eb08ed714de473a12cc8a940321ac14f..67a09cabd57590d5a7b4b8a9bd0d82ad9d10aef8 100644 (file)
--- a/test/integration/routing/wiki_test.rb
+++ b/test/integration/routing/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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingWikiTest < Redmine::RoutingTest
   def test_wiki

diff --git a/test/integration/routing/wikis_test.rb b/test/integration/routing/wikis_test.rb
index ab19118f5610c6893c6455aca79cd055d707e425..e1af82a6063849d679097d143da6a56559be0bde 100644 (file)
--- a/test/integration/routing/wikis_test.rb
+++ b/test/integration/routing/wikis_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingWikisTest < Redmine::RoutingTest
   def test_wikis

diff --git a/test/integration/routing/workflows_test.rb b/test/integration/routing/workflows_test.rb
index e3a4317b3b284a1184ea4a223436c7c4121bb61a..8c68f874b89ead13edf9b19f18b45f15d6d75d2a 100644 (file)
--- a/test/integration/routing/workflows_test.rb
+++ b/test/integration/routing/workflows_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class RoutingWorkflowsTest < Redmine::RoutingTest
   def test_workflows

diff --git a/test/integration/sessions_test.rb b/test/integration/sessions_test.rb
index cb3ac823020a0a5c4b87a74532a43e1ecbb16dd4..8b0ba8ebda54f762c1ef1a704cae8e81db2c209e 100644 (file)
--- a/test/integration/sessions_test.rb
+++ b/test/integration/sessions_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SessionsTest < Redmine::IntegrationTest
   fixtures :users, :email_addresses, :roles

diff --git a/test/integration/sudo_mode_test.rb b/test/integration/sudo_mode_test.rb
index abc66b3b37045793f6c4347c3379eabeae618e0e..07a4d9e9e4464187f838fda7435f8ed9525f4162 100644 (file)
--- a/test/integration/sudo_mode_test.rb
+++ b/test/integration/sudo_mode_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SudoModeTest < Redmine::IntegrationTest
   fixtures :projects, :members, :member_roles, :roles, :users, :email_addresses

diff --git a/test/integration/twofa_test.rb b/test/integration/twofa_test.rb
index 4eb54898e5454804a78259f39d14d4ef8fac7750..eb24de4024409f0a5405e67a0e5b5d0ecffecf5b 100644 (file)
--- a/test/integration/twofa_test.rb
+++ b/test/integration/twofa_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TwofaTest < Redmine::IntegrationTest
   fixtures :projects, :users, :email_addresses

diff --git a/test/integration/users_test.rb b/test/integration/users_test.rb
index 780053c8ef30d767c2e31f88d0a9a28697f0b06b..e08dc8307e611770513b46a3b6f025b41b1e0e16 100644 (file)
--- a/test/integration/users_test.rb
+++ b/test/integration/users_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class UsersTest < Redmine::IntegrationTest
   fixtures :users, :email_addresses

diff --git a/test/integration/welcome_test.rb b/test/integration/welcome_test.rb
index d529e87041b531dd112a23545054f98ffe0471a6..a27f6869ea76bf6b8a05429ba69bd106eeae8301 100644 (file)
--- a/test/integration/welcome_test.rb
+++ b/test/integration/welcome_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WelcomeTest < Redmine::IntegrationTest
   fixtures :users, :email_addresses,

diff --git a/test/integration/wiki_test.rb b/test/integration/wiki_test.rb
index 8f15bf9e8bb08eb518eb018df5741b0a06012417..cd6bf5491a7279c56127ff2e1222d26d4af2adc2 100644 (file)
--- a/test/integration/wiki_test.rb
+++ b/test/integration/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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WikiIntegrationTest < Redmine::IntegrationTest
   fixtures :projects,

diff --git a/test/system/custom_field_enumerations_test.rb b/test/system/custom_field_enumerations_test.rb
index 78815cb206ce6b3c2c6e5b8b919480f6affafd05..3df23254b11d3690413f5fd25155ed1e16714f37 100644 (file)
--- a/test/system/custom_field_enumerations_test.rb
+++ b/test/system/custom_field_enumerations_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.expand_path('../../application_system_test_case', __FILE__)
+require_relative '../application_system_test_case'
 
 class CustomFieldEnumerationsTest < ApplicationSystemTestCase
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,

diff --git a/test/system/inline_autocomplete_test.rb b/test/system/inline_autocomplete_test.rb
index 367549b8ffe20b999bb58ac01ca190aa97bec66b..16a8ebdce7058bd452c8c36bd0b70eb6e0a51378 100644 (file)
--- a/test/system/inline_autocomplete_test.rb
+++ b/test/system/inline_autocomplete_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.expand_path('../../application_system_test_case', __FILE__)
+require_relative '../application_system_test_case'
 
 class InlineAutocompleteSystemTest < ApplicationSystemTestCase
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,

diff --git a/test/system/issues_import_test.rb b/test/system/issues_import_test.rb
index 324d8ed407a1309d0ed2023feae07aee5507db90..d45d98868e84f5ec4470ccf446c2ab17e0477424 100644 (file)
--- a/test/system/issues_import_test.rb
+++ b/test/system/issues_import_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.expand_path('../../application_system_test_case', __FILE__)
+require_relative '../application_system_test_case'
 
 class IssuesImportTest < ApplicationSystemTestCase
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 48bd9af63cb277e64cef07ec23b1f980f857adac..a66b19e38bcd5a13897e96bcc22cdb738e78e48e 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_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.expand_path('../../application_system_test_case', __FILE__)
+require_relative '../application_system_test_case'
 
 class IssuesSystemTest < ApplicationSystemTestCase
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,

diff --git a/test/system/keyboard_shortcuts_test.rb b/test/system/keyboard_shortcuts_test.rb
index a49707c7c28fbcda402587b9579cce8ac1730a9b..23fbb49e6615f021f8d43af55dd4ba91ba410f69 100644 (file)
--- a/test/system/keyboard_shortcuts_test.rb
+++ b/test/system/keyboard_shortcuts_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.expand_path('../../application_system_test_case', __FILE__)
+require_relative '../application_system_test_case'
 
 class InlineAutocompleteSystemTest < ApplicationSystemTestCase
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,

diff --git a/test/system/my_page_test.rb b/test/system/my_page_test.rb
index bd7f3d3432ef702a1e56375d0b271156b1f978a7..f4aa580bd5b8aa6661b5ad8d7da9db777f2756ec 100644 (file)
--- a/test/system/my_page_test.rb
+++ b/test/system/my_page_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.expand_path('../../application_system_test_case', __FILE__)
+require_relative '../application_system_test_case'
 
 class MyPageTest < ApplicationSystemTestCase
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,

diff --git a/test/system/quick_jump_test.rb b/test/system/quick_jump_test.rb
index eb7c83dfd97a9d4ea137e6a7635f5c91ecbcd61d..7722f4f5f568aef0d6e1125843578dcd4abecd6e 100644 (file)
--- a/test/system/quick_jump_test.rb
+++ b/test/system/quick_jump_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.expand_path('../../application_system_test_case', __FILE__)
+require_relative '../application_system_test_case'
 
 class QuickJumpTest < ApplicationSystemTestCase
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,

diff --git a/test/system/sudo_mode_test.rb b/test/system/sudo_mode_test.rb
index cc0761555a05b51e8841a905e1b6397722068569..de6e9c47aa929a6caba6a5a40d3e1c24ebfb1261 100644 (file)
--- a/test/system/sudo_mode_test.rb
+++ b/test/system/sudo_mode_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.expand_path('../../application_system_test_case', __FILE__)
+require_relative '../application_system_test_case'
 
 class SudoModeSystemTest < ApplicationSystemTestCase
   fixtures :users, :email_addresses

diff --git a/test/system/timelog_test.rb b/test/system/timelog_test.rb
index baccdf60897979eeb0c26e728f74b3593b25c91b..b4ee1fd750e215f8af58f4187fffa5e22b4b0c4f 100644 (file)
--- a/test/system/timelog_test.rb
+++ b/test/system/timelog_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.expand_path('../../application_system_test_case', __FILE__)
+require_relative '../application_system_test_case'
 
 Capybara.default_max_wait_time = 2
 

diff --git a/test/test_helper.rb b/test/test_helper.rb
index aa6470b2f01755749b9b3c018703ec84c52f441d..bd073ef749b43ac4ed0da0328c060348fc708bda 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -19,7 +19,7 @@
 
 if ENV["COVERAGE"]
   require 'simplecov'
-  require File.expand_path(File.dirname(__FILE__) + "/coverage/html_formatter")
+  require_relative 'coverage/html_formatter'
   SimpleCov.formatter = Redmine::Coverage::HtmlFormatter
   SimpleCov.start 'rails'
 end
@@ -27,10 +27,10 @@ end
 $redmine_test_ldap_server = ENV['REDMINE_TEST_LDAP_SERVER'] || '127.0.0.1'
 
 ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require_relative '../config/environment'
 require 'rails/test_help'
 
-require File.expand_path(File.dirname(__FILE__) + '/object_helpers')
+require_relative 'object_helpers'
 include ObjectHelpers
 
 require 'net/ldap'

diff --git a/test/unit/activity_test.rb b/test/unit/activity_test.rb
index 776ed4f4d7db0070f430edf15a463129702366fe..2cfbeae00ba01b8518da4f0159636eb4dfedd80f 100644 (file)
--- a/test/unit/activity_test.rb
+++ b/test/unit/activity_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 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 1bb1eb9734563d5a9427b579c91343dcfa84cf48..d4ef2f7cd4b2f76fcdbead92cae966e4c7a3353a 100644 (file)
--- 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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AttachmentTest < ActiveSupport::TestCase
   fixtures :users, :email_addresses, :projects, :roles, :members, :member_roles,

diff --git a/test/unit/attachment_transaction_test.rb b/test/unit/attachment_transaction_test.rb
index b838d25df8169d069456b5e034ff93d276fb4dd2..392322d0b5f09d3d7ef41bba1386880e6c5f521a 100644 (file)
--- a/test/unit/attachment_transaction_test.rb
+++ b/test/unit/attachment_transaction_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AttachmentTest < ActiveSupport::TestCase
   fixtures :users, :email_addresses, :projects, :roles, :members, :member_roles,

diff --git a/test/unit/auth_source_ldap_test.rb b/test/unit/auth_source_ldap_test.rb
index bd0babe3a7087b2dcb8e473745d3536b04b9da33..958c46e97e7f063edaf6bd0f403f1f45293cd4df 100644 (file)
--- a/test/unit/auth_source_ldap_test.rb
+++ b/test/unit/auth_source_ldap_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class AuthSourceLdapTest < ActiveSupport::TestCase
   include Redmine::I18n

diff --git a/test/unit/board_test.rb b/test/unit/board_test.rb
index 516acd01846f8de1b5922b40041c6dfac23c0e0e..38e66e386e1b4606a23b9d1296ef1eda75c48595 100644 (file)
--- a/test/unit/board_test.rb
+++ b/test/unit/board_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class BoardTest < ActiveSupport::TestCase
   fixtures :projects, :boards, :messages, :attachments, :watchers

diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index 251f0773a84fb0f7ffd06402f267227e165ef9ed..b36fc7dcca7684aeb915a77e8496602293554723 100644 (file)
--- 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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ChangesetTest < ActiveSupport::TestCase
   fixtures :projects, :repositories,

diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index d4b0ce757fe57650bc434fe451eca4463fa64a59..68ae898f19ce1cef59143806ed89774ef4ada712 100644 (file)
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class CommentTest < ActiveSupport::TestCase
   fixtures :users, :email_addresses, :news, :comments, :projects, :enabled_modules,

diff --git a/test/unit/custom_field_test.rb b/test/unit/custom_field_test.rb
index 17e7edee21428b265f815bf263bf29d05db81fda..5bdd79038bbdc85110b1549a36d7bba951559518 100644 (file)
--- a/test/unit/custom_field_test.rb
+++ b/test/unit/custom_field_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class CustomFieldTest < ActiveSupport::TestCase
   fixtures :custom_fields, :roles, :projects,

diff --git a/test/unit/custom_field_user_format_test.rb b/test/unit/custom_field_user_format_test.rb
index 66cb44055f7b6fc9d30ba99f3c0f887e82305148..7f9946312c60b1ded524754a55966cd26f2074dc 100644 (file)
--- a/test/unit/custom_field_user_format_test.rb
+++ b/test/unit/custom_field_user_format_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class CustomFieldUserFormatTest < ActiveSupport::TestCase
   fixtures :custom_fields, :projects, :members, :users, :member_roles, :trackers, :issues

diff --git a/test/unit/custom_field_version_format_test.rb b/test/unit/custom_field_version_format_test.rb
index 1fe58f45ef5f15fefc469a72f02618e6a3407c24..8962aa301b852846ff978fe9feb4d79bd7e1f241 100644 (file)
--- a/test/unit/custom_field_version_format_test.rb
+++ b/test/unit/custom_field_version_format_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class CustomFieldVersionFormatTest < ActiveSupport::TestCase
   fixtures :custom_fields, :projects, :members, :users, :member_roles, :trackers, :issues, :versions

diff --git a/test/unit/custom_value_test.rb b/test/unit/custom_value_test.rb
index c1ff6988e25236fe446bd191ef931a5e2a247b45..166429e3bf82b072e52b17e1c9507fdbb283ffc4 100644 (file)
--- a/test/unit/custom_value_test.rb
+++ b/test/unit/custom_value_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 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 293281094a2457d989e160e74bf24af8e46e8bd5..9adf97c14d1dcd9702aa5f0dbbd4fc35e31c0d25 100644 (file)
--- a/test/unit/default_data_test.rb
+++ b/test/unit/default_data_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class DefaultDataTest < ActiveSupport::TestCase
   include Redmine::I18n

diff --git a/test/unit/document_category_test.rb b/test/unit/document_category_test.rb
index 52f7ad90fe6cebaa111535145a0b95d3a13f2b3c..125c199bae4917432ee4ff00564fd4c4dc593675 100644 (file)
--- a/test/unit/document_category_test.rb
+++ b/test/unit/document_category_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class DocumentCategoryTest < ActiveSupport::TestCase
   fixtures :enumerations, :documents, :issues

diff --git a/test/unit/document_test.rb b/test/unit/document_test.rb
index 82d055d2c0a782f27339206796ccdde3cf8564fd..19e162cadf4b116f2262dd88bf0a82536d3d9120 100644 (file)
--- a/test/unit/document_test.rb
+++ b/test/unit/document_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class DocumentTest < ActiveSupport::TestCase
   fixtures :projects, :enumerations, :documents, :attachments,

diff --git a/test/unit/email_address_test.rb b/test/unit/email_address_test.rb
index 2a1636dc9ce361ba4b27908ec647af3c35471d0b..2cba7bbad0012d7376478a4a1f624447758dc421 100644 (file)
--- a/test/unit/email_address_test.rb
+++ b/test/unit/email_address_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class EmailAddressTest < ActiveSupport::TestCase
   fixtures :users

diff --git a/test/unit/enabled_module_test.rb b/test/unit/enabled_module_test.rb
index 6d99e7efe683a7feaae1607612cb7f3dddf66825..4df1562b3529280afe1edf679ce94141f8bfcb93 100644 (file)
--- a/test/unit/enabled_module_test.rb
+++ b/test/unit/enabled_module_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class EnabledModuleTest < ActiveSupport::TestCase
   fixtures :projects, :trackers, :issue_statuses, :wikis

diff --git a/test/unit/enumeration_test.rb b/test/unit/enumeration_test.rb
index 075f0a0290f940e6e1fb46496fd4e08e21a30961..25dfb14c490c0026c0579480fb38272622dc44d4 100644 (file)
--- a/test/unit/enumeration_test.rb
+++ b/test/unit/enumeration_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 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 0ae78e73a32a2234801d6fbcd240bda621ea39ba..92685e21c48854e91da6df47e7a0f33077b6c1e1 100644 (file)
--- a/test/unit/group_test.rb
+++ b/test/unit/group_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class GroupTest < ActiveSupport::TestCase
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/unit/initializers/patches_test.rb b/test/unit/initializers/patches_test.rb
index 9403efd82665f66a82aab15e3064561260335f81..317cbba14b6358554fa5a29a752678825c8dc48d 100644 (file)
--- a/test/unit/initializers/patches_test.rb
+++ b/test/unit/initializers/patches_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class PatchesTest < ActiveSupport::TestCase
   include Redmine::I18n

diff --git a/test/unit/issue_category_test.rb b/test/unit/issue_category_test.rb
index 14ad3385f973fe137c6ecc817e0af24d9dcee34d..c5f2dffa6df5c40cd14c454fa7f3e60e66de1df5 100644 (file)
--- a/test/unit/issue_category_test.rb
+++ b/test/unit/issue_category_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueCategoryTest < ActiveSupport::TestCase
   fixtures :issue_categories, :issues, :users, :groups_users

diff --git a/test/unit/issue_custom_field_test.rb b/test/unit/issue_custom_field_test.rb
index 3174d7e10130d739a1f296dd57ee27ec7554f72f..716fda7186cb001964ca2d4489f1eab37c7a52aa 100644 (file)
--- a/test/unit/issue_custom_field_test.rb
+++ b/test/unit/issue_custom_field_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueCustomFieldTest < ActiveSupport::TestCase
   include Redmine::I18n

diff --git a/test/unit/issue_import_test.rb b/test/unit/issue_import_test.rb
index c5d871ac79e319482556824924877d89a18c6905..f6ea0570e61baed32edb00e16a9e4f888ed44f3b 100644 (file)
--- a/test/unit/issue_import_test.rb
+++ b/test/unit/issue_import_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueImportTest < ActiveSupport::TestCase
   fixtures :projects, :enabled_modules,

diff --git a/test/unit/issue_nested_set_concurrency_test.rb b/test/unit/issue_nested_set_concurrency_test.rb
index 2767426b2ba9a4e010fd7e5c65499bbc351c17b2..9400b62cce0e5c60f3be91c0e4d77c36da91a887 100644 (file)
--- a/test/unit/issue_nested_set_concurrency_test.rb
+++ b/test/unit/issue_nested_set_concurrency_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueNestedSetConcurrencyTest < ActiveSupport::TestCase
   fixtures :projects, :users,

diff --git a/test/unit/issue_nested_set_test.rb b/test/unit/issue_nested_set_test.rb
index bf47a4106f6b9e5e1ca23c4fe9ccc3c8984ca99b..5f9873844081873912f4c926aa6472aebc87f0da 100644 (file)
--- a/test/unit/issue_nested_set_test.rb
+++ b/test/unit/issue_nested_set_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueNestedSetTest < ActiveSupport::TestCase
   fixtures :projects, :users, :roles,

diff --git a/test/unit/issue_priority_test.rb b/test/unit/issue_priority_test.rb
index 54659f95b0929bb96ce9fb9058afb5066e6225ff..efd58b71819bb83c44ce87689a6297c05116dbb1 100644 (file)
--- a/test/unit/issue_priority_test.rb
+++ b/test/unit/issue_priority_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssuePriorityTest < ActiveSupport::TestCase
   fixtures :enumerations, :issues

diff --git a/test/unit/issue_relation_test.rb b/test/unit/issue_relation_test.rb
index b250f62a43d00531534013a29c3c53d089a17d54..0b64b117cb9bff2345e3fa2915bbfc6af001dddb 100644 (file)
--- a/test/unit/issue_relation_test.rb
+++ b/test/unit/issue_relation_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueRelationTest < ActiveSupport::TestCase
   fixtures :projects,

diff --git a/test/unit/issue_scopes_test.rb b/test/unit/issue_scopes_test.rb
index fe71ad9c33930dc34817a5f44321ec32fbe68a20..358cd5f67f8182a3063e2f6f02af845ff131289a 100644 (file)
--- a/test/unit/issue_scopes_test.rb
+++ b/test/unit/issue_scopes_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueScopesTest < ActiveSupport::TestCase
   fixtures :projects, :users, :members, :member_roles, :roles,

diff --git a/test/unit/issue_status_test.rb b/test/unit/issue_status_test.rb
index a6ba05387c8f3a014e6b6cbe7a42dcc106f58641..3d2366886a00b2a664c9ef07e2fd6bda45371c75 100644 (file)
--- a/test/unit/issue_status_test.rb
+++ b/test/unit/issue_status_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueStatusTest < ActiveSupport::TestCase
   fixtures :projects, :users, :members, :member_roles, :roles,

diff --git a/test/unit/issue_subtasking_test.rb b/test/unit/issue_subtasking_test.rb
index 993393c982d04071c55f7409fa061ff20d1d2f33..b65c20b0e32f94fdf5869d1e5768dffdf1e92db2 100644 (file)
--- a/test/unit/issue_subtasking_test.rb
+++ b/test/unit/issue_subtasking_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueSubtaskingTest < ActiveSupport::TestCase
   fixtures :projects, :users, :roles, :members, :member_roles,

diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 711d081de39f82bef9bf78bd362a800f50948f25..14dca00e363fc3004c5d47ed7fabc771b0b7abd6 100644 (file)
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueTest < ActiveSupport::TestCase
   fixtures :projects, :users, :email_addresses, :user_preferences, :members, :member_roles, :roles,

diff --git a/test/unit/issue_transaction_test.rb b/test/unit/issue_transaction_test.rb
index 057214dbc42fe23ad753d1d092f77c653f833c76..b022546ae11bc5c750d88ceb13061386b0e5af9d 100644 (file)
--- a/test/unit/issue_transaction_test.rb
+++ b/test/unit/issue_transaction_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class IssueTransactionTest < ActiveSupport::TestCase
   fixtures :projects, :users, :members, :member_roles, :roles,

diff --git a/test/unit/jobs/destroy_project_job_test.rb b/test/unit/jobs/destroy_project_job_test.rb
index 9876a0077b58984010d6aa851e8260ebfb97a790..83aaa88d3ccf89c366f1559ab013ca404760576e 100644 (file)
--- a/test/unit/jobs/destroy_project_job_test.rb
+++ b/test/unit/jobs/destroy_project_job_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class DestroyProjectJobTest < ActiveJob::TestCase
   fixtures :users, :projects, :email_addresses

diff --git a/test/unit/jobs/destroy_projects_job_test.rb b/test/unit/jobs/destroy_projects_job_test.rb
index 518ed06a3c3c2832cff916aadd20c2f6a4435526..9e2f3449ec8319c514ba97715c3ce3669a46e1df 100644 (file)
--- a/test/unit/jobs/destroy_projects_job_test.rb
+++ b/test/unit/jobs/destroy_projects_job_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 class DestroyProjectsJobTest < ActiveJob::TestCase
   fixtures :users, :projects, :email_addresses

diff --git a/test/unit/journal_observer_test.rb b/test/unit/journal_observer_test.rb
index c91f935f3e2b8054c14dc916f24cb3acd7540b87..6e692c9fd095be4f1a0256735b0ccc79a8db2b0a 100644 (file)
--- a/test/unit/journal_observer_test.rb
+++ b/test/unit/journal_observer_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class JournalObserverTest < ActiveSupport::TestCase
   fixtures :issues, :issue_statuses, :journals, :journal_details, :projects,

diff --git a/test/unit/journal_test.rb b/test/unit/journal_test.rb
index f12a9a8aee8b1a95c70c3b5f21962c53c77adc45..511b1641537e7f871913e2424bbbe5e7bb3f4b50 100644 (file)
--- a/test/unit/journal_test.rb
+++ b/test/unit/journal_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class JournalTest < ActiveSupport::TestCase
   fixtures :projects, :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 fec562499e6bed6c20539619fcc7ab906297efdb..9fe7517934d434fac4a157d93e0684cef5701e73 100644 (file)
--- a/test/unit/lib/redmine/access_control_test.rb
+++ b/test/unit/lib/redmine/access_control_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::AccessControlTest < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/lib/redmine/acts/mentionable_test.rb b/test/unit/lib/redmine/acts/mentionable_test.rb
index 91fef8eb2da895f8ae712630d5a4a7cc991c885f..1f67d37d753a99f1e807b231f0776282a8a05144 100644 (file)
--- a/test/unit/lib/redmine/acts/mentionable_test.rb
+++ b/test/unit/lib/redmine/acts/mentionable_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::Acts::MentionableTest < ActiveSupport::TestCase
   fixtures :projects, :users, :email_addresses, :members, :member_roles, :roles,

diff --git a/test/unit/lib/redmine/acts/positioned_with_scope_test.rb b/test/unit/lib/redmine/acts/positioned_with_scope_test.rb
index 3c7a48347f1dbc5a895f0af3b3fdc003f8723a1e..22dc746c73d0b44eb2af2f0c587ec3ee9326ffaf 100644 (file)
--- a/test/unit/lib/redmine/acts/positioned_with_scope_test.rb
+++ b/test/unit/lib/redmine/acts/positioned_with_scope_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::Acts::PositionedWithScopeTest < ActiveSupport::TestCase
   fixtures :projects, :boards

diff --git a/test/unit/lib/redmine/acts/positioned_without_scope_test.rb b/test/unit/lib/redmine/acts/positioned_without_scope_test.rb
index fce6b8de8e15de81de702e27dfde35e0f454f170..f8a93bf11a4f8b14953d6e8cb4b367c5fb2dc185 100644 (file)
--- a/test/unit/lib/redmine/acts/positioned_without_scope_test.rb
+++ b/test/unit/lib/redmine/acts/positioned_without_scope_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::Acts::PositionedWithoutScopeTest < ActiveSupport::TestCase
   fixtures :trackers, :issue_statuses

diff --git a/test/unit/lib/redmine/ciphering_test.rb b/test/unit/lib/redmine/ciphering_test.rb
index 1981a40078deda4b1e88b88b3e40a6d9dd65d86a..c04f3636941a35e66ace3af4c90b460577683d7c 100644 (file)
--- a/test/unit/lib/redmine/ciphering_test.rb
+++ b/test/unit/lib/redmine/ciphering_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::CipheringTest < ActiveSupport::TestCase
   fixtures :auth_sources

diff --git a/test/unit/lib/redmine/codeset_util_test.rb b/test/unit/lib/redmine/codeset_util_test.rb
index 79e6a587de438c4ce2a4f6e9b2a5685eae59a45a..5a00f1afdedb1dff1aa4137c53a1bbf7cf6d50a6 100644 (file)
--- a/test/unit/lib/redmine/codeset_util_test.rb
+++ b/test/unit/lib/redmine/codeset_util_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::CodesetUtilTest < ActiveSupport::TestCase
   def test_to_utf8_by_setting_from_latin1

diff --git a/test/unit/lib/redmine/configuration_test.rb b/test/unit/lib/redmine/configuration_test.rb
index 4b75cdfce317e0129dbddf2b369ddb2221855cd5..b62ab68c898e55e2354798c4710a394c236e3317 100644 (file)
--- a/test/unit/lib/redmine/configuration_test.rb
+++ b/test/unit/lib/redmine/configuration_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::ConfigurationTest < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/lib/redmine/export/csv_test.rb b/test/unit/lib/redmine/export/csv_test.rb
index 596bb1762201b56d976041df66f34aa3ce2256f9..cebcb2db3f7857d1d8fb386ee3496867b282a092 100644 (file)
--- a/test/unit/lib/redmine/export/csv_test.rb
+++ b/test/unit/lib/redmine/export/csv_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class CsvTest < ActiveSupport::TestCase
   include Redmine::I18n

diff --git a/test/unit/lib/redmine/export/pdf/issues_pdf_test.rb b/test/unit/lib/redmine/export/pdf/issues_pdf_test.rb
index 1b239332bee40ab0efe07e044705247f32cb546c..4dd40b9fc058d096adb127eb83fceb5fbe7c9c02 100644 (file)
--- a/test/unit/lib/redmine/export/pdf/issues_pdf_test.rb
+++ b/test/unit/lib/redmine/export/pdf/issues_pdf_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 class IssuesPdfHelperTest < ActiveSupport::TestCase
   fixtures :users, :projects, :roles, :members, :member_roles,

diff --git a/test/unit/lib/redmine/export/pdf_test.rb b/test/unit/lib/redmine/export/pdf_test.rb
index edea888c1e918fa30bc57bd29e5b6982eeb1c018..899d6e0f62e51a61e8effd59e834133186d3dbcc 100644 (file)
--- a/test/unit/lib/redmine/export/pdf_test.rb
+++ b/test/unit/lib/redmine/export/pdf_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class PdfTest < ActiveSupport::TestCase
   fixtures :users, :projects, :roles, :members, :member_roles,

diff --git a/test/unit/lib/redmine/field_format/attachment_format_test.rb b/test/unit/lib/redmine/field_format/attachment_format_test.rb
index d0910c3b5086da11fddc59dea1bcd550401e7a12..6e8b95424edd5bdae09366b0d8db00109f96696c 100644 (file)
--- a/test/unit/lib/redmine/field_format/attachment_format_test.rb
+++ b/test/unit/lib/redmine/field_format/attachment_format_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 require 'redmine/field_format'
 
 class Redmine::AttachmentFieldFormatTest < ActionView::TestCase

diff --git a/test/unit/lib/redmine/field_format/attachment_format_visibility_test.rb b/test/unit/lib/redmine/field_format/attachment_format_visibility_test.rb
index 2cf1144c6c5c08e4982628d20e785668f3032e02..87f4f47cdf79c932df2746a9c506c33e19c63578 100644 (file)
--- a/test/unit/lib/redmine/field_format/attachment_format_visibility_test.rb
+++ b/test/unit/lib/redmine/field_format/attachment_format_visibility_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 require 'redmine/field_format'
 
 class AttachmentFormatVisibilityTest < ActionView::TestCase

diff --git a/test/unit/lib/redmine/field_format/bool_format_test.rb b/test/unit/lib/redmine/field_format/bool_format_test.rb
index dfa3be6fbe6ecc49569410262dcf6545304291a7..0e65d7499bff56e894670e6074e7ea9886251245 100644 (file)
--- a/test/unit/lib/redmine/field_format/bool_format_test.rb
+++ b/test/unit/lib/redmine/field_format/bool_format_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 require 'redmine/field_format'
 
 class Redmine::BoolFieldFormatTest < ActionView::TestCase

diff --git a/test/unit/lib/redmine/field_format/enumeration_format_test.rb b/test/unit/lib/redmine/field_format/enumeration_format_test.rb
index 4bb0c59e96a8577e2daaea6d8986a4d708372718..3903a3d50b9d4cb936a65a871e3df3cb69bc2fc9 100644 (file)
--- a/test/unit/lib/redmine/field_format/enumeration_format_test.rb
+++ b/test/unit/lib/redmine/field_format/enumeration_format_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 require 'redmine/field_format'
 
 class Redmine::EnumerationFieldFormatTest < ActionView::TestCase

diff --git a/test/unit/lib/redmine/field_format/field_format_test.rb b/test/unit/lib/redmine/field_format/field_format_test.rb
index 3b57796023ea1ed59649f0d51de1f08da1159f7b..090405b1557f11d8247c90e5fdc24714c3f67d00 100644 (file)
--- a/test/unit/lib/redmine/field_format/field_format_test.rb
+++ b/test/unit/lib/redmine/field_format/field_format_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::FieldFormatTest < ActionView::TestCase
   include ApplicationHelper

diff --git a/test/unit/lib/redmine/field_format/link_format_test.rb b/test/unit/lib/redmine/field_format/link_format_test.rb
index f70efb2cf7b9ebc3bfd0aa7aa0b0220622defa18..32c881fd5dbe722d344d5ba209528bfb68d07f2a 100644 (file)
--- a/test/unit/lib/redmine/field_format/link_format_test.rb
+++ b/test/unit/lib/redmine/field_format/link_format_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 require 'redmine/field_format'
 
 class Redmine::LinkFieldFormatTest < ActionView::TestCase

diff --git a/test/unit/lib/redmine/field_format/list_format_test.rb b/test/unit/lib/redmine/field_format/list_format_test.rb
index 75a8a37fc69a007242a7062b0f8b1d024499ce7e..116a03ad2c4b8063d6bbd6528f516b55102b57e2 100644 (file)
--- a/test/unit/lib/redmine/field_format/list_format_test.rb
+++ b/test/unit/lib/redmine/field_format/list_format_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 require 'redmine/field_format'
 
 class Redmine::ListFieldFormatTest < ActionView::TestCase

diff --git a/test/unit/lib/redmine/field_format/numeric_format_test.rb b/test/unit/lib/redmine/field_format/numeric_format_test.rb
index e3f3deba9cb4c1978a85f3d8a699eb8b9a02952b..9ced022fbbbfa7811de4965a18e62998e4fe0e42 100644 (file)
--- a/test/unit/lib/redmine/field_format/numeric_format_test.rb
+++ b/test/unit/lib/redmine/field_format/numeric_format_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 require 'redmine/field_format'
 
 class Redmine::NumericFieldFormatTest < ActionView::TestCase

diff --git a/test/unit/lib/redmine/field_format/user_field_format_test.rb b/test/unit/lib/redmine/field_format/user_field_format_test.rb
index 195a27f51c5ef2220bfd8672197b3c8e43993f72..5df3632bf984a727310d1444d2ece8c5483320d8 100644 (file)
--- a/test/unit/lib/redmine/field_format/user_field_format_test.rb
+++ b/test/unit/lib/redmine/field_format/user_field_format_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 require 'redmine/field_format'
 
 class Redmine::UserFieldFormatTest < ActionView::TestCase

diff --git a/test/unit/lib/redmine/field_format/version_field_format_test.rb b/test/unit/lib/redmine/field_format/version_field_format_test.rb
index d3c5873a645abc7e026389b5d7f65765500bbcb9..8cae63ca7917cf466c64b2666b93c61dee558432 100644 (file)
--- a/test/unit/lib/redmine/field_format/version_field_format_test.rb
+++ b/test/unit/lib/redmine/field_format/version_field_format_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 require 'redmine/field_format'
 
 class Redmine::VersionFieldFormatTest < ActionView::TestCase

diff --git a/test/unit/lib/redmine/helpers/calendar_test.rb b/test/unit/lib/redmine/helpers/calendar_test.rb
index c95999853ede1ef8427b1f933db29cb498ca1f16..ca9f9c904048e3b07f7638f833793eeb4ece9402 100644 (file)
--- a/test/unit/lib/redmine/helpers/calendar_test.rb
+++ b/test/unit/lib/redmine/helpers/calendar_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class CalendarTest < ActiveSupport::TestCase
   def test_monthly

diff --git a/test/unit/lib/redmine/helpers/diff_test.rb b/test/unit/lib/redmine/helpers/diff_test.rb
index 90e5f0b6434198d7212be3dbf72bfa36aa709c98..a9cce69b1447f53cffd370f19c5bc9f5ec392a65 100644 (file)
--- a/test/unit/lib/redmine/helpers/diff_test.rb
+++ b/test/unit/lib/redmine/helpers/diff_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class DiffTest < ActiveSupport::TestCase
   def test_diff

diff --git a/test/unit/lib/redmine/helpers/gantt_test.rb b/test/unit/lib/redmine/helpers/gantt_test.rb
index a3cfead37ee58d105801ecacabda1a70470b3db1..0b97a7f207d9b0656d7daafab135055301365f93 100644 (file)
--- a/test/unit/lib/redmine/helpers/gantt_test.rb
+++ b/test/unit/lib/redmine/helpers/gantt_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::Helpers::GanttHelperTest < Redmine::HelperTest
   fixtures :projects, :trackers, :projects_trackers, :issue_statuses,

diff --git a/test/unit/lib/redmine/helpers/url_test.rb b/test/unit/lib/redmine/helpers/url_test.rb
index b169c14f02e8f44fd719fde405621aca4ca71067..8ba8aa9c42eb7cccd1d38a0798c1385b52bb2f71 100644 (file)
--- a/test/unit/lib/redmine/helpers/url_test.rb
+++ b/test/unit/lib/redmine/helpers/url_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class URLTest < ActiveSupport::TestCase
   include Redmine::Helpers::URL

diff --git a/test/unit/lib/redmine/hook_test.rb b/test/unit/lib/redmine/hook_test.rb
index 7f4a0598dbcbc1baa2a5a3731b9ec7e958bc2d93..78119ee73bcfe0c01e8a0839ecd8c16b948c0d60 100644 (file)
--- a/test/unit/lib/redmine/hook_test.rb
+++ b/test/unit/lib/redmine/hook_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::Hook::ManagerTest < ActionView::TestCase
   fixtures :projects, :users, :members, :member_roles, :roles,

diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb
index c9d00b8a57414f0036e820d69c9dcf58aec2023b..c146549f188506a1671dc4fd2ba3f137ab25b25f 100644 (file)
--- a/test/unit/lib/redmine/i18n_test.rb
+++ b/test/unit/lib/redmine/i18n_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::I18nTest < ActiveSupport::TestCase
   include Redmine::I18n

diff --git a/test/unit/lib/redmine/info_test.rb b/test/unit/lib/redmine/info_test.rb
index 0ec0a95abb20f788406de90e374db423020cd61f..c56a222015462b1ed2324d905d12697c856c9b8a 100644 (file)
--- a/test/unit/lib/redmine/info_test.rb
+++ b/test/unit/lib/redmine/info_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::InfoTest < ActiveSupport::TestCase
   def test_environment

diff --git a/test/unit/lib/redmine/menu_manager/mapper_test.rb b/test/unit/lib/redmine/menu_manager/mapper_test.rb
index cfc0595e9c0a50a1b435c35aad3ecd3583750270..4bbf6ceef712b0dd35177fb22eb6e3b48eef7a48 100644 (file)
--- a/test/unit/lib/redmine/menu_manager/mapper_test.rb
+++ b/test/unit/lib/redmine/menu_manager/mapper_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::MenuManager::MapperTest < ActiveSupport::TestCase
   test "Mapper#initialize should define a root MenuNode if menu is not present in items" 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 8015b583c26337197264f03ca5bb0c5959c8a2a3..673e4590121b5686ed155f1837bef97df895e907 100644 (file)
--- a/test/unit/lib/redmine/menu_manager/menu_helper_test.rb
+++ b/test/unit/lib/redmine/menu_manager/menu_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::MenuManager::MenuHelperTest < Redmine::HelperTest
   include Redmine::MenuManager::MenuHelper

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 a2fe2abf70ab5db47bd168c579c7882045a4f6c7..2d7491d82dbab5b440866151d8fd370e2ac9acb3 100644 (file)
--- a/test/unit/lib/redmine/menu_manager/menu_item_test.rb
+++ b/test/unit/lib/redmine/menu_manager/menu_item_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 module RedmineMenuTestHelper
   # Helpers

diff --git a/test/unit/lib/redmine/menu_manager_test.rb b/test/unit/lib/redmine/menu_manager_test.rb
index 2bb4e8deee9ff1cc73d925ed8c8fed446d652e97..e74408f05112cd02892ea084336007088f021515 100644 (file)
--- a/test/unit/lib/redmine/menu_manager_test.rb
+++ b/test/unit/lib/redmine/menu_manager_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::MenuManagerTest < ActiveSupport::TestCase
   def test_map_should_yield_a_mapper

diff --git a/test/unit/lib/redmine/mime_type_test.rb b/test/unit/lib/redmine/mime_type_test.rb
index 42587044c0af9258bbc20fa168274b068cef5434..cbf1d3decdcca0d95d963d9a5ca3761fe3a76088 100644 (file)
--- a/test/unit/lib/redmine/mime_type_test.rb
+++ b/test/unit/lib/redmine/mime_type_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::MimeTypeTest < ActiveSupport::TestCase
   def test_of

diff --git a/test/unit/lib/redmine/notifiable_test.rb b/test/unit/lib/redmine/notifiable_test.rb
index 57c0b578410146e20419d3089a1eb13c8ce199e4..11e73bad4d0b35e5c1d20d230772f1763bd5e1e6 100644 (file)
--- a/test/unit/lib/redmine/notifiable_test.rb
+++ b/test/unit/lib/redmine/notifiable_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::NotifiableTest < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/lib/redmine/pagination_helper_test.rb b/test/unit/lib/redmine/pagination_helper_test.rb
index 5d03c9663368829dbf013c5387d4f39172de8535..07d3f72843ad885e714c785ee523d7f0d413fd5b 100644 (file)
--- a/test/unit/lib/redmine/pagination_helper_test.rb
+++ b/test/unit/lib/redmine/pagination_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class PaginationHelperTest < ActionView::TestCase
   include Redmine::Pagination::Helper

diff --git a/test/unit/lib/redmine/pagination_test.rb b/test/unit/lib/redmine/pagination_test.rb
index 513606405d0dd06245a823a9bfe685cd9cce44c0..c2383bc082ea76cd0d92b541b2c3a655a8ec495b 100644 (file)
--- a/test/unit/lib/redmine/pagination_test.rb
+++ b/test/unit/lib/redmine/pagination_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::PaginationTest < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/lib/redmine/plugin_loader_test.rb b/test/unit/lib/redmine/plugin_loader_test.rb
index 5fe56187d9fba0336c6916e91bebfa8b5593ea26..ed59433468e307a829ac4cde6066f39fd3936b88 100644 (file)
--- a/test/unit/lib/redmine/plugin_loader_test.rb
+++ b/test/unit/lib/redmine/plugin_loader_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::PluginLoaderTest < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/lib/redmine/plugin_test.rb b/test/unit/lib/redmine/plugin_test.rb
index e113f5808a5038a405fa04026a733a1280570650..02df2323684800818514934af5e649942bf37889 100644 (file)
--- a/test/unit/lib/redmine/plugin_test.rb
+++ b/test/unit/lib/redmine/plugin_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::PluginTest < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/lib/redmine/project_jump_box_test.rb b/test/unit/lib/redmine/project_jump_box_test.rb
index 310d2bf356b1535a939c1091f893f6e0ea4c4309..372de4d54bb3e966abc352d97fbf89e17125e264 100644 (file)
--- a/test/unit/lib/redmine/project_jump_box_test.rb
+++ b/test/unit/lib/redmine/project_jump_box_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::ProjectJumpBoxTest < ActiveSupport::TestCase
   fixtures :users, :projects, :user_preferences, :members, :roles, :member_roles

diff --git a/test/unit/lib/redmine/safe_attributes_test.rb b/test/unit/lib/redmine/safe_attributes_test.rb
index 15a2fe17730d847736514890ef3344f6fd602548..4f031b816d1da3e72b84d7b2398096074164a1cc 100644 (file)
--- a/test/unit/lib/redmine/safe_attributes_test.rb
+++ b/test/unit/lib/redmine/safe_attributes_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::SafeAttributesTest < ActiveSupport::TestCase
   fixtures :users

diff --git a/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
index 1e8b163b70c5f1330131a7b2b4a89633e681dfa4..0d22adaa3637ecbc565cd0c18640295f77c7b8bc 100644 (file)
--- a/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 class BazaarAdapterTest < ActiveSupport::TestCase
   REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s

diff --git a/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
index ec75cf010da303ec238e065ac851c7af8b789a89..b934c047fcec1073ecefe0a9b79994de9ef47884 100644 (file)
--- a/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/cvs_adapter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 class CvsAdapterTest < ActiveSupport::TestCase
   REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s

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 419f97324888ffbe450369465c2f42d2f464e24d..2d13173e68935ef7e1e35cc06ac6bff42b4a818e 100644 (file)
--- a/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 class FilesystemAdapterTest < ActiveSupport::TestCase
   REPOSITORY_PATH = Rails.root.join('tmp/test/filesystem_repository').to_s

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 1e017828e78e6dee81d3d28f89a72b2e4f9a8be6..95dcea35e5390133b17d172cc43f54f78f13bc07 100644 (file)
--- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/git_adapter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 class GitAdapterTest < ActiveSupport::TestCase
   REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s

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 67de472f548c80459ee3f1c3eb657b761ab55f6b..39d92cdc1e60db85153ecd7e5ceaa0f41cbaa5de 100644 (file)
--- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 class MercurialAdapterTest < ActiveSupport::TestCase
   HELPERS_DIR        = Redmine::Scm::Adapters::MercurialAdapter::HELPERS_DIR

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 f7b1d560c49c093e534192f9d27859c8aaf54e63..bb233637537f31d5dad19c60a360fa6ae225e343 100644 (file)
--- a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/subversion_adapter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 class SubversionAdapterTest < ActiveSupport::TestCase
   if repository_configured?('subversion')

diff --git a/test/unit/lib/redmine/search_test.rb b/test/unit/lib/redmine/search_test.rb
index fbea5668246d7a78e956f4c05d4fcd3bd173e41b..67ad46183dd0dbcaf273b22f5cd33ff43d9beda7 100644 (file)
--- a/test/unit/lib/redmine/search_test.rb
+++ b/test/unit/lib/redmine/search_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::Search::Tokenize < ActiveSupport::TestCase
   def test_tokenize

diff --git a/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb b/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
index 47c5ba014134da29eef9b24af399e736862004c4..129a19cf0b15a6128ef223e3ddc6909e1682a208 100644 (file)
--- a/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
+++ b/test/unit/lib/redmine/syntax_highlighting/rouge_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::SyntaxHighlighting::RougeTest < ActiveSupport::TestCase
   def test_filename_supported

diff --git a/test/unit/lib/redmine/themes_test.rb b/test/unit/lib/redmine/themes_test.rb
index aa3bf3de3c041065a9fe59920a5f076c290c2b32..1794196f8b1c3ea2f61a51bb659fdc31807c47ac 100644 (file)
--- a/test/unit/lib/redmine/themes_test.rb
+++ b/test/unit/lib/redmine/themes_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::ThemesTest < ActiveSupport::TestCase
   def test_themes

diff --git a/test/unit/lib/redmine/unified_diff_test.rb b/test/unit/lib/redmine/unified_diff_test.rb
index df466360b75b4aefd76d67291339148c2ef65b36..15eff8b44b7cb62763c087bce737964f4b701749 100644 (file)
--- a/test/unit/lib/redmine/unified_diff_test.rb
+++ b/test/unit/lib/redmine/unified_diff_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
   def test_subversion_diff

diff --git a/test/unit/lib/redmine/utils/date_calculation.rb b/test/unit/lib/redmine/utils/date_calculation.rb
index c4eed7318f2db14481c40a1ffd12f5ee13124f92..27e86289ec8044dbdae1aadce648756439572f32 100644 (file)
--- a/test/unit/lib/redmine/utils/date_calculation.rb
+++ b/test/unit/lib/redmine/utils/date_calculation.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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::Utils::DateCalculationTest < ActiveSupport::TestCase
   include Redmine::Utils::DateCalculation

diff --git a/test/unit/lib/redmine/views/builders/json_test.rb b/test/unit/lib/redmine/views/builders/json_test.rb
index acaf6a27c6b3329b0f75ec11d63d956d01c55f8e..2d7d8de947e9b013f5c4ae508c21b1ec0a931403 100644 (file)
--- a/test/unit/lib/redmine/views/builders/json_test.rb
+++ b/test/unit/lib/redmine/views/builders/json_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 class Redmine::Views::Builders::JsonTest < ActiveSupport::TestCase
   def test_nil_and_false

diff --git a/test/unit/lib/redmine/views/builders/xml_test.rb b/test/unit/lib/redmine/views/builders/xml_test.rb
index 808b7b93d61298e6a9d455b86d555d331540ea64..6aa259c8622915e5bae7279e1a80aa736c2e16e8 100644 (file)
--- a/test/unit/lib/redmine/views/builders/xml_test.rb
+++ b/test/unit/lib/redmine/views/builders/xml_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 class Redmine::Views::Builders::XmlTest < ActiveSupport::TestCase
   def test_hash

diff --git a/test/unit/lib/redmine/views/labelled_form_builder_test.rb b/test/unit/lib/redmine/views/labelled_form_builder_test.rb
index 075a16fd4b79adf0e03c45585780bc354a3f3172..be96c875d453b9bbdac78b6afdf75b3a87907502 100644 (file)
--- a/test/unit/lib/redmine/views/labelled_form_builder_test.rb
+++ b/test/unit/lib/redmine/views/labelled_form_builder_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::Views::LabelledFormBuilderTest < Redmine::HelperTest
   include Rails.application.routes.url_helpers

diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/application_helper_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/application_helper_test.rb
index a645d0416846f1ba7b2d148e8d08d5ee34761fee..6ddfafcb4cfbbe0623ca963b9f27d599a079b10a 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/common_mark/application_helper_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/common_mark/application_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 class Redmine::WikiFormatting::CommonMark::ApplicationHelperTest < Redmine::HelperTest
   if Object.const_defined?(:CommonMarker)

diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/external_links_filter_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/external_links_filter_test.rb
index 43d5533acb4962d6d6befebd178dc57242d3f21b..ec2d319ed2eb7a852448b73e86529f207874bcb0 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/common_mark/external_links_filter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/common_mark/external_links_filter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 if Object.const_defined?(:CommonMarker)
   require 'redmine/wiki_formatting/common_mark/external_links_filter'

diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/fixup_auto_links_filter_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/fixup_auto_links_filter_test.rb
index b71cf17b9ad9e95921c7ac42b7b56891d7df3e91..af7aea46adf5544248ffde3dd26756998bca941f 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/common_mark/fixup_auto_links_filter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/common_mark/fixup_auto_links_filter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 if Object.const_defined?(:CommonMarker)
   require 'redmine/wiki_formatting/common_mark/fixup_auto_links_filter'

diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb
index 4ef04991ff32c1cf720b756ed6943bf40bfc1191..0efc3ef98f814c6cdbab215dc24803f6d49c7f4d 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/common_mark/formatter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 class Redmine::WikiFormatting::CommonMark::FormatterTest < ActionView::TestCase
   if Object.const_defined?(:CommonMarker)

diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/markdown_filter_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/markdown_filter_test.rb
index c7f37bffdca34b647509c2ae06fa6d55cb5a3891..98bbb49a1970c49eb28c1285b185d35475952a28 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/common_mark/markdown_filter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/common_mark/markdown_filter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 if Object.const_defined?(:CommonMarker)
   require 'redmine/wiki_formatting/common_mark/markdown_filter'

diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/sanitization_filter_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/sanitization_filter_test.rb
index 8de671cc688338f246aef059cb9b977d324c23af..6741c7174a7faca6af5ee9b382d9498fd26629d0 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/common_mark/sanitization_filter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/common_mark/sanitization_filter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 
 if Object.const_defined?(:CommonMarker)
   require 'redmine/wiki_formatting/common_mark/sanitization_filter'

diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/syntax_highlight_filter_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/syntax_highlight_filter_test.rb
index 4c0a8b02cd5596a51d0eda86422dd43767aa43e5..d3c57f619dbf5a1866e097f5be700cca9e6cf7be 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/common_mark/syntax_highlight_filter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/common_mark/syntax_highlight_filter_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.expand_path('../../../../../../test_helper', __FILE__)
+require_relative '../../../../../test_helper'
 if Object.const_defined?(:CommonMarker)
   require 'redmine/wiki_formatting/common_mark/syntax_highlight_filter'
 

diff --git a/test/unit/lib/redmine/wiki_formatting/html_parser_test.rb b/test/unit/lib/redmine/wiki_formatting/html_parser_test.rb
index 6930251dfd74841a6b20f0899b44f575f3f407b0..4f3c2c5345f672e0820a6f39ff7a49246396002e 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/html_parser_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/html_parser_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::WikiFormatting::HtmlParserTest < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/lib/redmine/wiki_formatting/html_sanitizer_test.rb b/test/unit/lib/redmine/wiki_formatting/html_sanitizer_test.rb
index 72deca02e9c4292cd5445a2012ebcb1f3033bcac..39144aa472caf0bb59e1b6ab1b7efa5cdd99592b 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/html_sanitizer_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/html_sanitizer_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::WikiFormatting::HtmlSanitizerTest < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/lib/redmine/wiki_formatting/macros_test.rb b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
index 120de06b8e79b6c234dee63f68841a790808f3cf..04781ca21f2a01bf5567fc8a955bd5bb710beb2d 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/macros_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
   include ApplicationHelper

diff --git a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb
index 7cb2a0e88a1b552fb21ad039de05caafc8d85aca..33bc8a26909fba40275348097db00a5d81931a72 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::WikiFormatting::MarkdownFormatterTest < ActionView::TestCase
   def setup

diff --git a/test/unit/lib/redmine/wiki_formatting/markdown_html_parser_test.rb b/test/unit/lib/redmine/wiki_formatting/markdown_html_parser_test.rb
index f057bdf445f0453659408dc8f3700e7ce6a173fd..ce67433656fd626e30f3d58a3372642cb2d62dc4 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/markdown_html_parser_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/markdown_html_parser_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::WikiFormatting::MarkdownHtmlParserTest < ActiveSupport::TestCase
   def setup

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 4d41799486e9e2bf946798938f4d20e5c1eb5296..c1923dd074e95b120088c432dba3ed3eb6fdbe7d 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
@@ -18,7 +18,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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 require 'digest/md5'
 
 class Redmine::WikiFormatting::TextileFormatterTest < ActionView::TestCase

diff --git a/test/unit/lib/redmine/wiki_formatting/textile_html_parser_test.rb b/test/unit/lib/redmine/wiki_formatting/textile_html_parser_test.rb
index fe48f2be91f0e337fc7cb0a8718a16316c3d3a5a..f3c8a8138d75788541b2653c93a249da2cda3fd5 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting/textile_html_parser_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/textile_html_parser_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.expand_path('../../../../../test_helper', __FILE__)
+require_relative '../../../../test_helper'
 
 class Redmine::WikiFormatting::TextileHtmlParserTest < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/lib/redmine/wiki_formatting_test.rb b/test/unit/lib/redmine/wiki_formatting_test.rb
index a9a824112ff2d8f4e5a2b79d42d1bee7d28527ec..7c882ecfb8c05976fdfa38d3ca3cdf4ec4998554 100644 (file)
--- a/test/unit/lib/redmine/wiki_formatting_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting_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.expand_path('../../../../test_helper', __FILE__)
+require_relative '../../../test_helper'
 
 class Redmine::WikiFormattingTest < ActiveSupport::TestCase
   fixtures :issues

diff --git a/test/unit/lib/redmine_test.rb b/test/unit/lib/redmine_test.rb
index eb6346bb0c16f5eab6f32d01674a9d938f81b456..f59c908ab2b188c29756f9343f09fcf785797469 100644 (file)
--- a/test/unit/lib/redmine_test.rb
+++ b/test/unit/lib/redmine_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.expand_path('../../../test_helper', __FILE__)
+require_relative '../../test_helper'
 
 module RedmineMenuTestHelper
   # Assertions

diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index 7a2ff50b8ad53ed38cefee421fec8c866b6f57b7..bc9439c686d99c73e474a8b1bf80147dc01f7545 100644 (file)
--- 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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class MailHandlerTest < ActiveSupport::TestCase
   fixtures :users, :projects, :enabled_modules, :roles,

diff --git a/test/unit/mailer_localisation_test.rb b/test/unit/mailer_localisation_test.rb
index ddc3f90e3a2ad0f687b6862bbb8e63c20af5b07b..0c8a9895aeb6b8bb11f761a41dd068bcde0c044a 100644 (file)
--- a/test/unit/mailer_localisation_test.rb
+++ b/test/unit/mailer_localisation_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class MailerLocalisationTest < ActiveSupport::TestCase
   include Redmine::I18n

diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 8f21e9a0bccfef67fa68ea7562a70f98f394c6e6..99d67423f00c5e4feb3fd87f2525a0c8c76fc6cc 100644 (file)
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class MailerTest < ActiveSupport::TestCase
   include Redmine::I18n

diff --git a/test/unit/member_test.rb b/test/unit/member_test.rb
index 7fbaff6d6316b19c6647acb41cd830c9b7760e13..fd54123cb76c6171ed21b2c3314096ea33760fc6 100644 (file)
--- a/test/unit/member_test.rb
+++ b/test/unit/member_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class MemberTest < ActiveSupport::TestCase
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/unit/message_test.rb b/test/unit/message_test.rb
index 7737d4e345390f41c4fe2f2a6bb4f5ac439b4732..82446c0a317ba25f4b3c336ba7108e3d9083cd84 100644 (file)
--- a/test/unit/message_test.rb
+++ b/test/unit/message_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class MessageTest < ActiveSupport::TestCase
   fixtures :projects, :roles, :members, :member_roles, :boards, :messages,

diff --git a/test/unit/news_test.rb b/test/unit/news_test.rb
index 63b409d46f9e89a7e8410ac12385d6f11ad3bad1..a9d39c60bedbb346c93caf0ea201fc8e6d7068aa 100644 (file)
--- a/test/unit/news_test.rb
+++ b/test/unit/news_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class NewsTest < ActiveSupport::TestCase
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles, :enabled_modules, :news

diff --git a/test/unit/principal_test.rb b/test/unit/principal_test.rb
index ece873df4be34552abe101951ede0b10b4535743..31b7c3de0b49cbcc71be94c06a89b2e3548809cf 100644 (file)
--- a/test/unit/principal_test.rb
+++ b/test/unit/principal_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class PrincipalTest < ActiveSupport::TestCase
   fixtures :users, :projects, :members, :member_roles, :roles,

diff --git a/test/unit/project_copy_test.rb b/test/unit/project_copy_test.rb
index d6f338d719995dda78385cc667bd276dc5abade7..917805e510e7204503df073bca5da623d0b61532 100644 (file)
--- a/test/unit/project_copy_test.rb
+++ b/test/unit/project_copy_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ProjectCopyTest < ActiveSupport::TestCase
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/unit/project_members_inheritance_test.rb b/test/unit/project_members_inheritance_test.rb
index dd0c4493ea9b9f3304bf929dcc2665d36b7308ca..b1b414db9ddaef412915ed77d95266ae18bf5d28 100644 (file)
--- a/test/unit/project_members_inheritance_test.rb
+++ b/test/unit/project_members_inheritance_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ProjectMembersInheritanceTest < ActiveSupport::TestCase
   fixtures :roles, :users,

diff --git a/test/unit/project_nested_set_concurrency_test.rb b/test/unit/project_nested_set_concurrency_test.rb
index e98a4b9ff61c218635a4a7c6f9bd56f5fc86de57..e835d2b50b041a6ade2267c5df8b34cbd18aedf9 100644 (file)
--- a/test/unit/project_nested_set_concurrency_test.rb
+++ b/test/unit/project_nested_set_concurrency_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ProjectNestedSetConcurrencyTest < ActiveSupport::TestCase
   self.use_transactional_tests = false

diff --git a/test/unit/project_nested_set_test.rb b/test/unit/project_nested_set_test.rb
index 29e457942ee1df45d6e1dea63213bbbc5aec618a..72b62dc4e0c7a15ace419cfbcb136b05510a40c6 100644 (file)
--- a/test/unit/project_nested_set_test.rb
+++ b/test/unit/project_nested_set_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ProjectNestedSetTest < ActiveSupport::TestCase
   def setup

diff --git a/test/unit/project_query_test.rb b/test/unit/project_query_test.rb
index 6c925e6fbdda757d971306319c4548fb617f1e1c..efa761d020cf06851abcb18d6822ceae3473cf91 100644 (file)
--- a/test/unit/project_query_test.rb
+++ b/test/unit/project_query_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ProjectQueryTest < ActiveSupport::TestCase
   fixtures :projects, :users,

diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index c83009a72f145586671d4cda78cb04f0d56e1411..3e478e66eebb6a28f1a759d6e933cf2cbe04238f 100644 (file)
--- a/test/unit/project_test.rb
+++ b/test/unit/project_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class ProjectTest < ActiveSupport::TestCase
   fixtures :projects, :trackers, :issue_statuses, :issues,

diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index 9a0d3a7e9f1b76e393658f76bebbb91a818e7f85..6c05c9b955a37a35cd355e332ed2921123a42853 100644 (file)
--- a/test/unit/query_test.rb
+++ b/test/unit/query_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class QueryTest < ActiveSupport::TestCase
   include Redmine::I18n

diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb
index 039e9dafa647208cafbd9ecee853aaac8eb5399a..64e6b67057d87cd18486f67350551f34072f3a98 100644 (file)
--- a/test/unit/repository_bazaar_test.rb
+++ b/test/unit/repository_bazaar_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoryBazaarTest < ActiveSupport::TestCase
   fixtures :projects

diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb
index c0f53eaf026c7dda0c80bb65dfc69e28344c5648..543ed210eaf562930931a40cf6f674096f147475 100644 (file)
--- a/test/unit/repository_cvs_test.rb
+++ b/test/unit/repository_cvs_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoryCvsTest < ActiveSupport::TestCase
   fixtures :projects

diff --git a/test/unit/repository_filesystem_test.rb b/test/unit/repository_filesystem_test.rb
index 1a5c15b1f4b5a2abeb6e5a99c5b4c89a3d2f967d..c6e5acb262872620842c79d7ae6f082e58449e2b 100644 (file)
--- a/test/unit/repository_filesystem_test.rb
+++ b/test/unit/repository_filesystem_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoryFilesystemTest < ActiveSupport::TestCase
   fixtures :projects

diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
index 3c39d5aa46d9693419718b4787997c5f427ced0c..95f0ac386585c3f64e29ec82112e9b5650c9d4d2 100644 (file)
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoryGitTest < ActiveSupport::TestCase
   fixtures :projects, :repositories, :enabled_modules, :users, :roles

diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb
index 51312ad2c4417f6081d72bc1995d0ab48e36bf5d..9555583077fd1a3c08d7cf3b1e722e9334decab2 100644 (file)
--- a/test/unit/repository_mercurial_test.rb
+++ b/test/unit/repository_mercurial_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoryMercurialTest < ActiveSupport::TestCase
   fixtures :projects

diff --git a/test/unit/repository_subversion_test.rb b/test/unit/repository_subversion_test.rb
index 01a9f18384f9b373ae6620c26b3a26eaef8226f9..a5645e5f40063623345e90d7ed820741cbe7a972 100644 (file)
--- a/test/unit/repository_subversion_test.rb
+++ b/test/unit/repository_subversion_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositorySubversionTest < ActiveSupport::TestCase
   fixtures :projects, :repositories, :enabled_modules, :users, :roles

diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index 9915ad2f4b020a39c0ad08403be6f285d60c596f..cd4cea9b7ed6bd02f238bbb7121d7b8f24f78c06 100644 (file)
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RepositoryTest < ActiveSupport::TestCase
   fixtures :projects,

diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb
index 385215a765550040928e4becc22fff059008ef2a..ea8d8b29daeeeb50ec0b253c29d880747c8e4ecc 100644 (file)
--- a/test/unit/role_test.rb
+++ b/test/unit/role_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class RoleTest < ActiveSupport::TestCase
   fixtures :roles, :workflows, :trackers, :users

diff --git a/test/unit/search_test.rb b/test/unit/search_test.rb
index 48775ae5eebc7bd7081b7992f63c5769a0269a7d..7c9e3d19a93487fd798672cfbbfa6cbc606ea46f 100644 (file)
--- a/test/unit/search_test.rb
+++ b/test/unit/search_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SearchTest < ActiveSupport::TestCase
   fixtures :users,

diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb
index 97558e0c4ff3f384aca76c7a0496568f6b8b3384..3927949c029631271a1baef44fa7fd14dace0683 100644 (file)
--- a/test/unit/setting_test.rb
+++ b/test/unit/setting_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class SettingTest < ActiveSupport::TestCase
   fixtures :users

diff --git a/test/unit/time_entry_activity_test.rb b/test/unit/time_entry_activity_test.rb
index 8c70d48174a82ba1481070c79230c977ede43961..bfbf534ab7e4b50d8a2a7974e14235ec0155d1e9 100644 (file)
--- a/test/unit/time_entry_activity_test.rb
+++ b/test/unit/time_entry_activity_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TimeEntryActivityTest < ActiveSupport::TestCase
   fixtures :enumerations, :time_entries,

diff --git a/test/unit/time_entry_custom_field_test.rb b/test/unit/time_entry_custom_field_test.rb
index 91625f7d693dfe7121cd71165c4c92182ff31478..acad84e381483f82f5133db58d197e70c8ac3eb1 100644 (file)
--- a/test/unit/time_entry_custom_field_test.rb
+++ b/test/unit/time_entry_custom_field_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TimeEntryCustomFieldTest < ActiveSupport::TestCase
   include Redmine::I18n

diff --git a/test/unit/time_entry_import_test.rb b/test/unit/time_entry_import_test.rb
index 7cbc3acdcb2ce25902fdcce6149152a4a7e4cefd..3766f12cb7d841a2525df9dfc05d9a20acdb9ab4 100644 (file)
--- a/test/unit/time_entry_import_test.rb
+++ b/test/unit/time_entry_import_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TimeEntryImportTest < ActiveSupport::TestCase
   fixtures :projects, :enabled_modules,

diff --git a/test/unit/time_entry_query_test.rb b/test/unit/time_entry_query_test.rb
index c6cdbd945b6a42265cd3eb0845e1903066e1a984..562917a4d939c6e7329a3ce4df8a94bf2264b68a 100644 (file)
--- a/test/unit/time_entry_query_test.rb
+++ b/test/unit/time_entry_query_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TimeEntryQueryTest < ActiveSupport::TestCase
   fixtures :issues, :projects, :users,

diff --git a/test/unit/time_entry_test.rb b/test/unit/time_entry_test.rb
index 6a7afa86390a58efffae6dbf8c4b4a6b1c1f4da5..60145366934440dee6c68f2f46952d6858384aea 100644 (file)
--- a/test/unit/time_entry_test.rb
+++ b/test/unit/time_entry_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TimeEntryTest < ActiveSupport::TestCase
   include Redmine::I18n

diff --git a/test/unit/token_test.rb b/test/unit/token_test.rb
index bf2fd2b38446975373919c2211c06ae857c0b7a1..da6c6306472f7f6e23389771d306e5997d9d7b8b 100644 (file)
--- a/test/unit/token_test.rb
+++ b/test/unit/token_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TokenTest < ActiveSupport::TestCase
   fixtures :tokens, :users, :email_addresses

diff --git a/test/unit/tracker_test.rb b/test/unit/tracker_test.rb
index 36b7419ebc2e7697d3323d24190b5334622306db..d9c34f96aa04a9c5df89bb1313e097251b758adc 100644 (file)
--- a/test/unit/tracker_test.rb
+++ b/test/unit/tracker_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class TrackerTest < ActiveSupport::TestCase
   fixtures :trackers, :workflows, :issue_statuses, :roles, :issues, :custom_fields, :projects, :projects_trackers, :enabled_modules

diff --git a/test/unit/user_import_test.rb b/test/unit/user_import_test.rb
index d4f3f8a395bbff651e0b251a786c5e5e95f1991b..55cf0988ab99449bce3e42860eed698e3ba1da8a 100644 (file)
--- a/test/unit/user_import_test.rb
+++ b/test/unit/user_import_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class UserImportTest < ActiveSupport::TestCase
   fixtures :users, :auth_sources, :custom_fields

diff --git a/test/unit/user_preference_test.rb b/test/unit/user_preference_test.rb
index 2040511d48a213a7011caf027921a1d56792b484..67157d5a22680f5c915cecd1d05cbd13ada15afe 100644 (file)
--- a/test/unit/user_preference_test.rb
+++ b/test/unit/user_preference_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class UserPreferenceTest < ActiveSupport::TestCase
   fixtures :users, :user_preferences

diff --git a/test/unit/user_query_test.rb b/test/unit/user_query_test.rb
index 0dbf870923dc095dd67dc4729cc6b54002939e5a..9bb9c816d0086ff36082b34596cc67c10971d2a9 100644 (file)
--- a/test/unit/user_query_test.rb
+++ b/test/unit/user_query_test.rb
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 
-require File.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class UserQueryTest < ActiveSupport::TestCase
   fixtures :users, :groups_users, :email_addresses,

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index b5448c9cd307b32b87eea7c33aa82f5d5ea6af36..b6d9a34efab2cf1e41a2e72a50ff7a6797ce4088 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class UserTest < ActiveSupport::TestCase
   fixtures :users, :email_addresses, :members, :projects, :roles, :member_roles, :auth_sources,

diff --git a/test/unit/version_test.rb b/test/unit/version_test.rb
index cf8b229bcab3fee6391b830ca07b9fe0e0ac68a4..d51684bc03dfd914ed5ee46554670ef2950d03e4 100644 (file)
--- a/test/unit/version_test.rb
+++ b/test/unit/version_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class VersionTest < ActiveSupport::TestCase
   fixtures :projects, :users, :issues, :issue_statuses, :trackers,

diff --git a/test/unit/watcher_test.rb b/test/unit/watcher_test.rb
index 1da45269983e277c0e39a4c3f7ab99aba546c2a0..50eeee1c0844c5697881e3bedea1b8d6de185d96 100644 (file)
--- a/test/unit/watcher_test.rb
+++ b/test/unit/watcher_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WatcherTest < ActiveSupport::TestCase
   fixtures :projects, :groups_users, :users, :email_addresses, :members, :member_roles, :roles, :enabled_modules,

diff --git a/test/unit/wiki_content_test.rb b/test/unit/wiki_content_test.rb
index d215c3f207d88cd6a8715205284b90fef773b6df..c94a386f04c37cac41f3f6914e312238c2db212c 100644 (file)
--- a/test/unit/wiki_content_test.rb
+++ b/test/unit/wiki_content_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WikiContentTest < ActiveSupport::TestCase
   fixtures :projects, :enabled_modules,

diff --git a/test/unit/wiki_content_version_test.rb b/test/unit/wiki_content_version_test.rb
index 7ad000ee52bb8916bae5ded69dfd3bf795fa8d36..9822ab40dfcc7baa49e25cf2f1ce06b6ad8f3a8c 100644 (file)
--- a/test/unit/wiki_content_version_test.rb
+++ b/test/unit/wiki_content_version_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WikiContentVersionTest < ActiveSupport::TestCase
   fixtures :projects, :users, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions

diff --git a/test/unit/wiki_page_test.rb b/test/unit/wiki_page_test.rb
index cc917547c199d79dd9d0a7bfa4b0f38ce5b63fa5..9e7633f0845dea31b02ff5c35b17febbf9be074c 100644 (file)
--- a/test/unit/wiki_page_test.rb
+++ b/test/unit/wiki_page_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 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 dcdcfb99681bc3ba7385147dc3c1c2c9b0c0610f..5289895cc0132046f063ac3c76bc7343a5b5e5c1 100644 (file)
--- a/test/unit/wiki_redirect_test.rb
+++ b/test/unit/wiki_redirect_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WikiRedirectTest < ActiveSupport::TestCase
   fixtures :projects, :wikis, :wiki_pages

diff --git a/test/unit/wiki_test.rb b/test/unit/wiki_test.rb
index e051b7772c0b805bab7c9872653ed82d11360cbb..da791dff4f0828c586c8b6955f5a80155a1c1ac8 100644 (file)
--- 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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WikiTest < ActiveSupport::TestCase
   fixtures :projects, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions

diff --git a/test/unit/workflow_test.rb b/test/unit/workflow_test.rb
index 6196c4081de7e89b852f159d5fc5f6ff7565a749..c37f7f440e9b5f096ca5fefd4452eb810b3e87d0 100644 (file)
--- a/test/unit/workflow_test.rb
+++ b/test/unit/workflow_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WorkflowTest < ActiveSupport::TestCase
   fixtures :roles, :trackers, :issue_statuses

diff --git a/test/unit/workflow_transition_test.rb b/test/unit/workflow_transition_test.rb
index 3bb6db3cc9a9e3d0ab01185acd9eada5ea38e635..22bc532009cd1f798c3954da35302687309cf055 100644 (file)
--- a/test/unit/workflow_transition_test.rb
+++ b/test/unit/workflow_transition_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.expand_path('../../test_helper', __FILE__)
+require_relative '../test_helper'
 
 class WorkflowTransitionTest < ActiveSupport::TestCase
   fixtures :roles, :trackers, :issue_statuses