Adds our own class for controller tests.

git-svn-id: http://svn.redmine.org/redmine/trunk@15661 e93f8b46-1217-0410-a6f0-8f06a7374b81

64 files changed, 66 insertions, 63 deletions

diff --git a/test/functional/account_controller_openid_test.rb b/test/functional/account_controller_openid_test.rb
index ef120a44c..6e6723e5b 100644
--- a/test/functional/account_controller_openid_test.rb
+++ b/test/functional/account_controller_openid_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class AccountControllerOpenidTest < ActionController::TestCase
+class AccountControllerOpenidTest < Redmine::ControllerTest
   tests AccountController
   fixtures :users, :roles
 
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index ad187b293..3ef771f56 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class AccountControllerTest < ActionController::TestCase
+class AccountControllerTest < Redmine::ControllerTest
   fixtures :users, :email_addresses, :roles
 
   def setup
diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb
index 7a42b4702..fa3e44abf 100644
--- a/test/functional/activities_controller_test.rb
+++ b/test/functional/activities_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class ActivitiesControllerTest < ActionController::TestCase
+class ActivitiesControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,
            :projects_trackers,
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index 498fe7e1f..a713ddfdb 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class AdminControllerTest < ActionController::TestCase
+class AdminControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :roles
 
   def setup
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index 5d3387975..08c31078a 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -19,7 +19,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class AttachmentsControllerTest < ActionController::TestCase
+class AttachmentsControllerTest < Redmine::ControllerTest
   fixtures :users, :projects, :roles, :members, :member_roles,
            :enabled_modules, :issues, :trackers, :attachments,
            :versions, :wiki_pages, :wikis, :documents
diff --git a/test/functional/auth_sources_controller_test.rb b/test/functional/auth_sources_controller_test.rb
index 18225c8d0..521fcf817 100644
--- a/test/functional/auth_sources_controller_test.rb
+++ b/test/functional/auth_sources_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class AuthSourcesControllerTest < ActionController::TestCase
+class AuthSourcesControllerTest < Redmine::ControllerTest
   fixtures :users, :auth_sources
 
   def setup
diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb
index eda685b02..48a1c7758 100644
--- a/test/functional/auto_completes_controller_test.rb
+++ b/test/functional/auto_completes_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class AutoCompletesControllerTest < ActionController::TestCase
+class AutoCompletesControllerTest < Redmine::ControllerTest
   fixtures :projects, :issues, :issue_statuses,
            :enumerations, :users, :issue_categories,
            :trackers,
diff --git a/test/functional/boards_controller_test.rb b/test/functional/boards_controller_test.rb
index ae336c6b4..d6c8e89f8 100644
--- a/test/functional/boards_controller_test.rb
+++ b/test/functional/boards_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class BoardsControllerTest < ActionController::TestCase
+class BoardsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :members, :member_roles, :roles, :boards, :messages, :enabled_modules
 
   def setup
diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index e856006e1..becf11945 100644
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class CalendarsControllerTest < ActionController::TestCase
+class CalendarsControllerTest < Redmine::ControllerTest
   fixtures :projects,
            :trackers,
            :projects_trackers,
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index 90dad816b..9ba469eed 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class CommentsControllerTest < ActionController::TestCase
+class CommentsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles, :enabled_modules, :news, :comments
 
   def setup
diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb
index 103fbcc82..c674e5d97 100644
--- a/test/functional/context_menus_controller_test.rb
+++ b/test/functional/context_menus_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class ContextMenusControllerTest < ActionController::TestCase
+class ContextMenusControllerTest < Redmine::ControllerTest
   fixtures :projects,
            :trackers,
            :projects_trackers,
