diff options
346 files changed, 348 insertions, 348 deletions
diff --git a/extra/sample_plugin/test/integration/routing_test.rb b/extra/sample_plugin/test/integration/routing_test.rb index 50ad4603f..916fbd2c3 100644 --- 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 54685d33c..55b016f6c 100644 --- 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 0499b6970..89cd961ae 100644 --- 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 ad15149fa..304516a35 100644 --- 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 f27327a4a..28b1ea130 100644 --- 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 68a4e44cf..52dd2fc45 100644 --- 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 4f9edf725..c76df8238 100644 --- 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 8970beba0..e9f24695c 100644 --- 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 cc731c9df..4d69cb9b2 100644 --- 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 295435f4e..f539f4619 100644 --- 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 1d31ed1ff..fbbf9e601 100644 --- 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 76241c4cb..78631b309 100644 --- 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 4f6cd93ad..1ac44e60e 100644 --- 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 2cbaf830d..82d0b18ad 100644 --- 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 57514ebb7..d64a6053e 100644 --- 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 914cdf78d..606c33b86 100644 --- 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 e30436f3f..0240a391d 100644 --- 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 132ddf8ff..57f1aff90 100644 --- 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 98ee771bd..dc7698e9a 100644 --- 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 ac37197cd..64a6f1209 100644 --- 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 e2d0baf3c..b604c2802 100644 --- 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 7427e11fe..034e49797 100644 --- 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 ad686047f..8ab392b5a 100644 --- 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 5b480360f..099683640 100644 --- 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 2cb503226..b01c8233e 100644 --- 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 076694e35..686de39cb 100644 --- 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 070f1cc42..dcab66d9a 100644 --- 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 ab4a2ff43..b3a68c483 100644 --- 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 556037888..1f4e6b35f 100644 --- 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 9eb9c70ab..0297eca6e 100644 --- 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 c686ce6e6..49163ef6e 100644 --- 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 342103029..7bb269ce9 100644 --- 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 9e7f1b5f1..b6a3dfab0 100644 --- 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 7ff2e043d..5078dbf44 100644 --- 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 c45114ff2..b822ccbe1 100644 --- 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 bc9cd8a7c..46ca01100 100644 --- 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 ac80cfcaf..8f4f27ee9 100644 --- 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 da696ce47..b8089f982 100644 --- 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 de04fa18a..e28f50d2e 100644 --- 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 b3d7ae796..2535e570b 100644 --- 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 65cb7f864..a48ae8b3d 100644 --- 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 0d62b8f19..ffa439073 100644 --- 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 dd439e370..766442f4d 100644 --- 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 2dc3cfac8..95663b4f5 100644 --- 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 62380dd68..523882863 100644 --- 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 5c09a3296..a18850e66 100644 --- 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 a67b8be0d..0d15c4087 100644 --- 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 e3ce50f01..c83fc6b37 100644 --- 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 cc0dc9be5..9b59c330e 100644 --- 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 50da54324..17d9a50c4 100644 --- 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 b81378c74..1bac8023a 100644 --- 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 0ec4c819d..8866eeb12 100644 --- 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 fe7da0b8e..0ffd3134c 100644 --- 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 a2e5caa5c..afaff18a8 100644 --- 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 3c748c32a..62b52a3b1 100644 --- 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 efcd05cde..d82771354 100644 --- 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 0b5bc9838..022ad29e9 100644 --- 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 b0b21620b..59c25d07c 100644 --- 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 ccbea8301..f1ad6201f 100644 --- 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 b719cb13d..23f65bc00 100644 --- 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 dec852ef6..06d139dfc 100644 --- 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 443237962..c0c923377 100644 --- 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 cd21c1e42..84039aec3 100644 --- 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 670ad8e37..52f163028 100644 --- 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 f359c785b..24bd3bff3 100644 --- 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 a46f53adc..ccb40ce4c 100644 --- 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 d0403b9a8..b997a04a4 100644 --- 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 d03cfca65..cc43e027a 100644 --- 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 38d0039d7..239a0418c 100644 --- 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 650328e10..45cbc08ae 100644 --- 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 28f36b37f..3765ac867 100644 --- 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 4d49372ba..9f3f9bffb 100644 --- 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 d130135d3..b368939d8 100644 --- 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 b5116fe5a..67a9bbc9a 100644 --- 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 99e1652df..bb6b37390 100644 --- 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 d6110f9e5..ab28a6d65 100644 --- 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 12ec7d390..522c843af 100644 --- 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 fb8d98132..65debf9d1 100644 --- 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 acbda6439..01466bac4 100644 --- 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 104e56523..5d158a886 100644 --- 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 7aa8fedb6..9851ecc85 100644 --- 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 68814f1ea..33b6d09f7 100644 --- 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 043a450ee..f8be43007 100644 --- 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 bbbb94700..35d0919a0 100644 --- 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 d323a1b04..c8acc6a20 100644 --- 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 ad3ad2977..55b49c9cc 100644 --- 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 acb871acd..33fe56a7b 100644 --- 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 a203f12cb..ef9bb0578 100644 --- 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 d49f9d564..b9ff8ad39 100644 --- 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 f7a002ba7..07b63084f 100644 --- 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 09557a32e..73100316e 100644 --- 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 cb4799826..88aac77de 100644 --- 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 1d9bf5b03..8028b77c1 100644 --- 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 ba93dad92..04bca2d2c 100644 --- 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 bb775a5fc..efca29e66 100644 --- 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 e4b320f78..b9526aa4e 100644 --- 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 120c4f8a0..45925c48b 100644 --- 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 1a16e0a4b..6de463843 100644 --- 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 9ff4aedb5..ffabf9ff2 100644 --- 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 2905a3b6f..ffa4a4d43 100644 --- 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 c020b7a4e..5cdbd8816 100644 --- 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 3b14a6e38..63b0aa913 100644 --- 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 791b7369b..c96a39893 100644 --- 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 7226db497..00d0b96e4 100644 --- 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 198ac02c3..127873161 100644 --- 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 5ec44eb6b..fb4e18f93 100644 --- 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 f229a0bfa..4978b6f5b 100644 --- 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 cb7647585..c92ba55a9 100644 --- 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 8c13c19ca..132b6f815 100644 --- 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 f637d90f4..c5d711624 100644 --- 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 59f19a650..628125735 100644 --- 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 bb9b213c7..01ebbf610 100644 --- 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 33e2f59a2..76a2087e9 100644 --- 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 1827c8829..7bdc8f839 100644 --- 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 d8ae42576..f0c1973cb 100644 --- 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 01f0ac901..268f3be74 100644 --- 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 7a96c8373..01d46a5fd 100644 --- 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 34b0ec784..cdd9c2803 100644 --- 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 d1e5de8ea..e1871f893 100644 --- 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 797a6655a..1cd5765c8 100644 --- 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 7322cd2ee..d239aabb6 100644 --- 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 34bc51f75..81ac487ac 100644 --- 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 1c0b07e59..267a4bef9 100644 --- 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 571edc1b0..98c11e7f2 100644 --- 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 f7abae80b..d6caac41a 100644 --- 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 a7755ac29..9060a0fb3 100644 --- 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 265a1db17..febaa14e6 100644 --- 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 93ab661b3..c9f5c3537 100644 --- 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 89dff619b..6918b11f9 100644 --- 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 eb86dfb12..2b962ec79 100644 --- 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 ae24f5bd1..9eacded52 100644 --- 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 533c3eb4b..3bc01ee8f 100644 --- 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 9c5cefb7a..f7434468f 100644 --- 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 c5a16d954..600c65484 100644 --- 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 05eef97a7..cffd60356 100644 --- 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 285748d65..6219a6367 100644 --- 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 f145e56d1..b2dcc2def 100644 --- 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 7ed914929..af56e372c 100644 --- 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 8976f8b89..0715c0cbc 100644 --- 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 c5d8dc99f..281fddb86 100644 --- 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 e01e4d19b..ea5080d19 100644 --- 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 cca82b29c..b00cd5649 100644 --- 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 a020cfe5e..53ad75e04 100644 --- 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 376da97ed..5242699d7 100644 --- 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 cbd517e5f..43d03f88a 100644 --- 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 81fd6325e..5d1814fc3 100644 --- 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 d968ae81f..04315f108 100644 --- 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 2704513df..6eb6f6535 100644 --- 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 2c08ef9cd..e90322d88 100644 --- 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 421edaacb..205e8b1d9 100644 --- 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 440a213b8..11612d173 100644 --- 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 300301308..6894aea4e 100644 --- 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 ad64ebf31..69ba843a7 100644 --- 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 7400d7eb8..17f685ad2 100644 --- 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 d4d7f7f8f..d8e92ea31 100644 --- 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 0b91d30ad..7a2bc3f11 100644 --- 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 6c41286dc..de7d5b811 100644 --- 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 430f60d64..979de312b 100644 --- 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 8fd671784..8dd50161c 100644 --- 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 6ef1b37bd..3935278bc 100644 --- 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 4edd8b1fe..023eddd1c 100644 --- 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 854a36ae8..46055da7c 100644 --- 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 c1064cedc..e3895a634 100644 --- 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 b2a7c9b20..da39f83c4 100644 --- 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 b889278f3..3a12119b4 100644 --- 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 c8ab6aa93..e4116691c 100644 --- 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 9895ec511..c2087bfbe 100644 --- 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 a15b1adea..003358975 100644 --- 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 79a4a1bb0..f0d2e9cdb 100644 --- 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 302b02c56..c8d3c8026 100644 --- 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 5130b18cb..f90c965af 100644 --- 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 d1438258c..9f5246fd5 100644 --- 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 043786627..208b935ea 100644 --- 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 56cb4f57f..6caeced13 100644 --- 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 546f77354..cacf2860a 100644 --- 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 f2ac6162c..18c674f4f 100644 --- 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 8af3fb1f0..b4ba66969 100644 --- 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 8f2b7afdf..ff41832be 100644 --- 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 c123046e4..c46784766 100644 --- 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 a1fe5622e..67a09cabd 100644 --- 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 ab19118f5..e1af82a60 100644 --- 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 e3a4317b3..8c68f874b 100644 --- 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 cb3ac8230..8b0ba8ebd 100644 --- 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 abc66b3b3..07a4d9e9e 100644 --- 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 4eb54898e..eb24de402 100644 --- 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 780053c8e..e08dc8307 100644 --- 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 d529e8704..a27f6869e 100644 --- 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 8f15bf9e8..cd6bf5491 100644 --- 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 78815cb20..3df23254b 100644 --- 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 367549b8f..16a8ebdce 100644 --- 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 324d8ed40..d45d98868 100644 --- 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 48bd9af63..a66b19e38 100644 --- 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 a49707c7c..23fbb49e6 100644 --- 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 bd7f3d343..f4aa580bd 100644 --- 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 eb7c83dfd..7722f4f5f 100644 --- 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 cc0761555..de6e9c47a 100644 --- 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 baccdf608..b4ee1fd75 100644 --- 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 aa6470b2f..bd073ef74 100644 --- 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 776ed4f4d..2cfbeae00 100644 --- 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 1bb1eb973..d4ef2f7cd 100644 --- a/test/unit/attachment_test.rb +++ b/test/unit/attachment_test.rb @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -require File.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 b838d25df..392322d0b 100644 --- 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 bd0babe3a..958c46e97 100644 --- 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 516acd018..38e66e386 100644 --- 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 251f0773a..b36fc7dcc 100644 --- a/test/unit/changeset_test.rb +++ b/test/unit/changeset_test.rb @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -require File.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 d4b0ce757..68ae898f1 100644 --- 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 17e7edee2..5bdd79038 100644 --- 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 66cb44055..7f9946312 100644 --- 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 1fe58f45e..8962aa301 100644 --- 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 c1ff6988e..166429e3b 100644 --- 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 293281094..9adf97c14 100644 --- 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 52f7ad90f..125c199ba 100644 --- 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 82d055d2c..19e162cad 100644 --- 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 2a1636dc9..2cba7bbad 100644 --- 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 6d99e7efe..4df1562b3 100644 --- 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 075f0a029..25dfb14c4 100644 --- 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 0ae78e73a..92685e21c 100644 --- 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 9403efd82..317cbba14 100644 --- 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 14ad3385f..c5f2dffa6 100644 --- 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 3174d7e10..716fda718 100644 --- 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 c5d871ac7..f6ea0570e 100644 --- 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 2767426b2..9400b62cc 100644 --- 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 bf47a4106..5f9873844 100644 --- 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 54659f95b..efd58b718 100644 --- 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 b250f62a4..0b64b117c 100644 --- 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 fe71ad9c3..358cd5f67 100644 --- 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 a6ba05387..3d2366886 100644 --- 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 993393c98..b65c20b0e 100644 --- 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 711d081de..14dca00e3 100644 --- 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 057214dbc..b022546ae 100644 --- 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 9876a0077..83aaa88d3 100644 --- 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 518ed06a3..9e2f3449e 100644 --- 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 c91f935f3..6e692c9fd 100644 --- 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 f12a9a8ae..511b16415 100644 --- 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 fec562499..9fe751793 100644 --- 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 91fef8eb2..1f67d37d7 100644 --- 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 3c7a48347..22dc746c7 100644 --- 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 fce6b8de8..f8a93bf11 100644 --- 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 1981a4007..c04f36369 100644 --- 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 79e6a587d..5a00f1afd 100644 --- 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 4b75cdfce..b62ab68c8 100644 --- 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 596bb1762..cebcb2db3 100644 --- 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 1b239332b..4dd40b9fc 100644 --- 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 edea888c1..899d6e0f6 100644 --- 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 d0910c3b5..6e8b95424 100644 --- 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 2cf1144c6..87f4f47cd 100644 --- 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 dfa3be6fb..0e65d7499 100644 --- 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 4bb0c59e9..3903a3d50 100644 --- 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 3b5779602..090405b15 100644 --- 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 f70efb2cf..32c881fd5 100644 --- 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 75a8a37fc..116a03ad2 100644 --- 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 e3f3deba9..9ced022fb 100644 --- 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 195a27f51..5df3632bf 100644 --- 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 d3c5873a6..8cae63ca7 100644 --- 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 c95999853..ca9f9c904 100644 --- 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 90e5f0b64..a9cce69b1 100644 --- 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 a3cfead37..0b97a7f20 100644 --- 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 b169c14f0..8ba8aa9c4 100644 --- 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 7f4a0598d..78119ee73 100644 --- 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 c9d00b8a5..c146549f1 100644 --- 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 0ec0a95ab..c56a22201 100644 --- 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 cfc0595e9..4bbf6ceef 100644 --- 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 8015b583c..673e45901 100644 --- 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 a2fe2abf7..2d7491d82 100644 --- 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 2bb4e8dee..e74408f05 100644 --- 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 42587044c..cbf1d3dec 100644 --- 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 57c0b5784..11e73bad4 100644 --- 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 5d03c9663..07d3f7284 100644 --- 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 513606405..c2383bc08 100644 --- 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 5fe56187d..ed5943346 100644 --- 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 e113f5808..02df23236 100644 --- 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 310d2bf35..372de4d54 100644 --- 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 15a2fe177..4f031b816 100644 --- 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 1e8b163b7..0d22adaa3 100644 --- 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 ec75cf010..b934c047f 100644 --- 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 419f97324..2d13173e6 100644 --- 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 1e017828e..95dcea35e 100644 --- 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 67de472f5..39d92cdc1 100644 --- 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 f7b1d560c..bb2336375 100644 --- 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 fbea56682..67ad46183 100644 --- 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 47c5ba014..129a19cf0 100644 --- 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 aa3bf3de3..1794196f8 100644 --- 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 df466360b..15eff8b44 100644 --- 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 c4eed7318..27e86289e 100644 --- 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 acaf6a27c..2d7d8de94 100644 --- 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 808b7b93d..6aa259c86 100644 --- 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 075a16fd4..be96c875d 100644 --- 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 a645d0416..6ddfafcb4 100644 --- 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 43d5533ac..ec2d319ed 100644 --- 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 b71cf17b9..af7aea46a 100644 --- 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 4ef04991f..0efc3ef98 100644 --- 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 c7f37bffd..98bbb49a1 100644 --- 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 8de671cc6..6741c7174 100644 --- 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 4c0a8b02c..d3c57f619 100644 --- 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 6930251df..4f3c2c534 100644 --- 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 72deca02e..39144aa47 100644 --- 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 120de06b8..04781ca21 100644 --- 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 7cb2a0e88..33bc8a269 100644 --- 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 f057bdf44..ce6743365 100644 --- 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 4d4179948..c1923dd07 100644 --- 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 fe48f2be9..f3c8a8138 100644 --- 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 a9a824112..7c882ecfb 100644 --- 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 eb6346bb0..f59c908ab 100644 --- 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 7a2ff50b8..bc9439c68 100644 --- a/test/unit/mail_handler_test.rb +++ b/test/unit/mail_handler_test.rb @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -require File.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 ddc3f90e3..0c8a9895a 100644 --- 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 8f21e9a0b..99d67423f 100644 --- 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 7fbaff6d6..fd54123cb 100644 --- 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 7737d4e34..82446c0a3 100644 --- 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 63b409d46..a9d39c60b 100644 --- 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 ece873df4..31b7c3de0 100644 --- 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 d6f338d71..917805e51 100644 --- 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 dd0c4493e..b1b414db9 100644 --- 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 e98a4b9ff..e835d2b50 100644 --- 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 29e457942..72b62dc4e 100644 --- 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 6c925e6fb..efa761d02 100644 --- 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 c83009a72..3e478e66e 100644 --- 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 9a0d3a7e9..6c05c9b95 100644 --- 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 039e9dafa..64e6b6705 100644 --- 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 c0f53eaf0..543ed210e 100644 --- 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 1a5c15b1f..c6e5acb26 100644 --- 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 3c39d5aa4..95f0ac386 100644 --- 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 51312ad2c..955558307 100644 --- 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 01a9f1838..a5645e5f4 100644 --- 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 9915ad2f4..cd4cea9b7 100644 --- 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 385215a76..ea8d8b29d 100644 --- 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 48775ae5e..7c9e3d19a 100644 --- 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 97558e0c4..3927949c0 100644 --- 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 8c70d4817..bfbf534ab 100644 --- 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 91625f7d6..acad84e38 100644 --- 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 7cbc3acdc..3766f12cb 100644 --- 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 c6cdbd945..562917a4d 100644 --- 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 6a7afa863..601453669 100644 --- 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 bf2fd2b38..da6c63064 100644 --- 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 36b7419eb..d9c34f96a 100644 --- 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 d4f3f8a39..55cf0988a 100644 --- 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 2040511d4..67157d5a2 100644 --- 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 0dbf87092..9bb9c816d 100644 --- 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 b5448c9cd..b6d9a34ef 100644 --- 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 cf8b229bc..d51684bc0 100644 --- 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 1da452699..50eeee1c0 100644 --- 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 d215c3f20..c94a386f0 100644 --- 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 7ad000ee5..9822ab40d 100644 --- 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 cc917547c..9e7633f08 100644 --- 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 dcdcfb996..5289895cc 100644 --- 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 e051b7772..da791dff4 100644 --- a/test/unit/wiki_test.rb +++ b/test/unit/wiki_test.rb @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -require File.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 6196c4081..c37f7f440 100644 --- 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 3bb6db3cc..22bc53200 100644 --- 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 |