diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 01bde54..8323ba8 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -44,7 +44,7 @@ namespace :ci do end puts - sh 'testrb', '-Itest', *tests unless tests.empty? + sh 'ruby', '-Itest', *tests unless tests.empty? sh 'cucumber', *features unless features.empty? sh 'xvfb-run', 'cucumber', '-p', 'selenium', *features unless features.empty? diff --git a/lib/tasks/plugins_tests.rake b/lib/tasks/plugins_tests.rake index f5201c5..1eb5b1a 100644 --- a/lib/tasks/plugins_tests.rake +++ b/lib/tasks/plugins_tests.rake @@ -107,12 +107,12 @@ def run_test(name, files) if name == :cucumber || name == :selenium run_cucumber task2profile(name, plugin), files else - run_testrb files + run_minitest files end end -def run_testrb(files) - sh 'testrb', '-I.:test', *files +def run_minitest files + sh 'ruby', '-Itest', *files end def run_cucumber(profile, files) diff --git a/plugins/breadcrumbs/test/functional/profile_design_controller_test.rb b/plugins/breadcrumbs/test/functional/profile_design_controller_test.rb index dce83e3..6cc6140 100644 --- a/plugins/breadcrumbs/test/functional/profile_design_controller_test.rb +++ b/plugins/breadcrumbs/test/functional/profile_design_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class ProfileDesignControllerTest < ActionController::TestCase diff --git a/plugins/breadcrumbs/test/test_helper.rb b/plugins/breadcrumbs/test/test_helper.rb index cca1fd3..1d8d247 100644 --- a/plugins/breadcrumbs/test/test_helper.rb +++ b/plugins/breadcrumbs/test/test_helper.rb @@ -1 +1 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' diff --git a/plugins/breadcrumbs/test/unit/breadcrumbs_plugin_test.rb b/plugins/breadcrumbs/test/unit/breadcrumbs_plugin_test.rb index 57dd8f6..6499438 100644 --- a/plugins/breadcrumbs/test/unit/breadcrumbs_plugin_test.rb +++ b/plugins/breadcrumbs/test/unit/breadcrumbs_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class BreadcrumbsPluginTest < ActiveSupport::TestCase diff --git a/plugins/breadcrumbs/test/unit/content_breadcrumbs_block_test.rb b/plugins/breadcrumbs/test/unit/content_breadcrumbs_block_test.rb index 5368ba1..af380e9 100644 --- a/plugins/breadcrumbs/test/unit/content_breadcrumbs_block_test.rb +++ b/plugins/breadcrumbs/test/unit/content_breadcrumbs_block_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class ContentBreadcrumbsBlockTest < ActiveSupport::TestCase diff --git a/plugins/bsc/test/functional/bsc_plugin_admin_controller_test.rb b/plugins/bsc/test/functional/bsc_plugin_admin_controller_test.rb index c133a5a..34a94c4 100644 --- a/plugins/bsc/test/functional/bsc_plugin_admin_controller_test.rb +++ b/plugins/bsc/test/functional/bsc_plugin_admin_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/bsc_plugin_admin_controller' +require 'test_helper' +require_relative '../../controllers/bsc_plugin_admin_controller' class BscPluginAdminControllerTest < ActionController::TestCase diff --git a/plugins/bsc/test/functional/bsc_plugin_myprofile_controller_test.rb b/plugins/bsc/test/functional/bsc_plugin_myprofile_controller_test.rb index 07b9c17..16897e5 100644 --- a/plugins/bsc/test/functional/bsc_plugin_myprofile_controller_test.rb +++ b/plugins/bsc/test/functional/bsc_plugin_myprofile_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/bsc_plugin_myprofile_controller' +require 'test_helper' +require_relative '../../controllers/bsc_plugin_myprofile_controller' class BscPluginMyprofileControllerTest < ActionController::TestCase diff --git a/plugins/bsc/test/unit/bsc_plugin/associate_enterprise_test.rb b/plugins/bsc/test/unit/bsc_plugin/associate_enterprise_test.rb index 2b4002f..c89ae88 100644 --- a/plugins/bsc/test/unit/bsc_plugin/associate_enterprise_test.rb +++ b/plugins/bsc/test/unit/bsc_plugin/associate_enterprise_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class BscPlugin::AssociateEnterpriseTest < ActiveSupport::TestCase VALID_CNPJ = '94.132.024/0001-48' diff --git a/plugins/bsc/test/unit/bsc_plugin/bsc_test.rb b/plugins/bsc/test/unit/bsc_plugin/bsc_test.rb index 5f0e1e3..9498d8b 100644 --- a/plugins/bsc/test/unit/bsc_plugin/bsc_test.rb +++ b/plugins/bsc/test/unit/bsc_plugin/bsc_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class BscPlugin::BscTest < ActiveSupport::TestCase VALID_CNPJ = '94.132.024/0001-48' diff --git a/plugins/bsc/test/unit/bsc_plugin/contract_test.rb b/plugins/bsc/test/unit/bsc_plugin/contract_test.rb index 29d9283..ab91968 100644 --- a/plugins/bsc/test/unit/bsc_plugin/contract_test.rb +++ b/plugins/bsc/test/unit/bsc_plugin/contract_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class BscPlugin::ContractTest < ActiveSupport::TestCase def setup diff --git a/plugins/bsc/test/unit/bsc_plugin/sale_test.rb b/plugins/bsc/test/unit/bsc_plugin/sale_test.rb index 2ae1b3a..8b3163f 100644 --- a/plugins/bsc/test/unit/bsc_plugin/sale_test.rb +++ b/plugins/bsc/test/unit/bsc_plugin/sale_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class BscPlugin::SaleTest < ActiveSupport::TestCase def setup diff --git a/plugins/bsc/test/unit/bsc_plugin_test.rb b/plugins/bsc/test/unit/bsc_plugin_test.rb index b8bc017..e65b594 100644 --- a/plugins/bsc/test/unit/bsc_plugin_test.rb +++ b/plugins/bsc/test/unit/bsc_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class BscPluginTest < ActiveSupport::TestCase diff --git a/plugins/bsc/test/unit/ext/enterprise_test.rb b/plugins/bsc/test/unit/ext/enterprise_test.rb index 183000d..de0e25d 100644 --- a/plugins/bsc/test/unit/ext/enterprise_test.rb +++ b/plugins/bsc/test/unit/ext/enterprise_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class EnterpriseTest < ActiveSupport::TestCase VALID_CNPJ = '94.132.024/0001-48' diff --git a/plugins/bsc/test/unit/ext/product_test.rb b/plugins/bsc/test/unit/ext/product_test.rb index 45fa033..7ac0bad 100644 --- a/plugins/bsc/test/unit/ext/product_test.rb +++ b/plugins/bsc/test/unit/ext/product_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class ProductTest < ActiveSupport::TestCase VALID_CNPJ = '94.132.024/0001-48' diff --git a/plugins/classify_members/test/functional/classify_members_plugin_test.rb b/plugins/classify_members/test/functional/classify_members_plugin_test.rb index 5de5efe..35446a2 100644 --- a/plugins/classify_members/test/functional/classify_members_plugin_test.rb +++ b/plugins/classify_members/test/functional/classify_members_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class ProfileControllerTest < ActionController::TestCase def setup diff --git a/plugins/classify_members/test/unit/classify_members_plugin_test.rb b/plugins/classify_members/test/unit/classify_members_plugin_test.rb index 26344bd..8fbbbf3 100644 --- a/plugins/classify_members/test/unit/classify_members_plugin_test.rb +++ b/plugins/classify_members/test/unit/classify_members_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class ClassifyMembersPluginTest < ActiveSupport::TestCase def setup diff --git a/plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb b/plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb index c52dacd..1f14315 100644 --- a/plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb +++ b/plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../test_helper' -require File.dirname(__FILE__) + '/../../controllers/profile/comment_group_plugin_profile_controller' +require_relative '../test_helper' +require_relative '../../controllers/profile/comment_group_plugin_profile_controller' class CommentGroupPluginProfileControllerTest < ActionController::TestCase diff --git a/plugins/comment_group/test/functional/comment_group_plugin_public_controller_test.rb b/plugins/comment_group/test/functional/comment_group_plugin_public_controller_test.rb index 323b475..96c2cd0 100644 --- a/plugins/comment_group/test/functional/comment_group_plugin_public_controller_test.rb +++ b/plugins/comment_group/test/functional/comment_group_plugin_public_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../test_helper' -require File.dirname(__FILE__) + '/../../controllers/public/comment_group_plugin_public_controller' +require_relative '../test_helper' +require_relative '../../controllers/public/comment_group_plugin_public_controller' class CommentGroupPluginPublicControllerTest < ActionController::TestCase diff --git a/plugins/comment_group/test/functional/content_viewer_controller_test.rb b/plugins/comment_group/test/functional/content_viewer_controller_test.rb index 0cf4523..0e04bc2 100644 --- a/plugins/comment_group/test/functional/content_viewer_controller_test.rb +++ b/plugins/comment_group/test/functional/content_viewer_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class ContentViewerControllerTest < ActionController::TestCase diff --git a/plugins/comment_group/test/test_helper.rb b/plugins/comment_group/test/test_helper.rb index cca1fd3..1d8d247 100644 --- a/plugins/comment_group/test/test_helper.rb +++ b/plugins/comment_group/test/test_helper.rb @@ -1 +1 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' diff --git a/plugins/comment_group/test/unit/allow_comment_test.rb b/plugins/comment_group/test/unit/allow_comment_test.rb index 4616f15..a520169 100644 --- a/plugins/comment_group/test/unit/allow_comment_test.rb +++ b/plugins/comment_group/test/unit/allow_comment_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class AllowCommentTest < ActiveSupport::TestCase diff --git a/plugins/comment_group/test/unit/article_test.rb b/plugins/comment_group/test/unit/article_test.rb index e9d5f04..77a397b 100644 --- a/plugins/comment_group/test/unit/article_test.rb +++ b/plugins/comment_group/test/unit/article_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' require 'benchmark' class ArticleTest < ActiveSupport::TestCase diff --git a/plugins/comment_group/test/unit/comment_group_plugin_test.rb b/plugins/comment_group/test/unit/comment_group_plugin_test.rb index 304922b..511111a 100644 --- a/plugins/comment_group/test/unit/comment_group_plugin_test.rb +++ b/plugins/comment_group/test/unit/comment_group_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class CommentGroupPluginTest < ActiveSupport::TestCase diff --git a/plugins/comment_group/test/unit/comment_test.rb b/plugins/comment_group/test/unit/comment_test.rb index 09c4bf4..3dd4965 100644 --- a/plugins/comment_group/test/unit/comment_test.rb +++ b/plugins/comment_group/test/unit/comment_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class CommentTest < ActiveSupport::TestCase diff --git a/plugins/community_block/test/functional/commmunity_block_plugin_profile_controller_test.rb b/plugins/community_block/test/functional/commmunity_block_plugin_profile_controller_test.rb index fcf914b..188e7ba 100644 --- a/plugins/community_block/test/functional/commmunity_block_plugin_profile_controller_test.rb +++ b/plugins/community_block/test/functional/commmunity_block_plugin_profile_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class ProfileControllerTest < ActionController::TestCase diff --git a/plugins/community_block/test/test_helper.rb b/plugins/community_block/test/test_helper.rb index cca1fd3..1d8d247 100644 --- a/plugins/community_block/test/test_helper.rb +++ b/plugins/community_block/test/test_helper.rb @@ -1 +1 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' diff --git a/plugins/community_block/test/unit/commmunity_block_plugin_test.rb b/plugins/community_block/test/unit/commmunity_block_plugin_test.rb index 2c51a5b..c66480f 100644 --- a/plugins/community_block/test/unit/commmunity_block_plugin_test.rb +++ b/plugins/community_block/test/unit/commmunity_block_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class CommunityBlockPluginTest < ActiveSupport::TestCase diff --git a/plugins/community_block/test/unit/commmunity_block_test.rb b/plugins/community_block/test/unit/commmunity_block_test.rb index 06187ae..3e87396 100644 --- a/plugins/community_block/test/unit/commmunity_block_test.rb +++ b/plugins/community_block/test/unit/commmunity_block_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class CommunityBlockTest < ActiveSupport::TestCase diff --git a/plugins/community_track/test/test_helper.rb b/plugins/community_track/test/test_helper.rb index 774ad8f..5017f61 100644 --- a/plugins/community_track/test/test_helper.rb +++ b/plugins/community_track/test/test_helper.rb @@ -1,4 +1,4 @@ -require_relative '../../../test/test_helper' +require 'test_helper' def create_track(name, profile) track = CommunityTrackPlugin::Track.new(:abstract => 'abstract', :body => 'body', :name => name, :profile => profile) diff --git a/plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb b/plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb index 71eb6c6..60706c4 100644 --- a/plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb +++ b/plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/custom_forms_plugin_myprofile_controller' +require 'test_helper' +require_relative '../../controllers/custom_forms_plugin_myprofile_controller' class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase def setup diff --git a/plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb b/plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb index 945585e..05b0153 100644 --- a/plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb +++ b/plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/custom_forms_plugin_profile_controller' +require 'test_helper' +require_relative '../../controllers/custom_forms_plugin_profile_controller' class CustomFormsPluginProfileControllerTest < ActionController::TestCase def setup diff --git a/plugins/custom_forms/test/unit/custom_forms_plugin/admission_survey_test.rb b/plugins/custom_forms/test/unit/custom_forms_plugin/admission_survey_test.rb index 4f4c201..e501eb1 100644 --- a/plugins/custom_forms/test/unit/custom_forms_plugin/admission_survey_test.rb +++ b/plugins/custom_forms/test/unit/custom_forms_plugin/admission_survey_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class CustomFormsPlugin::AdmissionSurveyTest < ActiveSupport::TestCase should 'add member to community on perform' do diff --git a/plugins/custom_forms/test/unit/custom_forms_plugin/answer_test.rb b/plugins/custom_forms/test/unit/custom_forms_plugin/answer_test.rb index 273f132..c19c88c 100644 --- a/plugins/custom_forms/test/unit/custom_forms_plugin/answer_test.rb +++ b/plugins/custom_forms/test/unit/custom_forms_plugin/answer_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class CustomFormsPlugin::AnswerTest < ActiveSupport::TestCase should 'validates presence of field' do diff --git a/plugins/custom_forms/test/unit/custom_forms_plugin/field_test.rb b/plugins/custom_forms/test/unit/custom_forms_plugin/field_test.rb index c1849f1..1ed8070 100644 --- a/plugins/custom_forms/test/unit/custom_forms_plugin/field_test.rb +++ b/plugins/custom_forms/test/unit/custom_forms_plugin/field_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class CustomFormsPlugin::FieldTest < ActiveSupport::TestCase should 'set slug before validation based on name' do diff --git a/plugins/custom_forms/test/unit/custom_forms_plugin/form_test.rb b/plugins/custom_forms/test/unit/custom_forms_plugin/form_test.rb index 132d323..84275c5 100644 --- a/plugins/custom_forms/test/unit/custom_forms_plugin/form_test.rb +++ b/plugins/custom_forms/test/unit/custom_forms_plugin/form_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class CustomFormsPlugin::FormTest < ActiveSupport::TestCase should 'validates presence of a profile and a name' do diff --git a/plugins/custom_forms/test/unit/custom_forms_plugin/membership_survey_test.rb b/plugins/custom_forms/test/unit/custom_forms_plugin/membership_survey_test.rb index 0862615..b2759a7 100644 --- a/plugins/custom_forms/test/unit/custom_forms_plugin/membership_survey_test.rb +++ b/plugins/custom_forms/test/unit/custom_forms_plugin/membership_survey_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class CustomFormsPlugin::MembershipSurveyTest < ActiveSupport::TestCase should 'validates presence of form_id' do diff --git a/plugins/custom_forms/test/unit/custom_forms_plugin/select_field_test.rb b/plugins/custom_forms/test/unit/custom_forms_plugin/select_field_test.rb index efd7b62..8ee923d 100644 --- a/plugins/custom_forms/test/unit/custom_forms_plugin/select_field_test.rb +++ b/plugins/custom_forms/test/unit/custom_forms_plugin/select_field_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class CustomFormsPlugin::SelectFieldTest < ActiveSupport::TestCase should 'have alternative' do diff --git a/plugins/custom_forms/test/unit/custom_forms_plugin/submission_test.rb b/plugins/custom_forms/test/unit/custom_forms_plugin/submission_test.rb index 3a9122d..1272887 100644 --- a/plugins/custom_forms/test/unit/custom_forms_plugin/submission_test.rb +++ b/plugins/custom_forms/test/unit/custom_forms_plugin/submission_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class CustomFormsPlugin::SubmissionTest < ActiveSupport::TestCase def setup diff --git a/plugins/custom_forms/test/unit/ext/role_assingment_test.rb b/plugins/custom_forms/test/unit/ext/role_assingment_test.rb index 5d2fbec..2e57924 100644 --- a/plugins/custom_forms/test/unit/ext/role_assingment_test.rb +++ b/plugins/custom_forms/test/unit/ext/role_assingment_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class RoleAssignmentsTest < ActiveSupport::TestCase should 'create membership_surveys on membership creation' do diff --git a/plugins/display_content/controllers/display_content_plugin_admin_controller.rb b/plugins/display_content/controllers/display_content_plugin_admin_controller.rb index c07c5fc..a9fa0d8 100644 --- a/plugins/display_content/controllers/display_content_plugin_admin_controller.rb +++ b/plugins/display_content/controllers/display_content_plugin_admin_controller.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/display_content_plugin_module' +require_relative 'display_content_plugin_module' class DisplayContentPluginAdminController < AdminController diff --git a/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb b/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb index 8dcd901..b8b3b0f 100644 --- a/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb +++ b/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/display_content_plugin_module' +require_relative 'display_content_plugin_module' class DisplayContentPluginMyprofileController < MyProfileController diff --git a/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb b/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb index f494731..fefd2d1 100644 --- a/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb +++ b/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../test_helper' -require File.dirname(__FILE__) + '/../../controllers/display_content_plugin_admin_controller' +require_relative '../test_helper' +require_relative '../../controllers/display_content_plugin_admin_controller' class DisplayContentPluginAdminControllerTest < ActionController::TestCase diff --git a/plugins/display_content/test/functional/display_content_plugin_myprofile_controller_test.rb b/plugins/display_content/test/functional/display_content_plugin_myprofile_controller_test.rb index 478bf63..d6a8510 100644 --- a/plugins/display_content/test/functional/display_content_plugin_myprofile_controller_test.rb +++ b/plugins/display_content/test/functional/display_content_plugin_myprofile_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../test_helper' -require File.dirname(__FILE__) + '/../../controllers/display_content_plugin_myprofile_controller' +require_relative '../test_helper' +require_relative '../../controllers/display_content_plugin_myprofile_controller' class DisplayContentPluginMyprofileControllerTest < ActionController::TestCase diff --git a/plugins/display_content/test/unit/display_content_block_test.rb b/plugins/display_content/test/unit/display_content_block_test.rb index 8d7557c..05f7f78 100644 --- a/plugins/display_content/test/unit/display_content_block_test.rb +++ b/plugins/display_content/test/unit/display_content_block_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class DisplayContentBlockTest < ActiveSupport::TestCase INVALID_KIND_OF_ARTICLE = [EnterpriseHomepage, Event, RssFeed, UploadedFile, Gallery] diff --git a/plugins/display_content/test/unit/display_content_plugin_test.rb b/plugins/display_content/test/unit/display_content_plugin_test.rb index c0a3e9f..f35d3b3 100644 --- a/plugins/display_content/test/unit/display_content_plugin_test.rb +++ b/plugins/display_content/test/unit/display_content_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class DisplayContentPluginTest < ActiveSupport::TestCase diff --git a/plugins/event/test/functional/event_block_test.rb b/plugins/event/test/functional/event_block_test.rb index 6a9fd3b..f5e5b70 100644 --- a/plugins/event/test/functional/event_block_test.rb +++ b/plugins/event/test/functional/event_block_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class HomeControllerTest < ActionController::TestCase diff --git a/plugins/foo/test/unit/foo_plugin_test.rb b/plugins/foo/test/unit/foo_plugin_test.rb index 191d390..65b25d4 100644 --- a/plugins/foo/test/unit/foo_plugin_test.rb +++ b/plugins/foo/test/unit/foo_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class FooPluginTest < ActiveSupport::TestCase def test_foo diff --git a/plugins/google_analytics/test/unit/google_analytics_plugin_test.rb b/plugins/google_analytics/test/unit/google_analytics_plugin_test.rb index a46a5e2..a64e41c 100644 --- a/plugins/google_analytics/test/unit/google_analytics_plugin_test.rb +++ b/plugins/google_analytics/test/unit/google_analytics_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class GoogleAnalyticsPluginTest < ActiveSupport::TestCase diff --git a/plugins/google_cse/test/functional/google_cse_plugin_controller_test.rb b/plugins/google_cse/test/functional/google_cse_plugin_controller_test.rb index 63a058b..3cd99fb 100644 --- a/plugins/google_cse/test/functional/google_cse_plugin_controller_test.rb +++ b/plugins/google_cse/test/functional/google_cse_plugin_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/google_cse_plugin_controller' +require 'test_helper' +require_relative '../../controllers/google_cse_plugin_controller' class GoogleCsePluginControllerTest < ActionController::TestCase diff --git a/plugins/google_cse/test/unit/google_cse_plugin_test.rb b/plugins/google_cse/test/unit/google_cse_plugin_test.rb index a048e60..0e3e669 100644 --- a/plugins/google_cse/test/unit/google_cse_plugin_test.rb +++ b/plugins/google_cse/test/unit/google_cse_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class GoogleCsePluginTest < ActiveSupport::TestCase diff --git a/plugins/html5_video/test/functional/content_viewer_controler_test.rb b/plugins/html5_video/test/functional/content_viewer_controler_test.rb index 5faeeb4..0564d04 100644 --- a/plugins/html5_video/test/functional/content_viewer_controler_test.rb +++ b/plugins/html5_video/test/functional/content_viewer_controler_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' require 'content_viewer_controller' class ContentViewerControllerTest < ActionController::TestCase diff --git a/plugins/ldap/lib/ldap_plugin.rb b/plugins/ldap/lib/ldap_plugin.rb index 9dade30..601c3b2 100644 --- a/plugins/ldap/lib/ldap_plugin.rb +++ b/plugins/ldap/lib/ldap_plugin.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/ldap_authentication.rb' +require_relative 'ldap_authentication.rb' class LdapPlugin < Noosfero::Plugin include Noosfero::Plugin::HotSpot diff --git a/plugins/ldap/test/functional/account_controller_plugin_test.rb b/plugins/ldap/test/functional/account_controller_plugin_test.rb index 10e59ac..7c103f3 100644 --- a/plugins/ldap/test/functional/account_controller_plugin_test.rb +++ b/plugins/ldap/test/functional/account_controller_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class AccountControllerPluginTest < ActionController::TestCase diff --git a/plugins/ldap/test/functional/ldap_plugin_admin_controller_test.rb b/plugins/ldap/test/functional/ldap_plugin_admin_controller_test.rb index 3e9d668..874354a 100644 --- a/plugins/ldap/test/functional/ldap_plugin_admin_controller_test.rb +++ b/plugins/ldap/test/functional/ldap_plugin_admin_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/ldap_plugin_admin_controller' +require 'test_helper' +require_relative '../../controllers/ldap_plugin_admin_controller' class LdapPluginAdminControllerTest < ActionController::TestCase diff --git a/plugins/ldap/test/test_helper.rb b/plugins/ldap/test/test_helper.rb index 4665e0b..405cb98 100644 --- a/plugins/ldap/test/test_helper.rb +++ b/plugins/ldap/test/test_helper.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' def load_ldap_config begin diff --git a/plugins/ldap/test/unit/ext/environment_test.rb b/plugins/ldap/test/unit/ext/environment_test.rb index 858b5f6..62c72b3 100644 --- a/plugins/ldap/test/unit/ext/environment_test.rb +++ b/plugins/ldap/test/unit/ext/environment_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class EnvironmentTest < ActiveSupport::TestCase diff --git a/plugins/ldap/test/unit/ldap_authentication_test.rb b/plugins/ldap/test/unit/ldap_authentication_test.rb index a94852b..2ddb8d3 100644 --- a/plugins/ldap/test/unit/ldap_authentication_test.rb +++ b/plugins/ldap/test/unit/ldap_authentication_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class LdapAuthenticationTest < ActiveSupport::TestCase diff --git a/plugins/ldap/test/unit/ldap_plugin_test.rb b/plugins/ldap/test/unit/ldap_plugin_test.rb index e4d0ff7..fcb0ef6 100644 --- a/plugins/ldap/test/unit/ldap_plugin_test.rb +++ b/plugins/ldap/test/unit/ldap_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class LdapPluginTest < ActiveSupport::TestCase diff --git a/plugins/mark_comment_as_read/test/functional/mark_comment_as_read_plugin_profile_controller_test.rb b/plugins/mark_comment_as_read/test/functional/mark_comment_as_read_plugin_profile_controller_test.rb index 8cfaf3b..715da97 100644 --- a/plugins/mark_comment_as_read/test/functional/mark_comment_as_read_plugin_profile_controller_test.rb +++ b/plugins/mark_comment_as_read/test/functional/mark_comment_as_read_plugin_profile_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/mark_comment_as_read_plugin_profile_controller' +require 'test_helper' +require_relative '../../controllers/mark_comment_as_read_plugin_profile_controller' class MarkCommentAsReadPluginProfileControllerTest < ActionController::TestCase def setup diff --git a/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_plugin/comment_test.rb b/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_plugin/comment_test.rb index a17902b..5b61536 100644 --- a/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_plugin/comment_test.rb +++ b/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_plugin/comment_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class MarkCommentAsReadPlugin::CommentTest < ActiveSupport::TestCase diff --git a/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_test.rb b/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_test.rb index 5a1c8fd..e47e342 100644 --- a/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_test.rb +++ b/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class MarkCommentAsReadPluginTest < ActiveSupport::TestCase diff --git a/plugins/oauth_client/test/functional/oauth_client_plugin_public_controller_test.rb b/plugins/oauth_client/test/functional/oauth_client_plugin_public_controller_test.rb index 3f81251..1694bdc 100644 --- a/plugins/oauth_client/test/functional/oauth_client_plugin_public_controller_test.rb +++ b/plugins/oauth_client/test/functional/oauth_client_plugin_public_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class OauthClientPluginPublicControllerTest < ActionController::TestCase diff --git a/plugins/oauth_client/test/test_helper.rb b/plugins/oauth_client/test/test_helper.rb index cca1fd3..1d8d247 100644 --- a/plugins/oauth_client/test/test_helper.rb +++ b/plugins/oauth_client/test/test_helper.rb @@ -1 +1 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' diff --git a/plugins/oauth_client/test/unit/environment_test.rb b/plugins/oauth_client/test/unit/environment_test.rb index f47f5e3..936f5f2 100644 --- a/plugins/oauth_client/test/unit/environment_test.rb +++ b/plugins/oauth_client/test/unit/environment_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class UserTest < ActiveSupport::TestCase diff --git a/plugins/oauth_client/test/unit/oauth_client_plugin_test.rb b/plugins/oauth_client/test/unit/oauth_client_plugin_test.rb index 58eaa55..0b83238 100644 --- a/plugins/oauth_client/test/unit/oauth_client_plugin_test.rb +++ b/plugins/oauth_client/test/unit/oauth_client_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class OauthClientPluginTest < ActiveSupport::TestCase diff --git a/plugins/oauth_client/test/unit/user_test.rb b/plugins/oauth_client/test/unit/user_test.rb index f4bda17..a530964 100644 --- a/plugins/oauth_client/test/unit/user_test.rb +++ b/plugins/oauth_client/test/unit/user_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class UserTest < ActiveSupport::TestCase diff --git a/plugins/people_block/test/functional/people_block_plugin_environment_design_controller_test.rb b/plugins/people_block/test/functional/people_block_plugin_environment_design_controller_test.rb index 921b668..f73214a 100644 --- a/plugins/people_block/test/functional/people_block_plugin_environment_design_controller_test.rb +++ b/plugins/people_block/test/functional/people_block_plugin_environment_design_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class EnvironmentDesignControllerTest < ActionController::TestCase diff --git a/plugins/people_block/test/functional/people_block_plugin_profile_design_controller_test.rb b/plugins/people_block/test/functional/people_block_plugin_profile_design_controller_test.rb index a60ba8c..d3ea2eb 100644 --- a/plugins/people_block/test/functional/people_block_plugin_profile_design_controller_test.rb +++ b/plugins/people_block/test/functional/people_block_plugin_profile_design_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class ProfileDesignControllerTest < ActionController::TestCase diff --git a/plugins/people_block/test/functional/profile_controller_test.rb b/plugins/people_block/test/functional/profile_controller_test.rb index 8919bdd..cb077c5 100644 --- a/plugins/people_block/test/functional/profile_controller_test.rb +++ b/plugins/people_block/test/functional/profile_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class ProfileControllerTest < ActionController::TestCase diff --git a/plugins/people_block/test/test_helper.rb b/plugins/people_block/test/test_helper.rb index cca1fd3..1d8d247 100644 --- a/plugins/people_block/test/test_helper.rb +++ b/plugins/people_block/test/test_helper.rb @@ -1 +1 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' diff --git a/plugins/people_block/test/unit/members_block_test.rb b/plugins/people_block/test/unit/members_block_test.rb index 5887de1..abd9fae 100644 --- a/plugins/people_block/test/unit/members_block_test.rb +++ b/plugins/people_block/test/unit/members_block_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class MembersBlockTest < ActionView::TestCase diff --git a/plugins/people_block/test/unit/people_block_plugin_test.rb b/plugins/people_block/test/unit/people_block_plugin_test.rb index 1c84109..c6338e5 100644 --- a/plugins/people_block/test/unit/people_block_plugin_test.rb +++ b/plugins/people_block/test/unit/people_block_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class PeopleBlockPluginTest < ActiveSupport::TestCase diff --git a/plugins/people_block/test/unit/people_block_test.rb b/plugins/people_block/test/unit/people_block_test.rb index 6482192..bf5e7ba 100644 --- a/plugins/people_block/test/unit/people_block_test.rb +++ b/plugins/people_block/test/unit/people_block_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class PeopleBlockTest < ActionView::TestCase diff --git a/plugins/piwik/test/functional/piwik_plugin_test.rb b/plugins/piwik/test/functional/piwik_plugin_test.rb index d4d87ce..31cb232 100644 --- a/plugins/piwik/test/functional/piwik_plugin_test.rb +++ b/plugins/piwik/test/functional/piwik_plugin_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/piwik_plugin_admin_controller' +require 'test_helper' +require_relative '../../controllers/piwik_plugin_admin_controller' class PiwikPluginAdminControllerTest < ActionController::TestCase diff --git a/plugins/piwik/test/unit/piwik_plugin_test.rb b/plugins/piwik/test/unit/piwik_plugin_test.rb index f3eca89..17f9450 100644 --- a/plugins/piwik/test/unit/piwik_plugin_test.rb +++ b/plugins/piwik/test/unit/piwik_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class PiwikPluginTest < ActiveSupport::TestCase diff --git a/plugins/profile_description_block/test/unit/profile_description_block_test.rb b/plugins/profile_description_block/test/unit/profile_description_block_test.rb index 435624c..c642a27 100644 --- a/plugins/profile_description_block/test/unit/profile_description_block_test.rb +++ b/plugins/profile_description_block/test/unit/profile_description_block_test.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper") +require 'test_helper' class ProfileDescriptionBlockTest < ActiveSupport::TestCase def setup diff --git a/plugins/profile_members_headlines/test/test_helper.rb b/plugins/profile_members_headlines/test/test_helper.rb index cca1fd3..1d8d247 100644 --- a/plugins/profile_members_headlines/test/test_helper.rb +++ b/plugins/profile_members_headlines/test/test_helper.rb @@ -1 +1 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' diff --git a/plugins/recent_content/test/test_helper.rb b/plugins/recent_content/test/test_helper.rb index cca1fd3..1d8d247 100644 --- a/plugins/recent_content/test/test_helper.rb +++ b/plugins/recent_content/test/test_helper.rb @@ -1 +1 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' diff --git a/plugins/recent_content/test/unit/recent_content_block_test.rb b/plugins/recent_content/test/unit/recent_content_block_test.rb index 3f5026f..9d72d15 100644 --- a/plugins/recent_content/test/unit/recent_content_block_test.rb +++ b/plugins/recent_content/test/unit/recent_content_block_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class RecentContentBlockTest < ActiveSupport::TestCase INVALID_KIND_OF_ARTICLE = [EnterpriseHomepage, RssFeed, UploadedFile, Gallery, Folder, Blog, Forum] diff --git a/plugins/relevant_content/test/test_helper.rb b/plugins/relevant_content/test/test_helper.rb index cca1fd3..1d8d247 100644 --- a/plugins/relevant_content/test/test_helper.rb +++ b/plugins/relevant_content/test/test_helper.rb @@ -1 +1 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' diff --git a/plugins/relevant_content/test/unit/article.rb b/plugins/relevant_content/test/unit/article.rb index c7cd3b9..4c70d88 100644 --- a/plugins/relevant_content/test/unit/article.rb +++ b/plugins/relevant_content/test/unit/article.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' require 'comment_controller' class RelevantContentBlockTest < ActiveSupport::TestCase diff --git a/plugins/relevant_content/test/unit/relevant_content_block_test.rb b/plugins/relevant_content/test/unit/relevant_content_block_test.rb index 92c9489..a3eb1cb 100644 --- a/plugins/relevant_content/test/unit/relevant_content_block_test.rb +++ b/plugins/relevant_content/test/unit/relevant_content_block_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' require 'comment_controller' diff --git a/plugins/relevant_content/test/unit/relevant_content_plugin_test.rb b/plugins/relevant_content/test/unit/relevant_content_plugin_test.rb index 434b948..dbd5542 100644 --- a/plugins/relevant_content/test/unit/relevant_content_plugin_test.rb +++ b/plugins/relevant_content/test/unit/relevant_content_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class RelevantContentPluginTest < ActiveSupport::TestCase diff --git a/plugins/remote_user/test/functional/remote_user_plugin_test.rb b/plugins/remote_user/test/functional/remote_user_plugin_test.rb index ff940b6..d544cc7 100644 --- a/plugins/remote_user/test/functional/remote_user_plugin_test.rb +++ b/plugins/remote_user/test/functional/remote_user_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class AccountControllerTest < ActionController::TestCase def setup diff --git a/plugins/require_auth_to_comment/test/unit/require_auth_to_comment_plugin_test.rb b/plugins/require_auth_to_comment/test/unit/require_auth_to_comment_plugin_test.rb index 7f5dcd7..5a05718 100644 --- a/plugins/require_auth_to_comment/test/unit/require_auth_to_comment_plugin_test.rb +++ b/plugins/require_auth_to_comment/test/unit/require_auth_to_comment_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class RequireAuthToCommentPluginTest < ActiveSupport::TestCase diff --git a/plugins/send_email/test/functional/send_email_plugin_admin_controller_test.rb b/plugins/send_email/test/functional/send_email_plugin_admin_controller_test.rb index 04e6a07..eb55bc7 100644 --- a/plugins/send_email/test/functional/send_email_plugin_admin_controller_test.rb +++ b/plugins/send_email/test/functional/send_email_plugin_admin_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class SendEmailPluginAdminControllerTest < ActionController::TestCase diff --git a/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb b/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb index 6b95ca5..a6e1277 100644 --- a/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb +++ b/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' def base_setup ActionMailer::Base.delivery_method = :test diff --git a/plugins/send_email/test/unit/send_email_plugin_mail_test.rb b/plugins/send_email/test/unit/send_email_plugin_mail_test.rb index ca54a31..91304d7 100644 --- a/plugins/send_email/test/unit/send_email_plugin_mail_test.rb +++ b/plugins/send_email/test/unit/send_email_plugin_mail_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class SendEmailPluginMailTest < ActiveSupport::TestCase diff --git a/plugins/send_email/test/unit/send_email_plugin_sender_test.rb b/plugins/send_email/test/unit/send_email_plugin_sender_test.rb index f4f6d24..dea4135 100644 --- a/plugins/send_email/test/unit/send_email_plugin_sender_test.rb +++ b/plugins/send_email/test/unit/send_email_plugin_sender_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class SendEmailPluginSenderTest < ActiveSupport::TestCase diff --git a/plugins/send_email/test/unit/send_email_plugin_test.rb b/plugins/send_email/test/unit/send_email_plugin_test.rb index 52fdd9a..72aa150 100644 --- a/plugins/send_email/test/unit/send_email_plugin_test.rb +++ b/plugins/send_email/test/unit/send_email_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class SendEmailPluginTest < ActiveSupport::TestCase diff --git a/plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb b/plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb index 8c1ee0f..aaf78c0 100644 --- a/plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb +++ b/plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/shopping_cart_plugin_controller' +require 'test_helper' +require_relative '../../controllers/shopping_cart_plugin_controller' class ShoppingCartPluginControllerTest < ActionController::TestCase diff --git a/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb b/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb index 27661d5..a889822 100644 --- a/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb +++ b/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class ShoppingCartPluginMyprofileControllerTest < ActionController::TestCase diff --git a/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb b/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb index c65a1e2..4be83b7 100644 --- a/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb +++ b/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class ShoppingCartPlugin::CartHelperTest < ActiveSupport::TestCase diff --git a/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb b/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb index a2d8312..d59deb9 100644 --- a/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb +++ b/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class ShoppingCartPluginTest < ActiveSupport::TestCase diff --git a/plugins/sniffer/test/integration/sniffer_map_test.rb b/plugins/sniffer/test/integration/sniffer_map_test.rb index 72dd1cf..ff6f24e 100644 --- a/plugins/sniffer/test/integration/sniffer_map_test.rb +++ b/plugins/sniffer/test/integration/sniffer_map_test.rb @@ -1,4 +1,4 @@ -require "#{File.dirname(__FILE__)}/../../../../test/test_helper" +require 'test_helper' class SnifferMapTest < ActionDispatch::IntegrationTest diff --git a/plugins/sniffer/test/unit/ext/product_category_test.rb b/plugins/sniffer/test/unit/ext/product_category_test.rb index 6660363..856251a 100644 --- a/plugins/sniffer/test/unit/ext/product_category_test.rb +++ b/plugins/sniffer/test/unit/ext/product_category_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class ProductCategoryTest < ActiveSupport::TestCase diff --git a/plugins/sniffer/test/unit/sniffer_plugin_profile_test.rb b/plugins/sniffer/test/unit/sniffer_plugin_profile_test.rb index 9a61a05..bb9711e 100644 --- a/plugins/sniffer/test/unit/sniffer_plugin_profile_test.rb +++ b/plugins/sniffer/test/unit/sniffer_plugin_profile_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class SnifferPluginProfileTest < ActiveSupport::TestCase diff --git a/plugins/social_share_privacy/test/functional/content_viewer_controller_test.rb b/plugins/social_share_privacy/test/functional/content_viewer_controller_test.rb index fad684e..1941a68 100644 --- a/plugins/social_share_privacy/test/functional/content_viewer_controller_test.rb +++ b/plugins/social_share_privacy/test/functional/content_viewer_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../../../app/controllers/public/invite_controller' +require 'test_helper' +require_relative '../../../../app/controllers/public/invite_controller' class ContentViewerControllerTest < ActionController::TestCase diff --git a/plugins/social_share_privacy/test/functional/social_share_privacy_plugin_admin_controller_test.rb b/plugins/social_share_privacy/test/functional/social_share_privacy_plugin_admin_controller_test.rb index 050af82..326a04a 100644 --- a/plugins/social_share_privacy/test/functional/social_share_privacy_plugin_admin_controller_test.rb +++ b/plugins/social_share_privacy/test/functional/social_share_privacy_plugin_admin_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/social_share_privacy_plugin_admin_controller' +require 'test_helper' +require_relative '../../controllers/social_share_privacy_plugin_admin_controller' class SocialSharePrivacyPluginAdminControllerTest < ActionController::TestCase diff --git a/plugins/social_share_privacy/test/unit/social_share_privacy_helper_test.rb b/plugins/social_share_privacy/test/unit/social_share_privacy_helper_test.rb index a98da8e..a5d13fb 100644 --- a/plugins/social_share_privacy/test/unit/social_share_privacy_helper_test.rb +++ b/plugins/social_share_privacy/test/unit/social_share_privacy_helper_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class SocialSharePrivacyPluginHelperTest < ActiveSupport::TestCase diff --git a/plugins/social_share_privacy/test/unit/social_share_privacy_test.rb b/plugins/social_share_privacy/test/unit/social_share_privacy_test.rb index 56817bc..55393b2 100644 --- a/plugins/social_share_privacy/test/unit/social_share_privacy_test.rb +++ b/plugins/social_share_privacy/test/unit/social_share_privacy_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class SocialSharePrivacyPluginTest < ActiveSupport::TestCase diff --git a/plugins/solr/test/functional/search_controller_test.rb b/plugins/solr/test/functional/search_controller_test.rb index c4f6230..c141b28 100644 --- a/plugins/solr/test/functional/search_controller_test.rb +++ b/plugins/solr/test/functional/search_controller_test.rb @@ -1,5 +1,5 @@ require "#{File.dirname(__FILE__)}/../test_helper" -require File.dirname(__FILE__) + '/../../lib/ext/facets_browse' +require_relative '../../lib/ext/facets_browse' class SearchControllerTest < ActionController::TestCase diff --git a/plugins/solr/test/unit/acts_as_faceted_test.rb b/plugins/solr/test/unit/acts_as_faceted_test.rb index 6d9cec4..896cb35 100644 --- a/plugins/solr/test/unit/acts_as_faceted_test.rb +++ b/plugins/solr/test/unit/acts_as_faceted_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' require "#{File.dirname(__FILE__)}/../../lib/acts_as_faceted" diff --git a/plugins/solr/test/unit/acts_as_searchable_test.rb b/plugins/solr/test/unit/acts_as_searchable_test.rb index c704cd9..045370e 100644 --- a/plugins/solr/test/unit/acts_as_searchable_test.rb +++ b/plugins/solr/test/unit/acts_as_searchable_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' require "#{File.dirname(__FILE__)}/../../lib/acts_as_searchable" class ActsAsSearchableTest < ActiveSupport::TestCase diff --git a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr.rb b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr.rb index d12a8c4..9ea7c5f 100644 --- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr.rb +++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr.rb @@ -6,21 +6,21 @@ require 'time' require 'erb' require 'rexml/xpath' -require File.dirname(__FILE__) + '/solr' -require File.dirname(__FILE__) + '/acts_as_solr/acts_methods' -require File.dirname(__FILE__) + '/acts_as_solr/common_methods' -require File.dirname(__FILE__) + '/acts_as_solr/parser_methods' -require File.dirname(__FILE__) + '/acts_as_solr/class_methods' -require File.dirname(__FILE__) + '/acts_as_solr/dynamic_attribute' -require File.dirname(__FILE__) + '/acts_as_solr/local' -require File.dirname(__FILE__) + '/acts_as_solr/instance_methods' -require File.dirname(__FILE__) + '/acts_as_solr/common_methods' -require File.dirname(__FILE__) + '/acts_as_solr/deprecation' -require File.dirname(__FILE__) + '/acts_as_solr/search_results' -require File.dirname(__FILE__) + '/acts_as_solr/lazy_document' -require File.dirname(__FILE__) + '/acts_as_solr/mongo_mapper' -require File.dirname(__FILE__) + '/acts_as_solr/post' -require File.dirname(__FILE__) + '/acts_as_solr/scope_with_applied_names' +require_relative 'solr' +require_relative 'acts_as_solr/acts_methods' +require_relative 'acts_as_solr/common_methods' +require_relative 'acts_as_solr/parser_methods' +require_relative 'acts_as_solr/class_methods' +require_relative 'acts_as_solr/dynamic_attribute' +require_relative 'acts_as_solr/local' +require_relative 'acts_as_solr/instance_methods' +require_relative 'acts_as_solr/common_methods' +require_relative 'acts_as_solr/deprecation' +require_relative 'acts_as_solr/search_results' +require_relative 'acts_as_solr/lazy_document' +require_relative 'acts_as_solr/mongo_mapper' +require_relative 'acts_as_solr/post' +require_relative 'acts_as_solr/scope_with_applied_names' # reopen ActiveRecord and include the acts_as_solr method ActiveRecord::Base.extend ActsAsSolr::ActsMethods diff --git a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/add_document.rb b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/add_document.rb index b5a4d1f..acebf72 100644 --- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/add_document.rb +++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/add_document.rb @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require File.expand_path(File.dirname(__FILE__) + '/json_update') +require_relative 'json_update') class Solr::Request::AddDocument < Solr::Request::JsonUpdate diff --git a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake index 6a6e120..5285ad8 100644 --- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake +++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake @@ -62,7 +62,7 @@ namespace :solr do return end - require File.expand_path(File.dirname(__FILE__) + '/../../config/solr_environment') + require_relative '../../config/solr_environment') FileUtils.mkdir_p(SOLR_LOGS_PATH) FileUtils.mkdir_p(SOLR_DATA_PATH) diff --git a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb index 3199fbf..5a13b66 100644 --- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb +++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb @@ -29,8 +29,8 @@ MongoMapper.database = "acts_as_solr_reloaded-test" RAILS_ENV = 'test' unless defined? RAILS_ENV ENV["RAILS_ENV"] = "test" -require File.expand_path(File.dirname(__FILE__) + '/../config/solr_environment') -require File.expand_path(File.dirname(__FILE__) + '/../lib/acts_as_solr') +require_relative '../config/solr_environment') +require_relative '../lib/acts_as_solr') ActiveRecord::Base.logger = Logger.new('/dev/null') diff --git a/plugins/spaminator/script/scan b/plugins/spaminator/script/scan index dbe68d1..d9bf3a4 100755 --- a/plugins/spaminator/script/scan +++ b/plugins/spaminator/script/scan @@ -1,4 +1,4 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../../config/environment' +require_relative '../../../config/environment' SpaminatorPlugin::Scan.run(ARGV[0]) diff --git a/plugins/spaminator/test/functional/spaminator_plugin_admin_controller_test.rb b/plugins/spaminator/test/functional/spaminator_plugin_admin_controller_test.rb index b3dffca..bb1a879 100644 --- a/plugins/spaminator/test/functional/spaminator_plugin_admin_controller_test.rb +++ b/plugins/spaminator/test/functional/spaminator_plugin_admin_controller_test.rb @@ -1,5 +1,5 @@ require 'test_helper' -require File.dirname(__FILE__) + '/../../controllers/spaminator_plugin_admin_controller' +require_relative '../../controllers/spaminator_plugin_admin_controller' class SpaminatorPluginAdminControllerTest < ActionController::TestCase def setup diff --git a/plugins/statistics/test/functional/statistics_plugin_environment_design_controller_test.rb b/plugins/statistics/test/functional/statistics_plugin_environment_design_controller_test.rb index 5c266fb..5b28509 100644 --- a/plugins/statistics/test/functional/statistics_plugin_environment_design_controller_test.rb +++ b/plugins/statistics/test/functional/statistics_plugin_environment_design_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class EnvironmentDesignControllerTest < ActionController::TestCase diff --git a/plugins/statistics/test/functional/statistics_plugin_home_controller_test.rb b/plugins/statistics/test/functional/statistics_plugin_home_controller_test.rb index 2ca5ca8..ae41713 100755 --- a/plugins/statistics/test/functional/statistics_plugin_home_controller_test.rb +++ b/plugins/statistics/test/functional/statistics_plugin_home_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class HomeControllerTest < ActionController::TestCase diff --git a/plugins/statistics/test/functional/statistics_plugin_profile_design_controller_test.rb b/plugins/statistics/test/functional/statistics_plugin_profile_design_controller_test.rb index db90050..5995e40 100644 --- a/plugins/statistics/test/functional/statistics_plugin_profile_design_controller_test.rb +++ b/plugins/statistics/test/functional/statistics_plugin_profile_design_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class ProfileDesignControllerTest < ActionController::TestCase diff --git a/plugins/statistics/test/test_helper.rb b/plugins/statistics/test/test_helper.rb index cca1fd3..1d8d247 100644 --- a/plugins/statistics/test/test_helper.rb +++ b/plugins/statistics/test/test_helper.rb @@ -1 +1 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' diff --git a/plugins/statistics/test/unit/statistics_block_test.rb b/plugins/statistics/test/unit/statistics_block_test.rb index 96f34d9..6886bf0 100644 --- a/plugins/statistics/test/unit/statistics_block_test.rb +++ b/plugins/statistics/test/unit/statistics_block_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class StatisticsBlockTest < ActiveSupport::TestCase ['user_counter', 'tag_counter', 'comment_counter'].map do |counter| diff --git a/plugins/statistics/test/unit/statistics_plugin_test.rb b/plugins/statistics/test/unit/statistics_plugin_test.rb index da9c0e2..fc2a00c 100644 --- a/plugins/statistics/test/unit/statistics_plugin_test.rb +++ b/plugins/statistics/test/unit/statistics_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class StatisticsPluginTest < ActiveSupport::TestCase diff --git a/plugins/stoa/test/functional/account_controller_test.rb b/plugins/stoa/test/functional/account_controller_test.rb index ee2ed17..835b67d 100644 --- a/plugins/stoa/test/functional/account_controller_test.rb +++ b/plugins/stoa/test/functional/account_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../../../app/controllers/public/account_controller' +require 'test_helper' +require_relative '../../../../app/controllers/public/account_controller' class AccountControllerTest < ActionController::TestCase diff --git a/plugins/stoa/test/functional/invite_controller_test.rb b/plugins/stoa/test/functional/invite_controller_test.rb index 559b1c7..4ef83a6 100644 --- a/plugins/stoa/test/functional/invite_controller_test.rb +++ b/plugins/stoa/test/functional/invite_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../../../app/controllers/public/invite_controller' +require 'test_helper' +require_relative '../../../../app/controllers/public/invite_controller' class InviteControllerTest < ActionController::TestCase diff --git a/plugins/stoa/test/functional/profile_editor_controller_test.rb b/plugins/stoa/test/functional/profile_editor_controller_test.rb index 0eecae8..9ad9ba7 100644 --- a/plugins/stoa/test/functional/profile_editor_controller_test.rb +++ b/plugins/stoa/test/functional/profile_editor_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../../../app/controllers/my_profile/profile_editor_controller' +require 'test_helper' +require_relative '../../../../app/controllers/my_profile/profile_editor_controller' class StoaPluginProfileEditorControllerTest < ActionController::TestCase diff --git a/plugins/stoa/test/functional/stoa_plugin_controller_test.rb b/plugins/stoa/test/functional/stoa_plugin_controller_test.rb index ea3bd49..4080084 100644 --- a/plugins/stoa/test/functional/stoa_plugin_controller_test.rb +++ b/plugins/stoa/test/functional/stoa_plugin_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/stoa_plugin_controller' +require 'test_helper' +require_relative '../../controllers/stoa_plugin_controller' class StoaPluginControllerTest < ActionController::TestCase diff --git a/plugins/stoa/test/unit/person_api_test.rb b/plugins/stoa/test/unit/person_api_test.rb index 76d14ef..4e99c91 100644 --- a/plugins/stoa/test/unit/person_api_test.rb +++ b/plugins/stoa/test/unit/person_api_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class StoaPlugin::PersonApiTest < ActiveSupport::TestCase diff --git a/plugins/stoa/test/unit/person_test.rb b/plugins/stoa/test/unit/person_test.rb index 348d5d2..c067327 100644 --- a/plugins/stoa/test/unit/person_test.rb +++ b/plugins/stoa/test/unit/person_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class StoaPlugin::Person < ActiveSupport::TestCase diff --git a/plugins/stoa/test/unit/stoa_plugin_test.rb b/plugins/stoa/test/unit/stoa_plugin_test.rb index e6aba00..375cc5d 100644 --- a/plugins/stoa/test/unit/stoa_plugin_test.rb +++ b/plugins/stoa/test/unit/stoa_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class StoaPluginTest < ActiveSupport::TestCase diff --git a/plugins/stoa/test/unit/usp_user_test.rb b/plugins/stoa/test/unit/usp_user_test.rb index 59626bc..e1cb09b 100644 --- a/plugins/stoa/test/unit/usp_user_test.rb +++ b/plugins/stoa/test/unit/usp_user_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class StoaPlugin::UspUserTest < ActiveSupport::TestCase diff --git a/plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb b/plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb index 5d3c7cf..93f535e 100644 --- a/plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb +++ b/plugins/sub_organizations/test/functional/sub_organizations_plugin_myprofile_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/sub_organizations_plugin_myprofile_controller' +require 'test_helper' +require_relative '../../controllers/sub_organizations_plugin_myprofile_controller' class SubOrganizationsPluginMyprofileControllerTest < ActionController::TestCase def setup diff --git a/plugins/sub_organizations/test/functional/sub_organizations_plugin_profile_controller_test.rb b/plugins/sub_organizations/test/functional/sub_organizations_plugin_profile_controller_test.rb index 21707c9..1ce9ab2 100644 --- a/plugins/sub_organizations/test/functional/sub_organizations_plugin_profile_controller_test.rb +++ b/plugins/sub_organizations/test/functional/sub_organizations_plugin_profile_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/sub_organizations_plugin_profile_controller' +require 'test_helper' +require_relative '../../controllers/sub_organizations_plugin_profile_controller' class SubOrganizationsPluginProfileControllerTest < ActionController::TestCase diff --git a/plugins/sub_organizations/test/unit/related_organizations_block_test.rb b/plugins/sub_organizations/test/unit/related_organizations_block_test.rb index b333a72..67e4aa9 100644 --- a/plugins/sub_organizations/test/unit/related_organizations_block_test.rb +++ b/plugins/sub_organizations/test/unit/related_organizations_block_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../lib/related_organizations_block' +require 'test_helper' +require_relative '../../lib/related_organizations_block' class RelatedOrganizationsBlockTest < ActiveSupport::TestCase diff --git a/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_relation_test.rb b/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_relation_test.rb index 2141887..f3f07c4 100644 --- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_relation_test.rb +++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_relation_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class SubOrganizationsPlugin::ApprovePaternityRelationTest < ActiveSupport::TestCase diff --git a/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_test.rb b/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_test.rb index aa27067..a4d63ee 100644 --- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_test.rb +++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin/approve_paternity_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class SubOrganizationsPlugin::ApprovePaternityTest < ActiveSupport::TestCase diff --git a/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/create_enterprise_test.rb b/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/create_enterprise_test.rb index 692b174..905ff48 100644 --- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/create_enterprise_test.rb +++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/create_enterprise_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../../test/test_helper' +require 'test_helper' class CreateEnterpriseTest < ActiveSupport::TestCase diff --git a/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/organization.rb b/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/organization.rb index 78458e9..62a0e2e 100644 --- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/organization.rb +++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin/ext/organization.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../../test/test_helper' +require 'test_helper' class OrganizationTest < ActiveSupport::TestCase diff --git a/plugins/sub_organizations/test/unit/sub_organizations_plugin/relation_test.rb b/plugins/sub_organizations/test/unit/sub_organizations_plugin/relation_test.rb index bff92fa..223cb72 100644 --- a/plugins/sub_organizations/test/unit/sub_organizations_plugin/relation_test.rb +++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin/relation_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class SubOrganizationsPlugin::RelationTest < ActiveSupport::TestCase diff --git a/plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb b/plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb index 142867a..f6be796 100644 --- a/plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb +++ b/plugins/sub_organizations/test/unit/sub_organizations_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class SubOrganizationsTest < ActiveSupport::TestCase diff --git a/plugins/tolerance_time/test/unit/article_test.rb b/plugins/tolerance_time/test/unit/article_test.rb index 781dbe6..f22ac5b 100644 --- a/plugins/tolerance_time/test/unit/article_test.rb +++ b/plugins/tolerance_time/test/unit/article_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class ArticleTest < ActiveSupport::TestCase should 'create a publication after publishing the article' do diff --git a/plugins/tolerance_time/test/unit/comment_test.rb b/plugins/tolerance_time/test/unit/comment_test.rb index 959522e..312af21 100644 --- a/plugins/tolerance_time/test/unit/comment_test.rb +++ b/plugins/tolerance_time/test/unit/comment_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class CommentTest < ActiveSupport::TestCase should 'create a publication after posting a comment' do diff --git a/plugins/tolerance_time/test/unit/tolerance_time_plugin/publication_test.rb b/plugins/tolerance_time/test/unit/tolerance_time_plugin/publication_test.rb index 648dd3e..1ace976 100644 --- a/plugins/tolerance_time/test/unit/tolerance_time_plugin/publication_test.rb +++ b/plugins/tolerance_time/test/unit/tolerance_time_plugin/publication_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class ToleranceTimePlugin::PublicationTest < ActiveSupport::TestCase should 'validate presence of target' do diff --git a/plugins/tolerance_time/test/unit/tolerance_time_plugin/tolerance_test.rb b/plugins/tolerance_time/test/unit/tolerance_time_plugin/tolerance_test.rb index f2ffad6..f1ae5cc 100644 --- a/plugins/tolerance_time/test/unit/tolerance_time_plugin/tolerance_test.rb +++ b/plugins/tolerance_time/test/unit/tolerance_time_plugin/tolerance_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../../test/test_helper' +require 'test_helper' class ToleranceTimePlugin::ToleranceTest < ActiveSupport::TestCase should 'validate presence of profile' do diff --git a/plugins/video/test/functional/video_plugin_environment_design_controller_test.rb b/plugins/video/test/functional/video_plugin_environment_design_controller_test.rb index fc126e2..cfd42dc 100644 --- a/plugins/video/test/functional/video_plugin_environment_design_controller_test.rb +++ b/plugins/video/test/functional/video_plugin_environment_design_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class EnvironmentDesignControllerTest < ActionController::TestCase diff --git a/plugins/video/test/functional/video_plugin_profile_design_controller_test.rb b/plugins/video/test/functional/video_plugin_profile_design_controller_test.rb index f0ec598..b335c61 100644 --- a/plugins/video/test/functional/video_plugin_profile_design_controller_test.rb +++ b/plugins/video/test/functional/video_plugin_profile_design_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class ProfileDesignControllerTest < ActionController::TestCase diff --git a/plugins/video/test/test_helper.rb b/plugins/video/test/test_helper.rb index cca1fd3..1d8d247 100644 --- a/plugins/video/test/test_helper.rb +++ b/plugins/video/test/test_helper.rb @@ -1 +1 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' diff --git a/plugins/video/test/unit/video_block_test.rb b/plugins/video/test/unit/video_block_test.rb index 0ebdae4..0247e62 100644 --- a/plugins/video/test/unit/video_block_test.rb +++ b/plugins/video/test/unit/video_block_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class VideoBlockTest < ActiveSupport::TestCase ### Tests for YouTube diff --git a/plugins/video/test/unit/video_plugin_test.rb b/plugins/video/test/unit/video_plugin_test.rb index 36afe76..b4fa8c9 100644 --- a/plugins/video/test/unit/video_plugin_test.rb +++ b/plugins/video/test/unit/video_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper' class VideoPluginTest < ActiveSupport::TestCase should "return VideoBlock in extra_blocks class method" do diff --git a/plugins/vote/test/functional/vote_plugin_admin_controller_test.rb b/plugins/vote/test/functional/vote_plugin_admin_controller_test.rb index 3e9f3f2..e28d5df 100644 --- a/plugins/vote/test/functional/vote_plugin_admin_controller_test.rb +++ b/plugins/vote/test/functional/vote_plugin_admin_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/vote_plugin_admin_controller' +require 'test_helper' +require_relative '../../controllers/vote_plugin_admin_controller' class VotePluginAdminControllerTest < ActionController::TestCase diff --git a/plugins/vote/test/functional/vote_plugin_profile_controller_test.rb b/plugins/vote/test/functional/vote_plugin_profile_controller_test.rb index 68ed7bf..5bc850e 100644 --- a/plugins/vote/test/functional/vote_plugin_profile_controller_test.rb +++ b/plugins/vote/test/functional/vote_plugin_profile_controller_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' -require File.dirname(__FILE__) + '/../../controllers/vote_plugin_profile_controller' +require 'test_helper' +require_relative '../../controllers/vote_plugin_profile_controller' class VotePluginProfileControllerTest < ActionController::TestCase diff --git a/plugins/vote/test/test_helper.rb b/plugins/vote/test/test_helper.rb index cca1fd3..1d8d247 100644 --- a/plugins/vote/test/test_helper.rb +++ b/plugins/vote/test/test_helper.rb @@ -1 +1 @@ -require File.dirname(__FILE__) + '/../../../test/test_helper' +require 'test_helper' diff --git a/plugins/vote/test/unit/vote_plugin_test.rb b/plugins/vote/test/unit/vote_plugin_test.rb index 951f87a..c020fe3 100644 --- a/plugins/vote/test/unit/vote_plugin_test.rb +++ b/plugins/vote/test/unit/vote_plugin_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../../../test/test_helper' +require 'test_helper' class VotePluginTest < ActiveSupport::TestCase diff --git a/plugins/work_assignment/test/functional/cms_controller_test.rb b/plugins/work_assignment/test/functional/cms_controller_test.rb index d7ab749..2f9a61d 100644 --- a/plugins/work_assignment/test/functional/cms_controller_test.rb +++ b/plugins/work_assignment/test/functional/cms_controller_test.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper") +require 'test_helper' require 'cms_controller' class CmsControllerTest < ActionController::TestCase diff --git a/plugins/work_assignment/test/functional/content_viewer_controller_test.rb b/plugins/work_assignment/test/functional/content_viewer_controller_test.rb index bcf2167..e249497 100644 --- a/plugins/work_assignment/test/functional/content_viewer_controller_test.rb +++ b/plugins/work_assignment/test/functional/content_viewer_controller_test.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper") +require 'test_helper' require 'content_viewer_controller' class ContentViewerControllerTest < ActionController::TestCase diff --git a/plugins/work_assignment/test/functional/work_assignment_plugin_myprofile_controller_test.rb b/plugins/work_assignment/test/functional/work_assignment_plugin_myprofile_controller_test.rb index 0335aad..efce240 100644 --- a/plugins/work_assignment/test/functional/work_assignment_plugin_myprofile_controller_test.rb +++ b/plugins/work_assignment/test/functional/work_assignment_plugin_myprofile_controller_test.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper") +require 'test_helper' require 'work_assignment_plugin_myprofile_controller' class WorkAssignmentPluginMyprofileControllerTest < ActionController::TestCase diff --git a/plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb b/plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb index f37840b..b2bc27d 100644 --- a/plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb +++ b/plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../../../../test/test_helper") +require 'test_helper' class WorkAssignmentTest < ActiveSupport::TestCase should 'find or create sub-folder based on author identifier' do diff --git a/plugins/work_assignment/test/unit/work_assingment_plugin_test.rb b/plugins/work_assignment/test/unit/work_assingment_plugin_test.rb index 85094de..c02cf18 100644 --- a/plugins/work_assignment/test/unit/work_assingment_plugin_test.rb +++ b/plugins/work_assignment/test/unit/work_assingment_plugin_test.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../../../test/test_helper") +require 'test_helper' class WorkAssignmentPluginTest < ActiveSupport::TestCase should 'verify if a content is a work_assignment submission' do -- libgit2 0.21.2