diff --git a/test/functional/custom_field_enumerations_controller_test.rb b/test/functional/custom_field_enumerations_controller_test.rb
index bf72667e8..c9fa39621 100644
--- a/test/functional/custom_field_enumerations_controller_test.rb
+++ b/test/functional/custom_field_enumerations_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class CustomFieldEnumerationsControllerTest < ActionController::TestCase
+class CustomFieldEnumerationsControllerTest < Redmine::ControllerTest
   fixtures :users, :email_addresses
 
   def setup
diff --git a/test/functional/custom_fields_controller_test.rb b/test/functional/custom_fields_controller_test.rb
index b30aa4f47..b8d67b7b4 100644
--- a/test/functional/custom_fields_controller_test.rb
+++ b/test/functional/custom_fields_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class CustomFieldsControllerTest < ActionController::TestCase
+class CustomFieldsControllerTest < Redmine::ControllerTest
   fixtures :custom_fields, :custom_values,
            :custom_fields_projects, :custom_fields_trackers,
            :roles, :users,
diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb
index 505f1dff5..94ba46cd9 100644
--- a/test/functional/documents_controller_test.rb
+++ b/test/functional/documents_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class DocumentsControllerTest < ActionController::TestCase
+class DocumentsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
            :enabled_modules, :documents, :enumerations,
            :groups_users, :attachments
diff --git a/test/functional/email_addresses_controller_test.rb b/test/functional/email_addresses_controller_test.rb
index 1c41eefbf..c18862d59 100644
--- a/test/functional/email_addresses_controller_test.rb
+++ b/test/functional/email_addresses_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class EmailAddressesControllerTest < ActionController::TestCase
+class EmailAddressesControllerTest < Redmine::ControllerTest
   fixtures :users, :email_addresses
 
   def setup
diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb
index e6dadf3f7..4c499e8aa 100644
--- a/test/functional/enumerations_controller_test.rb
+++ b/test/functional/enumerations_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class EnumerationsControllerTest < ActionController::TestCase
+class EnumerationsControllerTest < Redmine::ControllerTest
   fixtures :enumerations, :issues, :users
 
   def setup
diff --git a/test/functional/files_controller_test.rb b/test/functional/files_controller_test.rb
index 2ed957a88..23231ff49 100644
--- a/test/functional/files_controller_test.rb
+++ b/test/functional/files_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class FilesControllerTest < ActionController::TestCase
+class FilesControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users,
            :email_addresses,
diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb
index e144ab094..ef38f53bc 100644
--- a/test/functional/gantts_controller_test.rb
+++ b/test/functional/gantts_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class GanttsControllerTest < ActionController::TestCase
+class GanttsControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,
            :projects_trackers,
diff --git a/test/functional/groups_controller_test.rb b/test/functional/groups_controller_test.rb
index 345dff082..680a18d6a 100644
--- a/test/functional/groups_controller_test.rb
+++ b/test/functional/groups_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class GroupsControllerTest < ActionController::TestCase
+class GroupsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :members, :member_roles, :roles, :groups_users
 
   def setup
diff --git a/test/functional/imports_controller_test.rb b/test/functional/imports_controller_test.rb
index 5c41c10d7..526e9e874 100644
--- a/test/functional/imports_controller_test.rb
+++ b/test/functional/imports_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class ImportsControllerTest < ActionController::TestCase
+class ImportsControllerTest < Redmine::ControllerTest
   fixtures :projects, :enabled_modules,
            :users, :email_addresses,
            :roles, :members, :member_roles,
diff --git a/test/functional/issue_categories_controller_test.rb b/test/functional/issue_categories_controller_test.rb
index 21fc540b9..51092859a 100644
--- a/test/functional/issue_categories_controller_test.rb
+++ b/test/functional/issue_categories_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class IssueCategoriesControllerTest < ActionController::TestCase
+class IssueCategoriesControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules, :issue_categories,
            :issues
 
