more test work

test/functional/users_controller_test.rb

@@ -17,7 +17,7 @@ class UsersControllerTest < Additionals::ControllerTest
   include Redmine::I18n
 
   def setup
-    Additionals::TestCase.prepare
+    prepare_tests
     @controller = UsersController.new
     User.current = nil
   end

test/functional/wiki_controller_test.rb

@@ -23,7 +23,7 @@ class WikiControllerTest < Additionals::ControllerTest
   WIKI_MACRO_USER_ID = 2
 
   def setup
-    Additionals::TestCase.prepare
+    prepare_tests
     EnabledModule.create(project_id: 1, name: 'wiki')
     @project = Project.find(1)
     @wiki = @project.wiki

test/integration/api_test/issues_test.rb

@@ -23,6 +23,8 @@ module ApiTest
              :journal_details,
              :queries
 
+    include Additionals::TestHelper
+
     test 'GET /issues.xml should contain metadata' do
       get '/issues.xml'
       assert_select 'issues[type=array][total_count][limit="25"][offset="0"]'

test/integration/common_views_test.rb

@@ -16,8 +16,10 @@ class CommonViewsTest < Redmine::IntegrationTest
            :custom_values,
            :custom_fields_trackers
 
+  include Additionals::TestHelper
+
   def setup
-    Additionals::TestCase.prepare
+    prepare_tests
   end
 
   test 'View user' do

test/test_helper.rb

@@ -30,38 +30,8 @@ module Additionals
     ensure
       Setting.plugin_additionals = Setting.plugin_additionals
     end
-  end
 
-  class ControllerTest < Redmine::ControllerTest
-  end
-
-  class TestCase
-    include ActionDispatch::TestProcess
-    def self.plugin_fixtures(plugin, *fixture_names)
-      plugin_fixture_path = "#{Redmine::Plugin.find(plugin).directory}/test/fixtures"
-      if fixture_names.first == :all
-        fixture_names = Dir["#{plugin_fixture_path}/**/*.{yml}"]
-        fixture_names.map! { |f| f[(plugin_fixture_path.size + 1)..-5] }
-      else
-        fixture_names = fixture_names.flatten.map(&:to_s)
-      end
-
-      ActiveRecord::Fixtures.create_fixtures(plugin_fixture_path, fixture_names)
-    end
-
-    def uploaded_test_file(name, mime)
-      ActionController::TestUploadedFile.new(ActiveSupport::TestCase.fixture_path + "/files/#{name}", mime, true)
-    end
-
-    def self.arrays_equal?(value1, value2)
-      (value1 - value2) - (value2 - value1) == []
-    end
-
-    def self.create_fixtures(fixtures_directory, table_names, _class_names = {})
-      ActiveRecord::FixtureSet.create_fixtures(fixtures_directory, table_names, _class_names = {})
-    end
-
-    def self.prepare
+    def prepare_tests
       Role.where(id: [1, 2]).each do |r|
         r.permissions << :view_issues
         r.save
@@ -72,6 +42,12 @@ module Additionals
       end
     end
   end
-end
 
-include Additionals::TestHelper
+  class ControllerTest < Redmine::ControllerTest
+    include Additionals::TestHelper
+  end
+
+  class TestCase < ActiveSupport::TestCase
+    include Additionals::TestHelper
+  end
+end

test/unit/additionals_fontawesome_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-class AdditionalsFontAwesomeTest < ActiveSupport::TestCase
+class AdditionalsFontAwesomeTest < Additionals::TestCase
   fixtures :projects, :users, :members, :member_roles, :roles,
            :trackers, :projects_trackers,
            :enabled_modules,

test/unit/i18n_test.rb

@@ -1,9 +1,10 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-class I18nTest < ActiveSupport::TestCase
+class I18nTest < Additionals::TestCase
   include Redmine::I18n
 
   def setup
+    prepare_tests
     User.current = nil
   end
 

test/unit/issue_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-class IssueTest < ActiveSupport::TestCase
+class IssueTest < Additionals::TestCase
   fixtures :projects, :users, :members, :member_roles, :roles,
            :trackers, :projects_trackers,
            :enabled_modules,
@@ -13,6 +13,7 @@ class IssueTest < ActiveSupport::TestCase
   include Redmine::I18n
 
   def setup
+    prepare_tests
     set_language_if_valid 'en'
   end
 

test/unit/time_entry_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-class TimeEntryTest < ActiveSupport::TestCase
+class TimeEntryTest < Additionals::TestCase
   fixtures :issues, :projects, :users, :time_entries,
            :members, :roles, :member_roles,
            :trackers, :issue_statuses,
@@ -10,6 +10,10 @@ class TimeEntryTest < ActiveSupport::TestCase
            :groups_users,
            :enabled_modules
 
+  def setup
+    prepare_tests
+  end
+
   def teardown
     User.current = nil
   end

test/unit/watcher_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-class WatcherTest < ActiveSupport::TestCase
+class WatcherTest < Additionals::TestCase
   fixtures :projects, :users, :email_addresses, :members, :member_roles, :roles, :enabled_modules,
            :issues, :issue_statuses, :enumerations, :trackers, :projects_trackers,
            :boards, :messages,
@@ -8,6 +8,7 @@ class WatcherTest < ActiveSupport::TestCase
            :watchers
 
   def setup
+    prepare_tests
     @author = User.find(1)
     @assigned_user = User.find(2)
     @changing_user = User.find(4)