diff options
Diffstat (limited to 'test/functional')
41 files changed, 75 insertions, 68 deletions
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index fb23e6bb7..8184fa312 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -21,7 +21,7 @@ require 'account_controller' # Re-raise errors caught by the controller. class AccountController; def rescue_action(e) raise e end; end -class AccountControllerTest < Test::Unit::TestCase +class AccountControllerTest < ActionController::TestCase fixtures :users, :roles def setup diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb index 32965de4c..47091c42f 100644 --- a/test/functional/admin_controller_test.rb +++ b/test/functional/admin_controller_test.rb @@ -21,7 +21,7 @@ require 'admin_controller' # Re-raise errors caught by the controller. class AdminController; def rescue_action(e) raise e end; end -class AdminControllerTest < Test::Unit::TestCase +class AdminControllerTest < ActionController::TestCase fixtures :projects, :users, :roles def setup diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb index 0232b6a4d..7e221c252 100644 --- a/test/functional/application_controller_test.rb +++ b/test/functional/application_controller_test.rb @@ -16,12 +16,12 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. require File.dirname(__FILE__) + '/../test_helper' -require 'application' +require 'application_controller' # Re-raise errors caught by the controller. class ApplicationController; def rescue_action(e) raise e end; end -class ApplicationControllerTest < Test::Unit::TestCase +class ApplicationControllerTest < ActionController::TestCase include Redmine::I18n def setup diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb index 3a4b89785..bf57349fe 100644 --- a/test/functional/attachments_controller_test.rb +++ b/test/functional/attachments_controller_test.rb @@ -22,7 +22,7 @@ require 'attachments_controller' class AttachmentsController; def rescue_action(e) raise e end; end -class AttachmentsControllerTest < Test::Unit::TestCase +class AttachmentsControllerTest < ActionController::TestCase fixtures :users, :projects, :roles, :members, :member_roles, :enabled_modules, :issues, :trackers, :attachments, :versions, :wiki_pages, :wikis, :documents diff --git a/test/functional/boards_controller_test.rb b/test/functional/boards_controller_test.rb index eb9a50ea5..254ee9385 100644 --- a/test/functional/boards_controller_test.rb +++ b/test/functional/boards_controller_test.rb @@ -21,7 +21,7 @@ require 'boards_controller' # Re-raise errors caught by the controller. class BoardsController; def rescue_action(e) raise e end; end -class BoardsControllerTest < Test::Unit::TestCase +class BoardsControllerTest < ActionController::TestCase fixtures :projects, :users, :members, :member_roles, :roles, :boards, :messages, :enabled_modules def setup diff --git a/test/functional/custom_fields_controller_test.rb b/test/functional/custom_fields_controller_test.rb index 10af23563..5b27446bd 100644 --- a/test/functional/custom_fields_controller_test.rb +++ b/test/functional/custom_fields_controller_test.rb @@ -21,7 +21,7 @@ require 'custom_fields_controller' # Re-raise errors caught by the controller.
class CustomFieldsController; def rescue_action(e) raise e end; end
-class CustomFieldsControllerTest < Test::Unit::TestCase
+class CustomFieldsControllerTest < ActionController::TestCase
fixtures :custom_fields, :trackers, :users
def setup
diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb index c0fe0957e..11c706596 100644 --- a/test/functional/documents_controller_test.rb +++ b/test/functional/documents_controller_test.rb @@ -21,7 +21,7 @@ require 'documents_controller' # Re-raise errors caught by the controller. class DocumentsController; def rescue_action(e) raise e end; end -class DocumentsControllerTest < Test::Unit::TestCase +class DocumentsControllerTest < ActionController::TestCase fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :documents, :enumerations def setup diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb index afbe23aaa..8c66186f1 100644 --- a/test/functional/enumerations_controller_test.rb +++ b/test/functional/enumerations_controller_test.rb @@ -21,7 +21,7 @@ require 'enumerations_controller' # Re-raise errors caught by the controller. class EnumerationsController; def rescue_action(e) raise e end; end -class EnumerationsControllerTest < Test::Unit::TestCase +class EnumerationsControllerTest < ActionController::TestCase fixtures :enumerations, :issues, :users def setup diff --git a/test/functional/groups_controller_test.rb b/test/functional/groups_controller_test.rb index ac61db425..91fc42c34 100644 --- a/test/functional/groups_controller_test.rb +++ b/test/functional/groups_controller_test.rb @@ -21,7 +21,7 @@ require 'groups_controller' # Re-raise errors caught by the controller. class GroupsController; def rescue_action(e) raise e end; end -class GroupsControllerTest < Test::Unit::TestCase +class GroupsControllerTest < ActionController::TestCase fixtures :projects, :users, :members, :member_roles def setup diff --git a/test/functional/issue_categories_controller_test.rb b/test/functional/issue_categories_controller_test.rb index ffb87339d..3d1dd069a 100644 --- a/test/functional/issue_categories_controller_test.rb +++ b/test/functional/issue_categories_controller_test.rb @@ -21,7 +21,7 @@ require 'issue_categories_controller' # Re-raise errors caught by the controller. class IssueCategoriesController; def rescue_action(e) raise e end; end -class IssueCategoriesControllerTest < Test::Unit::TestCase +class IssueCategoriesControllerTest < ActionController::TestCase fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules, :issue_categories def setup diff --git a/test/functional/issue_relations_controller_test.rb b/test/functional/issue_relations_controller_test.rb index a23f64a96..85661749f 100644 --- a/test/functional/issue_relations_controller_test.rb +++ b/test/functional/issue_relations_controller_test.rb @@ -5,7 +5,7 @@ require 'issue_relations_controller' class IssueRelationsController; def rescue_action(e) raise e end; end -class IssueRelationsControllerTest < Test::Unit::TestCase +class IssueRelationsControllerTest < ActionController::TestCase fixtures :projects, :users, :roles, diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 95e75b43b..0d282c127 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -21,7 +21,7 @@ require 'issues_controller' # Re-raise errors caught by the controller. class IssuesController; def rescue_action(e) raise e end; end -class IssuesControllerTest < Test::Unit::TestCase +class IssuesControllerTest < ActionController::TestCase fixtures :projects, :users, :roles, @@ -42,7 +42,8 @@ class IssuesControllerTest < Test::Unit::TestCase :custom_fields_trackers, :time_entries, :journals, - :journal_details + :journal_details, + :queries def setup @controller = IssuesController.new @@ -452,14 +453,16 @@ class IssuesControllerTest < Test::Unit::TestCase def test_post_new @request.session[:user_id] = 2 - post :new, :project_id => 1, - :issue => {:tracker_id => 3, - :subject => 'This is the test_new issue', - :description => 'This is the description', - :priority_id => 5, - :estimated_hours => '', - :custom_field_values => {'2' => 'Value for field 2'}} - assert_redirected_to :action => 'show' + assert_difference 'Issue.count' do + post :new, :project_id => 1, + :issue => {:tracker_id => 3, + :subject => 'This is the test_new issue', + :description => 'This is the description', + :priority_id => 5, + :estimated_hours => '', + :custom_field_values => {'2' => 'Value for field 2'}} + end + assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id issue = Issue.find_by_subject('This is the test_new issue') assert_not_nil issue @@ -483,12 +486,14 @@ class IssuesControllerTest < Test::Unit::TestCase def test_post_new_without_custom_fields_param @request.session[:user_id] = 2 - post :new, :project_id => 1, - :issue => {:tracker_id => 1, - :subject => 'This is the test_new issue', - :description => 'This is the description', - :priority_id => 5} - assert_redirected_to :action => 'show' + assert_difference 'Issue.count' do + post :new, :project_id => 1, + :issue => {:tracker_id => 1, + :subject => 'This is the test_new issue', + :description => 'This is the description', + :priority_id => 5} + end + assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id end def test_post_new_with_required_custom_field_and_without_custom_fields_param @@ -536,14 +541,16 @@ class IssuesControllerTest < Test::Unit::TestCase def test_post_new_should_send_a_notification ActionMailer::Base.deliveries.clear @request.session[:user_id] = 2 - post :new, :project_id => 1, - :issue => {:tracker_id => 3, - :subject => 'This is the test_new issue', - :description => 'This is the description', - :priority_id => 5, - :estimated_hours => '', - :custom_field_values => {'2' => 'Value for field 2'}} - assert_redirected_to :action => 'show' + assert_difference 'Issue.count' do + post :new, :project_id => 1, + :issue => {:tracker_id => 3, + :subject => 'This is the test_new issue', + :description => 'This is the description', + :priority_id => 5, + :estimated_hours => '', + :custom_field_values => {'2' => 'Value for field 2'}} + end + assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id assert_equal 1, ActionMailer::Base.deliveries.size end diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb index ae112ab6f..0a11bab3e 100644 --- a/test/functional/journals_controller_test.rb +++ b/test/functional/journals_controller_test.rb @@ -21,7 +21,7 @@ require 'journals_controller' # Re-raise errors caught by the controller. class JournalsController; def rescue_action(e) raise e end; end -class JournalsControllerTest < Test::Unit::TestCase +class JournalsControllerTest < ActionController::TestCase fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules def setup diff --git a/test/functional/mail_handler_controller_test.rb b/test/functional/mail_handler_controller_test.rb index e99f99a2c..8365f3170 100644 --- a/test/functional/mail_handler_controller_test.rb +++ b/test/functional/mail_handler_controller_test.rb @@ -21,7 +21,7 @@ require 'mail_handler_controller' # Re-raise errors caught by the controller. class MailHandlerController; def rescue_action(e) raise e end; end -class MailHandlerControllerTest < Test::Unit::TestCase +class MailHandlerControllerTest < ActionController::TestCase fixtures :users, :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :issue_statuses, :trackers, :enumerations FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures/mail_handler' diff --git a/test/functional/members_controller_test.rb b/test/functional/members_controller_test.rb index 91f36abec..bc5f92e88 100644 --- a/test/functional/members_controller_test.rb +++ b/test/functional/members_controller_test.rb @@ -22,7 +22,7 @@ require 'members_controller' class MembersController; def rescue_action(e) raise e end; end -class MembersControllerTest < Test::Unit::TestCase +class MembersControllerTest < ActionController::TestCase 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 70061aca3..2522f0a87 100644 --- a/test/functional/messages_controller_test.rb +++ b/test/functional/messages_controller_test.rb @@ -21,7 +21,7 @@ require 'messages_controller' # Re-raise errors caught by the controller. class MessagesController; def rescue_action(e) raise e end; end -class MessagesControllerTest < Test::Unit::TestCase +class MessagesControllerTest < ActionController::TestCase fixtures :projects, :users, :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 997340096..8862466e7 100644 --- a/test/functional/my_controller_test.rb +++ b/test/functional/my_controller_test.rb @@ -21,7 +21,7 @@ require 'my_controller' # Re-raise errors caught by the controller. class MyController; def rescue_action(e) raise e end; end -class MyControllerTest < Test::Unit::TestCase +class MyControllerTest < ActionController::TestCase fixtures :users, :issues, :issue_statuses, :trackers, :enumerations, :custom_fields def setup diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb index cea35ca4a..427d75b75 100644 --- a/test/functional/news_controller_test.rb +++ b/test/functional/news_controller_test.rb @@ -21,7 +21,7 @@ require 'news_controller' # Re-raise errors caught by the controller. class NewsController; def rescue_action(e) raise e end; end -class NewsControllerTest < Test::Unit::TestCase +class NewsControllerTest < ActionController::TestCase fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :news, :comments def setup diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 0560a54b6..81b501ea5 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -21,7 +21,7 @@ require 'projects_controller' # Re-raise errors caught by the controller. class ProjectsController; def rescue_action(e) raise e end; end -class ProjectsControllerTest < Test::Unit::TestCase +class ProjectsControllerTest < ActionController::TestCase fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details, :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages, :attachments diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb index 8edde44aa..af2a86e11 100644 --- a/test/functional/queries_controller_test.rb +++ b/test/functional/queries_controller_test.rb @@ -21,7 +21,7 @@ require 'queries_controller' # Re-raise errors caught by the controller. class QueriesController; def rescue_action(e) raise e end; end -class QueriesControllerTest < Test::Unit::TestCase +class QueriesControllerTest < ActionController::TestCase fixtures :projects, :users, :members, :member_roles, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries def setup @@ -70,7 +70,7 @@ class QueriesControllerTest < Test::Unit::TestCase :query => {"name" => "test_new_project_public_query", "is_public" => "1"} q = Query.find_by_name('test_new_project_public_query') - assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q + assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => q assert q.is_public? assert q.has_default_columns? assert q.valid? @@ -88,7 +88,7 @@ class QueriesControllerTest < Test::Unit::TestCase :query => {"name" => "test_new_project_private_query", "is_public" => "1"} q = Query.find_by_name('test_new_project_private_query') - assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q + assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => q assert !q.is_public? assert q.has_default_columns? assert q.valid? @@ -104,7 +104,7 @@ class QueriesControllerTest < Test::Unit::TestCase :query => {"name" => "test_new_global_private_query", "is_public" => "1", "column_names" => ["", "tracker", "subject", "priority", "category"]} q = Query.find_by_name('test_new_global_private_query') - assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q + assert_redirected_to :controller => 'issues', :action => 'index', :project_id => nil, :query_id => q assert !q.is_public? assert !q.has_default_columns? assert_equal [:tracker, :subject, :priority, :category], q.columns.collect {|c| c.name} diff --git a/test/functional/reports_controller_test.rb b/test/functional/reports_controller_test.rb index 125b175c6..ab33b3035 100644 --- a/test/functional/reports_controller_test.rb +++ b/test/functional/reports_controller_test.rb @@ -22,7 +22,7 @@ require 'reports_controller' class ReportsController; def rescue_action(e) raise e end; end -class ReportsControllerTest < Test::Unit::TestCase +class ReportsControllerTest < ActionController::TestCase fixtures :all def setup diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb index 98aa2369f..18841d54e 100644 --- a/test/functional/repositories_bazaar_controller_test.rb +++ b/test/functional/repositories_bazaar_controller_test.rb @@ -21,7 +21,7 @@ require 'repositories_controller' # Re-raise errors caught by the controller. class RepositoriesController; def rescue_action(e) raise e end; end -class RepositoriesBazaarControllerTest < Test::Unit::TestCase +class RepositoriesBazaarControllerTest < ActionController::TestCase fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules # No '..' in the repository path diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb index d51a42976..d786c2e21 100644 --- a/test/functional/repositories_controller_test.rb +++ b/test/functional/repositories_controller_test.rb @@ -21,7 +21,7 @@ require 'repositories_controller' # Re-raise errors caught by the controller. class RepositoriesController; def rescue_action(e) raise e end; end -class RepositoriesControllerTest < Test::Unit::TestCase +class RepositoriesControllerTest < ActionController::TestCase fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers def setup diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb index c728bf362..f3d4ecfe1 100644 --- a/test/functional/repositories_cvs_controller_test.rb +++ b/test/functional/repositories_cvs_controller_test.rb @@ -21,7 +21,7 @@ require 'repositories_controller' # Re-raise errors caught by the controller. class RepositoriesController; def rescue_action(e) raise e end; end -class RepositoriesCvsControllerTest < Test::Unit::TestCase +class RepositoriesCvsControllerTest < ActionController::TestCase # No '..' in the repository path REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository' diff --git a/test/functional/repositories_darcs_controller_test.rb b/test/functional/repositories_darcs_controller_test.rb index 3f841e9a1..b605ff82b 100644 --- a/test/functional/repositories_darcs_controller_test.rb +++ b/test/functional/repositories_darcs_controller_test.rb @@ -21,7 +21,7 @@ require 'repositories_controller' # Re-raise errors caught by the controller. class RepositoriesController; def rescue_action(e) raise e end; end -class RepositoriesDarcsControllerTest < Test::Unit::TestCase +class RepositoriesDarcsControllerTest < ActionController::TestCase fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules # No '..' in the repository path diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index 6c2502f51..37c6fb848 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -21,7 +21,7 @@ require 'repositories_controller' # Re-raise errors caught by the controller. class RepositoriesController; def rescue_action(e) raise e end; end -class RepositoriesGitControllerTest < Test::Unit::TestCase +class RepositoriesGitControllerTest < ActionController::TestCase fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules # No '..' in the repository path diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb index ec2526550..f2639ee92 100644 --- a/test/functional/repositories_mercurial_controller_test.rb +++ b/test/functional/repositories_mercurial_controller_test.rb @@ -21,7 +21,7 @@ require 'repositories_controller' # Re-raise errors caught by the controller. class RepositoriesController; def rescue_action(e) raise e end; end -class RepositoriesMercurialControllerTest < Test::Unit::TestCase +class RepositoriesMercurialControllerTest < ActionController::TestCase fixtures :projects, :users, :roles, :members, :member_roles, :repositories, :enabled_modules # No '..' in the repository path diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb index fe1b3dbe5..865bae35c 100644 --- a/test/functional/repositories_subversion_controller_test.rb +++ b/test/functional/repositories_subversion_controller_test.rb @@ -21,7 +21,7 @@ require 'repositories_controller' # Re-raise errors caught by the controller. class RepositoriesController; def rescue_action(e) raise e end; end -class RepositoriesSubversionControllerTest < Test::Unit::TestCase +class RepositoriesSubversionControllerTest < ActionController::TestCase fixtures :projects, :users, :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/roles_controller_test.rb b/test/functional/roles_controller_test.rb index 61e9bd6df..200408837 100644 --- a/test/functional/roles_controller_test.rb +++ b/test/functional/roles_controller_test.rb @@ -21,7 +21,7 @@ require 'roles_controller' # Re-raise errors caught by the controller. class RolesController; def rescue_action(e) raise e end; end -class RolesControllerTest < Test::Unit::TestCase +class RolesControllerTest < ActionController::TestCase fixtures :roles, :users, :members, :member_roles, :workflows def setup diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb index 4f79081ae..b062468a6 100644 --- a/test/functional/search_controller_test.rb +++ b/test/functional/search_controller_test.rb @@ -4,7 +4,7 @@ require 'search_controller' # Re-raise errors caught by the controller. class SearchController; def rescue_action(e) raise e end; end -class SearchControllerTest < Test::Unit::TestCase +class SearchControllerTest < ActionController::TestCase fixtures :projects, :enabled_modules, :roles, :users, :members, :member_roles, :issues, :trackers, :issue_statuses, :custom_fields, :custom_values, diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb index 0e919a741..1e0c48f0e 100644 --- a/test/functional/settings_controller_test.rb +++ b/test/functional/settings_controller_test.rb @@ -21,7 +21,7 @@ require 'settings_controller' # Re-raise errors caught by the controller. class SettingsController; def rescue_action(e) raise e end; end -class SettingsControllerTest < Test::Unit::TestCase +class SettingsControllerTest < ActionController::TestCase fixtures :users def setup diff --git a/test/functional/sys_controller_test.rb b/test/functional/sys_controller_test.rb index db9dd2aa3..59b1d2af6 100644 --- a/test/functional/sys_controller_test.rb +++ b/test/functional/sys_controller_test.rb @@ -21,7 +21,7 @@ require 'sys_controller' # Re-raise errors caught by the controller. class SysController; def rescue_action(e) raise e end; end -class SysControllerTest < Test::Unit::TestCase +class SysControllerTest < ActionController::TestCase fixtures :projects, :repositories def setup diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index df80f5d5a..371fded18 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -21,7 +21,7 @@ require 'timelog_controller' # Re-raise errors caught by the controller. class TimelogController; def rescue_action(e) raise e end; end -class TimelogControllerTest < Test::Unit::TestCase +class TimelogControllerTest < ActionController::TestCase fixtures :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses, :custom_fields, :custom_values def setup diff --git a/test/functional/trackers_controller_test.rb b/test/functional/trackers_controller_test.rb index e2109ba6f..ec412245a 100644 --- a/test/functional/trackers_controller_test.rb +++ b/test/functional/trackers_controller_test.rb @@ -21,7 +21,7 @@ require 'trackers_controller' # Re-raise errors caught by the controller. class TrackersController; def rescue_action(e) raise e end; end -class TrackersControllerTest < Test::Unit::TestCase +class TrackersControllerTest < ActionController::TestCase fixtures :trackers, :projects, :projects_trackers, :users, :issues def setup diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index 5f62b1549..df87462a8 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -21,7 +21,7 @@ require 'users_controller' # Re-raise errors caught by the controller. class UsersController; def rescue_action(e) raise e end; end -class UsersControllerTest < Test::Unit::TestCase +class UsersControllerTest < ActionController::TestCase include Redmine::I18n fixtures :users, :projects, :members, :member_roles, :roles diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb index 3d212def3..4343b887a 100644 --- a/test/functional/versions_controller_test.rb +++ b/test/functional/versions_controller_test.rb @@ -21,7 +21,7 @@ require 'versions_controller' # Re-raise errors caught by the controller. class VersionsController; def rescue_action(e) raise e end; end -class VersionsControllerTest < Test::Unit::TestCase +class VersionsControllerTest < ActionController::TestCase fixtures :projects, :versions, :issues, :users, :roles, :members, :member_roles, :enabled_modules def setup diff --git a/test/functional/watchers_controller_test.rb b/test/functional/watchers_controller_test.rb index 275599f9b..3b48767b9 100644 --- a/test/functional/watchers_controller_test.rb +++ b/test/functional/watchers_controller_test.rb @@ -21,7 +21,7 @@ require 'watchers_controller' # Re-raise errors caught by the controller. class WatchersController; def rescue_action(e) raise e end; end -class WatchersControllerTest < Test::Unit::TestCase +class WatchersControllerTest < ActionController::TestCase 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 0376fd857..5fef176ab 100644 --- a/test/functional/welcome_controller_test.rb +++ b/test/functional/welcome_controller_test.rb @@ -21,7 +21,7 @@ require 'welcome_controller' # Re-raise errors caught by the controller. class WelcomeController; def rescue_action(e) raise e end; end -class WelcomeControllerTest < Test::Unit::TestCase +class WelcomeControllerTest < ActionController::TestCase fixtures :projects, :news def setup diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb index 9d104c527..cf247db80 100644 --- a/test/functional/wiki_controller_test.rb +++ b/test/functional/wiki_controller_test.rb @@ -21,7 +21,7 @@ require 'wiki_controller' # Re-raise errors caught by the controller. class WikiController; def rescue_action(e) raise e end; end -class WikiControllerTest < Test::Unit::TestCase +class WikiControllerTest < ActionController::TestCase fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions, :attachments def setup diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb index 7a5634f1d..dc7df4d95 100644 --- a/test/functional/wikis_controller_test.rb +++ b/test/functional/wikis_controller_test.rb @@ -21,7 +21,7 @@ require 'wikis_controller' # Re-raise errors caught by the controller. class WikisController; def rescue_action(e) raise e end; end -class WikisControllerTest < Test::Unit::TestCase +class WikisControllerTest < ActionController::TestCase 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 d6078bbb9..19187b7fe 100644 --- a/test/functional/workflows_controller_test.rb +++ b/test/functional/workflows_controller_test.rb @@ -21,7 +21,7 @@ require 'workflows_controller' # Re-raise errors caught by the controller. class WorkflowsController; def rescue_action(e) raise e end; end -class WorkflowsControllerTest < Test::Unit::TestCase +class WorkflowsControllerTest < ActionController::TestCase fixtures :roles, :trackers, :workflows def setup |