diff --git a/test/functional/issue_relations_controller_test.rb b/test/functional/issue_relations_controller_test.rb
index d389fa164..ca0e81571 100644
--- a/test/functional/issue_relations_controller_test.rb
+++ b/test/functional/issue_relations_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class IssueRelationsControllerTest < ActionController::TestCase
+class IssueRelationsControllerTest < Redmine::ControllerTest
   fixtures :projects,
            :users,
            :roles,
diff --git a/test/functional/issue_statuses_controller_test.rb b/test/functional/issue_statuses_controller_test.rb
index b953bd3b0..34074a786 100644
--- a/test/functional/issue_statuses_controller_test.rb
+++ b/test/functional/issue_statuses_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class IssueStatusesControllerTest < ActionController::TestCase
+class IssueStatusesControllerTest < Redmine::ControllerTest
   fixtures :issue_statuses, :issues, :users, :trackers
 
   def setup
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index d878b9608..af43b5012 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class IssuesControllerTest < ActionController::TestCase
+class IssuesControllerTest < Redmine::ControllerTest
   fixtures :projects,
            :users, :email_addresses, :user_preferences,
            :roles,
diff --git a/test/functional/issues_controller_transaction_test.rb b/test/functional/issues_controller_transaction_test.rb
index b71af653d..d7e9c4cb5 100644
--- a/test/functional/issues_controller_transaction_test.rb
+++ b/test/functional/issues_controller_transaction_test.rb
@@ -18,7 +18,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'issues_controller'
 
-class IssuesControllerTransactionTest < ActionController::TestCase
+class IssuesControllerTransactionTest < Redmine::ControllerTest
   tests IssuesController
   fixtures :projects,
            :users,
diff --git a/test/functional/issues_custom_fields_visibility_test.rb b/test/functional/issues_custom_fields_visibility_test.rb
index 51b057f4c..5eafc6232 100644
--- a/test/functional/issues_custom_fields_visibility_test.rb
+++ b/test/functional/issues_custom_fields_visibility_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class IssuesCustomFieldsVisibilityTest < ActionController::TestCase
+class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
   tests IssuesController
   fixtures :projects,
            :users, :email_addresses, :user_preferences,
diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
index 424a4aa8b..5e930eba0 100644
--- a/test/functional/journals_controller_test.rb
+++ b/test/functional/journals_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class JournalsControllerTest < ActionController::TestCase
+class JournalsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules,
     :trackers, :issue_statuses, :enumerations, :custom_fields, :custom_values, :custom_fields_projects, :projects_trackers
 
diff --git a/test/functional/mail_handler_controller_test.rb b/test/functional/mail_handler_controller_test.rb
index a6c2dfa4c..864e30d20 100644
--- a/test/functional/mail_handler_controller_test.rb
+++ b/test/functional/mail_handler_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class MailHandlerControllerTest < ActionController::TestCase
+class MailHandlerControllerTest < Redmine::ControllerTest
   fixtures :users, :email_addresses, :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :issue_statuses,
            :trackers, :projects_trackers, :enumerations
 
diff --git a/test/functional/members_controller_test.rb b/test/functional/members_controller_test.rb
index 05a4fa5a9..0e6d7b0a8 100644
--- a/test/functional/members_controller_test.rb
+++ b/test/functional/members_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class MembersControllerTest < ActionController::TestCase
+class MembersControllerTest < Redmine::ControllerTest
   fixtures :projects, :members, :member_roles, :roles, :users
 
   def setup
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index 36b0f1dd5..6313409ba 100644
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class MessagesControllerTest < ActionController::TestCase
+class MessagesControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :user_preferences, :members, :member_roles, :roles, :boards, :messages, :enabled_modules
 
   def setup
diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb
index 92c099835..c90acd62c 100644
--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class MyControllerTest < ActionController::TestCase
+class MyControllerTest < Redmine::ControllerTest
   fixtures :users, :email_addresses, :user_preferences, :roles, :projects, :members, :member_roles,
   :issues, :issue_statuses, :trackers, :enumerations, :custom_fields, :auth_sources
 
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index 6fe50f477..2d10bc4f3 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class NewsControllerTest < ActionController::TestCase
+class NewsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
            :enabled_modules, :news, :comments,
            :attachments
