Use same fixtures for all tests

alphanodes · Dec 10, 2024 · 9ded1cb · 9ded1cb
1 parent 163f22a
commit 9ded1cb
Show file tree

Hide file tree

Showing 35 changed files with 66 additions and 380 deletions.
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
@@ -3,16 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class AccountControllerTest < Additionals::ControllerTest
-  fixtures :users, :groups_users, :email_addresses, :user_preferences,
-           :roles, :members, :member_roles,
-           :issues, :issue_statuses, :issue_relations,
-           :issues, :issue_statuses, :issue_categories,
-           :versions, :trackers,
-           :projects, :projects_trackers, :enabled_modules,
-           :enumerations
-
-  fixtures :hrm_user_types, :hrm_working_calendars if AdditionalsPlugin.active_hrm?
-
   def setup
     Setting.default_language = 'en'
     User.current = nil

diff --git a/test/functional/additionals_assign_to_me_controller_test.rb b/test/functional/additionals_assign_to_me_controller_test.rb
@@ -3,31 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class AdditionalsAssignToMeControllerTest < Additionals::ControllerTest
-  fixtures :projects,
-           :users, :email_addresses, :user_preferences,
-           :roles,
-           :members,
-           :member_roles,
-           :issues,
-           :issue_statuses,
-           :issue_relations,
-           :versions,
-           :trackers,
-           :projects_trackers,
-           :issue_categories,
-           :enabled_modules,
-           :enumerations,
-           :attachments,
-           :workflows,
-           :custom_fields,
-           :custom_values,
-           :custom_fields_projects,
-           :custom_fields_trackers,
-           :time_entries,
-           :journals,
-           :journal_details,
-           :queries
-
   test 'assign issue to user' do
     session[:user_id] = 2
     assert_difference 'Journal.count' do

diff --git a/test/functional/additionals_change_status_controller_test.rb b/test/functional/additionals_change_status_controller_test.rb
@@ -3,31 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class AdditionalsChangeStatusControllerTest < Additionals::ControllerTest
-  fixtures :projects,
-           :users, :email_addresses, :user_preferences,
-           :roles,
-           :members,
-           :member_roles,
-           :issues,
-           :issue_statuses,
-           :issue_relations,
-           :versions,
-           :trackers,
-           :projects_trackers,
-           :issue_categories,
-           :enabled_modules,
-           :enumerations,
-           :attachments,
-           :workflows,
-           :custom_fields,
-           :custom_values,
-           :custom_fields_projects,
-           :custom_fields_trackers,
-           :time_entries,
-           :journals,
-           :journal_details,
-           :queries
-
   test 'assign new status to issue' do
     session[:user_id] = 2
     assert_difference 'Journal.count' do

diff --git a/test/functional/additionals_macros_controller_test.rb b/test/functional/additionals_macros_controller_test.rb
@@ -3,13 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class AdditionalsMacrosControllerTest < Additionals::ControllerTest
-  fixtures :projects,
-           :users,
-           :roles,
-           :members,
-           :member_roles,
-           :enabled_modules
-
   def setup
     prepare_tests
   end

diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
@@ -3,8 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class AdminControllerTest < Additionals::ControllerTest
-  fixtures :users, :email_addresses, :roles
-
   def setup
     User.current = nil
     @request.session[:user_id] = 1

diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb
@@ -3,12 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class AutoCompletesControllerTest < Additionals::ControllerTest
-  fixtures :projects, :email_addresses,
-           :enumerations, :users, :groups_users,
-           :roles,
-           :members, :member_roles,
-           :enabled_modules
-
   def setup
     prepare_tests
     Setting.default_language = 'en'

