Fix rubocop 0.53 warnings

lib/additionals/helpers.rb

@@ -143,8 +143,8 @@ module Additionals
       view_roles
     end
 
-    def additionals_custom_top_menu_item(i, user_roles)
-      menu_name = 'custom_menu' + i.to_s
+    def additionals_custom_top_menu_item(num, user_roles)
+      menu_name = 'custom_menu' + num.to_s
       item = {
         url: Additionals.settings[menu_name + '_url'],
         name: Additionals.settings[menu_name + '_name'],
@@ -239,19 +239,19 @@ module Additionals
 
     private
 
-    def additionals_already_loaded(scope, js)
-      locked = "#{js}.#{scope}"
+    def additionals_already_loaded(scope, js_name)
+      locked = "#{js_name}.#{scope}"
       @alreaded_loaded = [] if @alreaded_loaded.nil?
       return true if @alreaded_loaded.include?(locked)
       @alreaded_loaded << locked
       false
     end
 
-    def additionals_include_js(js)
-      if additionals_already_loaded('js', js)
+    def additionals_include_js(js_name)
+      if additionals_already_loaded('js', js_name)
         ''
       else
-        javascript_include_tag(js, plugin: 'additionals') + "\n"
+        javascript_include_tag(js_name, plugin: 'additionals') + "\n"
       end
     end
 

test/functional/account_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class AccountControllerTest < Redmine::ControllerTest
   fixtures :users, :email_addresses, :roles

test/functional/additionals_assign_to_me_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class AdditionalsAssignToMeControllerTest < Redmine::ControllerTest
   fixtures :projects,

test/functional/additionals_change_status_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class AdditionalsChangeStatusControllerTest < Redmine::ControllerTest
   fixtures :projects,

test/functional/issues_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class IssuesControllerTest < Redmine::ControllerTest
   fixtures :projects,

test/functional/projects_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class ProjectsControllerTest < Redmine::ControllerTest
   fixtures :projects,

test/functional/users_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class UsersControllerTest < Redmine::ControllerTest
   fixtures :projects,

test/functional/welcome_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class WelcomeControllerTest < Redmine::ControllerTest
   fixtures :projects, :news, :users, :members

test/functional/wiki_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class WikiControllerTest < Redmine::ControllerTest
   fixtures :projects,

test/integration/api_test/issues_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __dir__)
 
 class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
   fixtures :projects,

test/integration/common_views_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 # Additionals integration tests
 class CommonViewsTest < Redmine::IntegrationTest

test/integration/routing_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class RoutingTest < Redmine::RoutingTest
   def test_issue_assign_to_me

test/test_helper.rb

@@ -33,8 +33,8 @@ module Additionals
       ActionController::TestUploadedFile.new(ActiveSupport::TestCase.fixture_path + "/files/#{name}", mime, true)
     end
 
-    def self.arrays_equal?(a1, a2)
-      (a1 - a2) - (a2 - a1) == []
+    def self.arrays_equal?(value1, value2)
+      (value1 - value2) - (value2 - value1) == []
     end
 
     def self.create_fixtures(fixtures_directory, table_names, _class_names = {})

test/unit/additionals_fontawesome_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class AdditionalsFontAwesomeTest < Redmine::HelperTest
   fixtures :projects, :users, :members, :member_roles, :roles,

test/unit/helpers/global_helper_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __dir__)
 
 class GlobalHelperTest < Redmine::HelperTest
   include ApplicationHelper

test/unit/i18n_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 module Redmine
   class I18nTest < Redmine::HelperTest

test/unit/issue_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class IssueTest < Redmine::HelperTest
   fixtures :projects, :users, :members, :member_roles, :roles,

test/unit/time_entry_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class TimeEntryTest < Redmine::HelperTest
   fixtures :issues, :projects, :users, :time_entries,

test/unit/watcher_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __dir__)
 
 class WatcherTest < Redmine::HelperTest
   fixtures :projects, :users, :email_addresses, :members, :member_roles, :roles, :enabled_modules,