diff --git a/test/functional/previews_controller_test.rb b/test/functional/previews_controller_test.rb
index cf8aed58f..6d8d03132 100644
--- a/test/functional/previews_controller_test.rb
+++ b/test/functional/previews_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class PreviewsControllerTest < ActionController::TestCase
+class PreviewsControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,
            :projects_trackers,
diff --git a/test/functional/principal_memberships_controller_test.rb b/test/functional/principal_memberships_controller_test.rb
index 7dbecd978..c580e5835 100644
--- a/test/functional/principal_memberships_controller_test.rb
+++ b/test/functional/principal_memberships_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class PrincipalMembershipsControllerTest < ActionController::TestCase
+class PrincipalMembershipsControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :members, :member_roles, :roles, :groups_users
 
   def setup
diff --git a/test/functional/project_enumerations_controller_test.rb b/test/functional/project_enumerations_controller_test.rb
index 336932c65..1ab95e4ec 100644
--- a/test/functional/project_enumerations_controller_test.rb
+++ b/test/functional/project_enumerations_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class ProjectEnumerationsControllerTest < ActionController::TestCase
+class ProjectEnumerationsControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,
            :projects_trackers,
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 55dbeefb0..18e305fd3 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class ProjectsControllerTest < ActionController::TestCase
+class ProjectsControllerTest < Redmine::ControllerTest
   fixtures :projects, :versions, :users, :email_addresses, :roles, :members,
            :member_roles, :issues, :journals, :journal_details,
            :trackers, :projects_trackers, :issue_statuses,
diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
index 27eb48a92..203ad2c23 100644
--- a/test/functional/queries_controller_test.rb
+++ b/test/functional/queries_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class QueriesControllerTest < ActionController::TestCase
+class QueriesControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :members, :member_roles, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries, :enabled_modules
 
   def setup
diff --git a/test/functional/reports_controller_test.rb b/test/functional/reports_controller_test.rb
index a03269055..e87cfe270 100644
--- a/test/functional/reports_controller_test.rb
+++ b/test/functional/reports_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class ReportsControllerTest < ActionController::TestCase
+class ReportsControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :enumerations, :users, :issue_categories,
            :projects_trackers,
diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb
index 9b8ec2b2f..d5772a648 100644
--- a/test/functional/repositories_bazaar_controller_test.rb
+++ b/test/functional/repositories_bazaar_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class RepositoriesBazaarControllerTest < ActionController::TestCase
+class RepositoriesBazaarControllerTest < Redmine::ControllerTest
   tests RepositoriesController
 
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb
index fed6a7c68..3a4e073f7 100644
--- a/test/functional/repositories_controller_test.rb
+++ b/test/functional/repositories_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class RepositoriesControllerTest < ActionController::TestCase
+class RepositoriesControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles, :enabled_modules,
            :repositories, :issues, :issue_statuses, :changesets, :changes,
            :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index 8940724ef..1ba84876e 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class RepositoriesCvsControllerTest < ActionController::TestCase