diff --git a/test/functional/dashboard_async_blocks_controller_test.rb b/test/functional/dashboard_async_blocks_controller_test.rb
@@ -3,22 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class DashboardAsyncBlocksControllerTest < Additionals::ControllerTest
-  fixtures :users, :email_addresses, :roles,
-           :enumerations,
-           :projects, :projects_trackers, :enabled_modules,
-           :members, :member_roles,
-           :issues, :issue_statuses, :issue_categories, :issue_relations,
-           :versions,
-           :trackers,
-           :workflows,
-           :custom_fields, :custom_values, :custom_fields_projects, :custom_fields_trackers,
-           :time_entries,
-           :watchers,
-           :journals, :journal_details,
-           :repositories, :changesets,
-           :queries,
-           :dashboards, :dashboard_roles
-
   include Redmine::I18n
 
   def setup

diff --git a/test/functional/dashboards_controller_test.rb b/test/functional/dashboards_controller_test.rb
@@ -3,21 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class DashboardsControllerTest < Additionals::ControllerTest
-  fixtures :projects,
-           :users,
-           :roles,
-           :members,
-           :member_roles,
-           :issues,
-           :issue_statuses,
-           :versions,
-           :trackers,
-           :projects_trackers,
-           :issue_categories,
-           :enabled_modules,
-           :dashboards, :dashboard_roles,
-           :queries
-
   include CrudControllerBase
 
   def setup

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
@@ -3,21 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class IssuesControllerTest < Additionals::ControllerTest
-  fixtures :users, :email_addresses, :roles,
-           :enumerations,
-           :projects, :projects_trackers, :enabled_modules,
-           :members, :member_roles,
-           :issues, :issue_statuses, :issue_categories, :issue_relations,
-           :versions,
-           :trackers,
-           :workflows,
-           :custom_fields, :custom_values, :custom_fields_projects, :custom_fields_trackers,
-           :time_entries,
-           :watchers, :attachments,
-           :journals, :journal_details,
-           :repositories, :changesets,
-           :queries
-
   def setup
     manager_role = roles :roles_001
     manager_role.add_permission! :edit_issue_author

diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
@@ -11,20 +11,6 @@ class ViewDashboardBottomRenderOn < Redmine::Hook::ViewListener
 end
 
 class ProjectsControllerTest < Additionals::ControllerTest
-  fixtures :projects,
-           :users,
-           :roles,
-           :members,
-           :member_roles,
-           :issues,
-           :issue_statuses,
-           :versions,
-           :trackers,
-           :projects_trackers,
-           :issue_categories,
-           :enabled_modules,
-           :dashboards, :dashboard_roles
-
   def setup
     Setting.default_language = 'en'
     User.current = nil

diff --git a/test/functional/reports_controller_test.rb b/test/functional/reports_controller_test.rb
@@ -3,15 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class ReportsControllerTest < Additionals::ControllerTest
-  fixtures :users, :groups_users, :email_addresses, :user_preferences,
-           :roles, :members, :member_roles,
-           :projects, :trackers, :issue_statuses, :issues,
-           :enumerations, :issue_categories,
-           :projects_trackers,
-           :roles, :member_roles, :members,
-           :enabled_modules, :workflows,
-           :versions
-
   def setup
     prepare_tests
   end

diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
@@ -11,16 +11,6 @@ class ViewUsersShowInfoRenderOn < Redmine::Hook::ViewListener
 end
 
 class UsersControllerTest < Additionals::ControllerTest
-  fixtures :users, :groups_users, :email_addresses, :user_preferences,
-           :roles, :members, :member_roles,
-           :issues, :issue_statuses, :issue_relations,
-           :issues, :issue_statuses, :issue_categories,
-           :versions, :trackers,
-           :projects, :projects_trackers, :enabled_modules,
-           :enumerations
-
-  fixtures :hrm_user_types, :hrm_working_calendars if AdditionalsPlugin.active_hrm?
-
   include Redmine::I18n
 
   def setup

diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb
@@ -19,9 +19,6 @@ class ViewDashboardBottomRenderOn < Redmine::Hook::ViewListener
 end
 
 class WelcomeControllerTest < Additionals::ControllerTest
-  fixtures :projects, :news, :users, :members,
-           :dashboards, :dashboard_roles
-
   def setup
     Setting.default_language = 'en'
     User.current = nil

diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
@@ -3,23 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class WikiControllerTest < Additionals::ControllerTest
-  fixtures :projects,
-           :users,
-           :roles,
-           :members,
-           :member_roles,
-           :trackers,
-           :groups_users,
-           :projects_trackers,
-           :enabled_modules,
-           :issue_statuses,
-           :issues,
-           :enumerations,
-           :custom_fields,
-           :custom_values,
-           :custom_fields_trackers,
-           :wikis
-
   WIKI_MACRO_USER_ID = 2
 
   def setup

diff --git a/test/global_fixtures_helper.rb b/test/global_fixtures_helper.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Additionals
+  module GlobalFixturesHelper
+    def plugin_fixture_path
+      "#{File.dirname __FILE__}/fixtures"
+    end
+
+    def fixtures(*table_names)
+      return super if table_names.first == :all
+
+      dir = plugin_fixture_path
+      table_names.each do |x|
+        ActiveRecord::FixtureSet.create_fixtures dir, x if File.exist? File.join(dir, "#{x}.yml")
+      end
+
+      super
+    end
+
+    def fixtures_list
+      if use_transactional_tests
+        redmine_fixtures_list + plugin_fixtures_list
+      else
+        # if use_transactional_tests = false custom fixtures in plugin directory does not work
+        redmine_fixtures_list
+      end
+    end
+
+    # NOTE: overwrite it for custom fixtures
+    def plugin_fixtures_list
+      []
+    end
+
+    def redmine_fixtures_list
+      %i[users groups_users user_preferences email_addresses roles enumerations
+         auth_sources tokens enabled_modules
+         projects projects_trackers
+         members member_roles news
+         issues issue_statuses issue_categories issue_relations
+         journals journal_details watchers attachments
+         custom_fields custom_values custom_fields_projects custom_fields_trackers
+         versions trackers workflows time_entries
+         repositories changesets changes
+         wikis wiki_pages wiki_contents wiki_content_versions
+         queries]
+    end
+  end
+end
diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb
@@ -4,27 +4,6 @@
 
 module ApiTest
   class IssuesTest < Additionals::ApiTest
-    fixtures :projects,
-             :users,
-             :roles,
-             :members,
-             :member_roles,
-             :issues,
-             :issue_statuses,
-             :issue_relations,
-             :versions,
-             :trackers,
-             :projects_trackers,
-             :issue_categories,
-             :enabled_modules,
-             :enumerations,
-             :attachments,
-             :workflows,
-             :time_entries,
-             :journals,
-             :journal_details,
-             :queries
-
     test 'GET /issues.xml should contain metadata' do
       get '/issues.xml'
 

diff --git a/test/integration/api_test/projects_test.rb b/test/integration/api_test/projects_test.rb
@@ -4,18 +4,6 @@
 
 module ApiTest
   class ProjectsTest < Additionals::ApiTest
-    fixtures :users, :email_addresses, :roles,
-             :enumerations,
-             :projects, :projects_trackers, :enabled_modules,
-             :members, :member_roles,
-             :issues, :issue_statuses, :issue_categories,
-             :journals, :journal_details,
-             :trackers,
-             :attachments,
-             :custom_fields, :custom_values,
-             :time_entries,
-             :dashboards, :dashboard_roles
-
     test 'GET /projects.xml should return projects' do
       get '/projects.xml',
           headers: credentials('jsmith')

diff --git a/test/integration/common_views_test.rb b/test/integration/common_views_test.rb
@@ -3,22 +3,6 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class CommonViewsTest < Additionals::IntegrationTest
-  fixtures :projects,
-           :users,
-           :roles,
-           :members,
-           :member_roles,
-           :trackers,
-           :projects_trackers,
-           :enabled_modules,
-           :issue_statuses,
-           :issue_categories,
-           :issues,
-           :enumerations,
-           :custom_fields,
-           :custom_values,
-           :custom_fields_trackers
-
   def setup
     prepare_tests
   end