+class RepositoriesCvsControllerTest < Redmine::ControllerTest
   tests RepositoriesController
 
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
diff --git a/test/functional/repositories_darcs_controller_test.rb b/test/functional/repositories_darcs_controller_test.rb
index 33a085ee9..8845bbb22 100644
--- a/test/functional/repositories_darcs_controller_test.rb
+++ b/test/functional/repositories_darcs_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class RepositoriesDarcsControllerTest < ActionController::TestCase
+class RepositoriesDarcsControllerTest < Redmine::ControllerTest
   tests RepositoriesController
 
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
diff --git a/test/functional/repositories_filesystem_controller_test.rb b/test/functional/repositories_filesystem_controller_test.rb
index 87c6cd266..c64429fb2 100644
--- a/test/functional/repositories_filesystem_controller_test.rb
+++ b/test/functional/repositories_filesystem_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class RepositoriesFilesystemControllerTest < ActionController::TestCase
+class RepositoriesFilesystemControllerTest < Redmine::ControllerTest
   tests RepositoriesController
 
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index f92d39de1..4ec419c53 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class RepositoriesGitControllerTest < ActionController::TestCase
+class RepositoriesGitControllerTest < Redmine::ControllerTest
   tests RepositoriesController
 
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index 7078db471..130adc695 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class RepositoriesMercurialControllerTest < ActionController::TestCase
+class RepositoriesMercurialControllerTest < Redmine::ControllerTest
   tests RepositoriesController
 
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index 9eef38e3e..1aa4dd3ca 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class RepositoriesSubversionControllerTest < ActionController::TestCase
+class RepositoriesSubversionControllerTest < Redmine::ControllerTest
   tests RepositoriesController
 
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles, :enabled_modules,
diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb
index 915b658c9..7d94d1aeb 100644
--- a/test/functional/roles_controller_test.rb
+++ b/test/functional/roles_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class RolesControllerTest < ActionController::TestCase
+class RolesControllerTest < Redmine::ControllerTest
   fixtures :roles, :users, :members, :member_roles, :workflows, :trackers
 
   def setup
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index c074a6ca2..9764d3adf 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class SearchControllerTest < ActionController::TestCase
+class SearchControllerTest < Redmine::ControllerTest
   fixtures :projects, :projects_trackers,
            :enabled_modules, :roles, :users, :members, :member_roles,
            :issues, :trackers, :issue_statuses, :enumerations,
diff --git a/test/functional/search_custom_fields_visibility_test.rb b/test/functional/search_custom_fields_visibility_test.rb
index 070f1a7c8..3b90c2187 100644
--- a/test/functional/search_custom_fields_visibility_test.rb
+++ b/test/functional/search_custom_fields_visibility_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class SearchCustomFieldsVisibilityTest < ActionController::TestCase
+class SearchCustomFieldsVisibilityTest < Redmine::ControllerTest
   tests SearchController
   fixtures :projects,
            :users,
diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
index 2f3572f32..cdc972fb8 100644
--- a/test/functional/sessions_controller_test.rb
+++ b/test/functional/sessions_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class SessionsControllerTest < ActionController::TestCase
+class SessionsControllerTest < Redmine::ControllerTest
   include Redmine::I18n
   tests WelcomeController
 
diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb
index ff45150ad..28b21e037 100644
--- a/test/functional/settings_controller_test.rb
+++ b/test/functional/settings_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class SettingsControllerTest < ActionController::TestCase
+class SettingsControllerTest < Redmine::ControllerTest
   fixtures :projects, :trackers, :issue_statuses, :issues,
            :users
 
diff --git a/test/functional/sys_controller_test.rb b/test/functional/sys_controller_test.rb
index ab8d0661a..45525848e 100644
--- a/test/functional/sys_controller_test.rb
+++ b/test/functional/sys_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class SysControllerTest < ActionController::TestCase
+class SysControllerTest < Redmine::ControllerTest
   fixtures :projects, :repositories, :enabled_modules
 
   def setup
diff --git a/test/functional/time_entry_reports_controller_test.rb b/test/functional/time_entry_reports_controller_test.rb
index c4ba0f7fe..a06b4ea95 100644
--- a/test/functional/time_entry_reports_controller_test.rb
+++ b/test/functional/time_entry_reports_controller_test.rb
@@ -18,7 +18,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class TimeEntryReportsControllerTest < ActionController::TestCase
+class TimeEntryReportsControllerTest < Redmine::ControllerTest
   tests TimelogController
 
   fixtures :projects, :enabled_modules, :roles, :members, :member_roles,
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 5e1af33f5..95c14295b 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -18,7 +18,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class TimelogControllerTest < ActionController::TestCase
+class TimelogControllerTest < Redmine::ControllerTest
   fixtures :projects, :enabled_modules, :roles, :members,
            :member_roles, :issues, :time_entries, :users,
            :trackers, :enumerations, :issue_statuses,
diff --git a/test/functional/timelog_custom_fields_visibility_test.rb b/test/functional/timelog_custom_fields_visibility_test.rb
index 5598b2e4e..4a74800f5 100644
--- a/test/functional/timelog_custom_fields_visibility_test.rb
+++ b/test/functional/timelog_custom_fields_visibility_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class TimelogCustomFieldsVisibilityTest < ActionController::TestCase
+class TimelogCustomFieldsVisibilityTest < Redmine::ControllerTest
   tests TimelogController
   fixtures :projects,
            :users,
diff --git a/test/functional/trackers_controller_test.rb b/test/functional/trackers_controller_test.rb
index a2664f295..72467c8d0 100644
--- a/test/functional/trackers_controller_test.rb
+++ b/test/functional/trackers_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class TrackersControllerTest < ActionController::TestCase
+class TrackersControllerTest < Redmine::ControllerTest
   fixtures :trackers, :projects, :projects_trackers, :users, :issues, :custom_fields, :issue_statuses
 
   def setup
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 7c22dedf2..ad79ae6b8 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class UsersControllerTest < ActionController::TestCase
+class UsersControllerTest < Redmine::ControllerTest
   include Redmine::I18n
 
   fixtures :users, :email_addresses, :projects, :members, :member_roles, :roles,
diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index f44a4093a..359c4aeeb 100644
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class VersionsControllerTest < ActionController::TestCase
+class VersionsControllerTest < Redmine::ControllerTest
   fixtures :projects, :versions, :issues, :users, :roles, :members,
            :member_roles, :enabled_modules, :issue_statuses,
            :issue_categories, :enumerations
diff --git a/test/functional/watchers_controller_test.rb b/test/functional/watchers_controller_test.rb
index d6220710b..d8e72c59d 100644
--- a/test/functional/watchers_controller_test.rb
+++ b/test/functional/watchers_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class WatchersControllerTest < ActionController::TestCase
+class WatchersControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
            :issues, :trackers, :projects_trackers, :issue_statuses, :enumerations, :watchers
 
diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb
index c9c12affb..e75d8a4af 100644
--- a/test/functional/welcome_controller_test.rb
+++ b/test/functional/welcome_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class WelcomeControllerTest < ActionController::TestCase
+class WelcomeControllerTest < Redmine::ControllerTest
   fixtures :projects, :news, :users, :members
 
   def setup
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index cd3bf0a76..664dc1c09 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class WikiControllerTest < ActionController::TestCase
+class WikiControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
            :enabled_modules, :wikis, :wiki_pages, :wiki_contents,
            :wiki_content_versions, :attachments,
diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb
index 48618e258..8e405534e 100644
--- a/test/functional/wikis_controller_test.rb
+++ b/test/functional/wikis_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class WikisControllerTest < ActionController::TestCase
+class WikisControllerTest < Redmine::ControllerTest
   fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :wikis
 
   def setup
diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb
index 8a8077e3b..565169737 100644
--- a/test/functional/workflows_controller_test.rb
+++ b/test/functional/workflows_controller_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 
-class WorkflowsControllerTest < ActionController::TestCase
+class WorkflowsControllerTest < Redmine::ControllerTest
   fixtures :roles, :trackers, :workflows, :users, :issue_statuses
 
   def setup
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7f4d2cdb0..0da05394a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -277,6 +277,9 @@ module Redmine
     end
   end
 
+  class ControllerTest < ActionController::TestCase
+  end
+
   class IntegrationTest < ActionDispatch::IntegrationTest
     def log_user(login, password)
       User.anonymous