Merged rails-4.1 branch (#14534).

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

45 files changed, 46 insertions, 46 deletions

diff --git a/test/integration/routing/account_test.rb b/test/integration/routing/account_test.rb
index 7f6a9c981..c6d331ec0 100644
--- a/test/integration/routing/account_test.rb
+++ b/test/integration/routing/account_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingAccountTest < ActionController::IntegrationTest
+class RoutingAccountTest < ActionDispatch::IntegrationTest
   def test_account
     ["get", "post"].each do |method|
       assert_routing(
diff --git a/test/integration/routing/activities_test.rb b/test/integration/routing/activities_test.rb
index 4cab5fbcb..d5b543f40 100644
--- a/test/integration/routing/activities_test.rb
+++ b/test/integration/routing/activities_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingActivitiesTest < ActionController::IntegrationTest
+class RoutingActivitiesTest < ActionDispatch::IntegrationTest
   def test_activities
     assert_routing(
            { :method => 'get', :path => "/activity" },
diff --git a/test/integration/routing/admin_test.rb b/test/integration/routing/admin_test.rb
index 6e9f90f8c..553ebd6b6 100644
--- a/test/integration/routing/admin_test.rb
+++ b/test/integration/routing/admin_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingAdminTest < ActionController::IntegrationTest
+class RoutingAdminTest < ActionDispatch::IntegrationTest
   def test_administration_panel
     assert_routing(
         { :method => 'get', :path => "/admin" },
diff --git a/test/integration/routing/attachments_test.rb b/test/integration/routing/attachments_test.rb
index 1d7aabe26..2d5f03241 100644
--- a/test/integration/routing/attachments_test.rb
+++ b/test/integration/routing/attachments_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingAttachmentsTest < ActionController::IntegrationTest
+class RoutingAttachmentsTest < ActionDispatch::IntegrationTest
   def test_attachments
     assert_routing(
            { :method => 'get', :path => "/attachments/1" },
diff --git a/test/integration/routing/auth_sources_test.rb b/test/integration/routing/auth_sources_test.rb
index 8b73f1f97..1a9605018 100644
--- a/test/integration/routing/auth_sources_test.rb
+++ b/test/integration/routing/auth_sources_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingAuthSourcesTest < ActionController::IntegrationTest
+class RoutingAuthSourcesTest < ActionDispatch::IntegrationTest
   def test_auth_sources
     assert_routing(
         { :method => 'get', :path => "/auth_sources" },
diff --git a/test/integration/routing/auto_completes_test.rb b/test/integration/routing/auto_completes_test.rb
index c767fcf1c..4b717fc69 100644
--- a/test/integration/routing/auto_completes_test.rb
+++ b/test/integration/routing/auto_completes_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingAutoCompletesTest < ActionController::IntegrationTest
+class RoutingAutoCompletesTest < ActionDispatch::IntegrationTest
   def test_auto_completes
     assert_routing(
         { :method => 'get', :path => "/issues/auto_complete" },
diff --git a/test/integration/routing/boards_test.rb b/test/integration/routing/boards_test.rb
index d730f3764..6551181c5 100644
--- a/test/integration/routing/boards_test.rb
+++ b/test/integration/routing/boards_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingBoardsTest < ActionController::IntegrationTest
+class RoutingBoardsTest < ActionDispatch::IntegrationTest
   def test_boards
     assert_routing(
         { :method => 'get', :path => "/projects/world_domination/boards" },
diff --git a/test/integration/routing/calendars_test.rb b/test/integration/routing/calendars_test.rb
index ddb384c3d..9e8dfd15b 100644
--- a/test/integration/routing/calendars_test.rb
+++ b/test/integration/routing/calendars_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingCalendarsTest < ActionController::IntegrationTest
+class RoutingCalendarsTest < ActionDispatch::IntegrationTest
   def test_calendars
     assert_routing(
         { :method => 'get', :path => "/issues/calendar" },
diff --git a/test/integration/routing/comments_test.rb b/test/integration/routing/comments_test.rb
index 94e33c79c..cd5e259ac 100644
--- a/test/integration/routing/comments_test.rb
+++ b/test/integration/routing/comments_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingCommentsTest < ActionController::IntegrationTest
+class RoutingCommentsTest < ActionDispatch::IntegrationTest
   def test_comments
     assert_routing(
         { :method => 'post', :path => "/news/567/comments" },
diff --git a/test/integration/routing/context_menus_test.rb b/test/integration/routing/context_menus_test.rb
index 1d4be08fa..caee1ca25 100644
--- a/test/integration/routing/context_menus_test.rb
+++ b/test/integration/routing/context_menus_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingContextMenusTest < ActionController::IntegrationTest
+class RoutingContextMenusTest < ActionDispatch::IntegrationTest
   def test_context_menus_time_entries
     ["get", "post"].each do |method|
       assert_routing(
diff --git a/test/integration/routing/custom_fields_test.rb b/test/integration/routing/custom_fields_test.rb
index c1901d826..6649ecf01 100644
--- a/test/integration/routing/custom_fields_test.rb
+++ b/test/integration/routing/custom_fields_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingCustomFieldsTest < ActionController::IntegrationTest
+class RoutingCustomFieldsTest < ActionDispatch::IntegrationTest
   def test_custom_fields
     assert_routing(
         { :method => 'get', :path => "/custom_fields" },
diff --git a/test/integration/routing/documents_test.rb b/test/integration/routing/documents_test.rb
index 285f64f59..5efbeb10e 100644
--- a/test/integration/routing/documents_test.rb
+++ b/test/integration/routing/documents_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingDocumentsTest < ActionController::IntegrationTest
+class RoutingDocumentsTest < ActionDispatch::IntegrationTest
   def test_documents_scoped_under_project
     assert_routing(
         { :method => 'get', :path => "/projects/567/documents" },
diff --git a/test/integration/routing/enumerations_test.rb b/test/integration/routing/enumerations_test.rb
index 9b0676494..8b577e159 100644
--- a/test/integration/routing/enumerations_test.rb
+++ b/test/integration/routing/enumerations_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingEnumerationsTest < ActionController::IntegrationTest
+class RoutingEnumerationsTest < ActionDispatch::IntegrationTest
   def test_enumerations
     assert_routing(
         { :method => 'get', :path => "/enumerations" },
diff --git a/test/integration/routing/files_test.rb b/test/integration/routing/files_test.rb
index 9f5c8de33..ea6a5aae0 100644
--- a/test/integration/routing/files_test.rb
+++ b/test/integration/routing/files_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingFilesTest < ActionController::IntegrationTest
+class RoutingFilesTest < ActionDispatch::IntegrationTest
   def test_files
     assert_routing(
         { :method => 'get', :path => "/projects/33/files" },
diff --git a/test/integration/routing/gantts_test.rb b/test/integration/routing/gantts_test.rb
index e9448edd9..c2c626c0e 100644
--- a/test/integration/routing/gantts_test.rb
+++ b/test/integration/routing/gantts_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingGanttsTest < ActionController::IntegrationTest
+class RoutingGanttsTest < ActionDispatch::IntegrationTest
   def test_gantts
     assert_routing(
         { :method => 'get', :path => "/issues/gantt" },
diff --git a/test/integration/routing/groups_test.rb b/test/integration/routing/groups_test.rb
index cef388789..c89d9c9ae 100644
--- a/test/integration/routing/groups_test.rb
+++ b/test/integration/routing/groups_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingGroupsTest < ActionController::IntegrationTest
+class RoutingGroupsTest < ActionDispatch::IntegrationTest
   def test_groups_resources
     assert_routing(
         { :method => 'get', :path => "/groups" },
diff --git a/test/integration/routing/issue_categories_test.rb b/test/integration/routing/issue_categories_test.rb
index 537847be9..10f23bae9 100644
--- a/test/integration/routing/issue_categories_test.rb
+++ b/test/integration/routing/issue_categories_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingIssueCategoriesTest < ActionController::IntegrationTest
+class RoutingIssueCategoriesTest < ActionDispatch::IntegrationTest
   def test_issue_categories_scoped_under_project
     assert_routing(
         { :method => 'get', :path => "/projects/foo/issue_categories" },
diff --git a/test/integration/routing/issue_relations_test.rb b/test/integration/routing/issue_relations_test.rb
index 0588c3530..a9bcbf601 100644
--- a/test/integration/routing/issue_relations_test.rb
+++ b/test/integration/routing/issue_relations_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingIssueRelationsTest < ActionController::IntegrationTest
+class RoutingIssueRelationsTest < ActionDispatch::IntegrationTest
   def test_issue_relations
     assert_routing(
         { :method => 'get', :path => "/issues/1/relations" },
diff --git a/test/integration/routing/issue_statuses_test.rb b/test/integration/routing/issue_statuses_test.rb
index f03b9668f..550fe9379 100644
--- a/test/integration/routing/issue_statuses_test.rb
+++ b/test/integration/routing/issue_statuses_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingIssueStatusesTest < ActionController::IntegrationTest
+class RoutingIssueStatusesTest < ActionDispatch::IntegrationTest
   def test_issue_statuses
     assert_routing(
         { :method => 'get', :path => "/issue_statuses" },
diff --git a/test/integration/routing/issues_test.rb b/test/integration/routing/issues_test.rb
index 0c7328a99..0dc3c163f 100644
--- a/test/integration/routing/issues_test.rb
+++ b/test/integration/routing/issues_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingIssuesTest < ActionController::IntegrationTest
+class RoutingIssuesTest < ActionDispatch::IntegrationTest
   def test_issues_rest_actions
     assert_routing(
         { :method => 'get', :path => "/issues" },
diff --git a/test/integration/routing/journals_test.rb b/test/integration/routing/journals_test.rb
index 0731163ca..390e77425 100644
--- a/test/integration/routing/journals_test.rb
+++ b/test/integration/routing/journals_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingJournalsTest < ActionController::IntegrationTest
+class RoutingJournalsTest < ActionDispatch::IntegrationTest
   def test_journals
     assert_routing(
         { :method => 'post', :path => "/issues/1/quoted" },
diff --git a/test/integration/routing/mail_handler_test.rb b/test/integration/routing/mail_handler_test.rb
index 8ff55b189..8abb5369a 100644
--- a/test/integration/routing/mail_handler_test.rb
+++ b/test/integration/routing/mail_handler_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingMailHandlerTest < ActionController::IntegrationTest
+class RoutingMailHandlerTest < ActionDispatch::IntegrationTest
   def test_mail_handler
     assert_routing(
         { :method => "post", :path => "/mail_handler" },
diff --git a/test/integration/routing/members_test.rb b/test/integration/routing/members_test.rb
index e249af7a3..20de5662b 100644
--- a/test/integration/routing/members_test.rb
+++ b/test/integration/routing/members_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingMembersTest < ActionController::IntegrationTest
+class RoutingMembersTest < ActionDispatch::IntegrationTest
   def test_members
     assert_routing(
         { :method => 'get', :path => "/projects/5234/memberships.xml" },
diff --git a/test/integration/routing/messages_test.rb b/test/integration/routing/messages_test.rb
index a6b84886b..696bc86a6 100644
--- a/test/integration/routing/messages_test.rb
+++ b/test/integration/routing/messages_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingMessagesTest < ActionController::IntegrationTest
+class RoutingMessagesTest < ActionDispatch::IntegrationTest
   def test_messages
     assert_routing(
         { :method => 'get', :path => "/boards/22/topics/2" },
diff --git a/test/integration/routing/my_test.rb b/test/integration/routing/my_test.rb
index 230babcdd..0f5f3e24b 100644
--- a/test/integration/routing/my_test.rb
+++ b/test/integration/routing/my_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingMyTest < ActionController::IntegrationTest
+class RoutingMyTest < ActionDispatch::IntegrationTest
   def test_my
     ["get", "post"].each do |method|
       assert_routing(
diff --git a/test/integration/routing/news_test.rb b/test/integration/routing/news_test.rb
index a5843d50b..a1ee7b12b 100644
--- a/test/integration/routing/news_test.rb
+++ b/test/integration/routing/news_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingNewsTest < ActionController::IntegrationTest
+class RoutingNewsTest < ActionDispatch::IntegrationTest
   def test_news_index
     assert_routing(
         { :method => 'get', :path => "/news" },
diff --git a/test/integration/routing/previews_test.rb b/test/integration/routing/previews_test.rb
index f0f4e5279..fcdcfe5bd 100644
--- a/test/integration/routing/previews_test.rb
+++ b/test/integration/routing/previews_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingPreviewsTest < ActionController::IntegrationTest
+class RoutingPreviewsTest < ActionDispatch::IntegrationTest
   def test_previews
     ["get", "post", "put"].each do |method|
       assert_routing(
diff --git a/test/integration/routing/project_enumerations_test.rb b/test/integration/routing/project_enumerations_test.rb
index 4065d0b10..3eda2c481 100644
--- a/test/integration/routing/project_enumerations_test.rb
+++ b/test/integration/routing/project_enumerations_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingProjectEnumerationsTest < ActionController::IntegrationTest
+class RoutingProjectEnumerationsTest < ActionDispatch::IntegrationTest
   def test_project_enumerations
     assert_routing(
         { :method => 'put', :path => "/projects/64/enumerations" },
diff --git a/test/integration/routing/projects_test.rb b/test/integration/routing/projects_test.rb
index eb3319385..392b871d1 100644
--- a/test/integration/routing/projects_test.rb
+++ b/test/integration/routing/projects_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingProjectsTest < ActionController::IntegrationTest
+class RoutingProjectsTest < ActionDispatch::IntegrationTest
   def test_projects
     assert_routing(
         { :method => 'get', :path => "/projects" },
diff --git a/test/integration/routing/queries_test.rb b/test/integration/routing/queries_test.rb
index f7265a8b9..ac50fbca7 100644
--- a/test/integration/routing/queries_test.rb
+++ b/test/integration/routing/queries_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingQueriesTest < ActionController::IntegrationTest
+class RoutingQueriesTest < ActionDispatch::IntegrationTest
   def test_queries
     assert_routing(
         { :method => 'get', :path => "/queries.xml" },
diff --git a/test/integration/routing/reports_test.rb b/test/integration/routing/reports_test.rb
index db8a865c7..2483682f4 100644
--- a/test/integration/routing/reports_test.rb
+++ b/test/integration/routing/reports_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingReportsTest < ActionController::IntegrationTest
+class RoutingReportsTest < ActionDispatch::IntegrationTest
   def test_reports
     assert_routing(
         { :method => 'get', :path => "/projects/567/issues/report" },
diff --git a/test/integration/routing/repositories_test.rb b/test/integration/routing/repositories_test.rb
index c5c6ee24f..0e46cb95c 100644
--- a/test/integration/routing/repositories_test.rb
+++ b/test/integration/routing/repositories_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingRepositoriesTest < ActionController::IntegrationTest
+class RoutingRepositoriesTest < ActionDispatch::IntegrationTest
   def setup
     @path_hash  = repository_path_hash(%w[path to file.c])
     assert_equal "path/to/file.c", @path_hash[:path]
diff --git a/test/integration/routing/roles_test.rb b/test/integration/routing/roles_test.rb
index 962edcb92..5541984f3 100644
--- a/test/integration/routing/roles_test.rb
+++ b/test/integration/routing/roles_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingRolesTest < ActionController::IntegrationTest
+class RoutingRolesTest < ActionDispatch::IntegrationTest
   def test_roles
     assert_routing(
         { :method => 'get', :path => "/roles" },
diff --git a/test/integration/routing/search_test.rb b/test/integration/routing/search_test.rb
index 96c2ac2d8..6ea40fd73 100644
--- a/test/integration/routing/search_test.rb
+++ b/test/integration/routing/search_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingSearchTest < ActionController::IntegrationTest
+class RoutingSearchTest < ActionDispatch::IntegrationTest
   def test_search
     assert_routing(
         { :method => 'get', :path => "/search" },
diff --git a/test/integration/routing/settings_test.rb b/test/integration/routing/settings_test.rb
index c36989c23..4cc986d27 100644
--- a/test/integration/routing/settings_test.rb
+++ b/test/integration/routing/settings_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingSettingsTest < ActionController::IntegrationTest
+class RoutingSettingsTest < ActionDispatch::IntegrationTest
   def test_settings
     assert_routing(
         { :method => 'get', :path => "/settings" },
diff --git a/test/integration/routing/sys_test.rb b/test/integration/routing/sys_test.rb
index 6b9afe63b..65a325367 100644
--- a/test/integration/routing/sys_test.rb
+++ b/test/integration/routing/sys_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingSysTest < ActionController::IntegrationTest
+class RoutingSysTest < ActionDispatch::IntegrationTest
   def test_sys
     assert_routing(
         { :method => 'get', :path => "/sys/projects" },
diff --git a/test/integration/routing/timelog_test.rb b/test/integration/routing/timelog_test.rb
index 96bbfeb39..963e16975 100644
--- a/test/integration/routing/timelog_test.rb
+++ b/test/integration/routing/timelog_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingTimelogsTest < ActionController::IntegrationTest
+class RoutingTimelogsTest < ActionDispatch::IntegrationTest
   def test_timelogs_global
     assert_routing(
         { :method => 'get', :path => "/time_entries" },
diff --git a/test/integration/routing/trackers_test.rb b/test/integration/routing/trackers_test.rb
index afefbee43..338197d8c 100644
--- a/test/integration/routing/trackers_test.rb
+++ b/test/integration/routing/trackers_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingTrackersTest < ActionController::IntegrationTest
+class RoutingTrackersTest < ActionDispatch::IntegrationTest
   def test_trackers
     assert_routing(
         { :method => 'get', :path => "/trackers" },
diff --git a/test/integration/routing/users_test.rb b/test/integration/routing/users_test.rb
index db9a8dd64..dbdcbcc65 100644
--- a/test/integration/routing/users_test.rb
+++ b/test/integration/routing/users_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingUsersTest < ActionController::IntegrationTest
+class RoutingUsersTest < ActionDispatch::IntegrationTest
   def test_users
     assert_routing(
         { :method => 'get', :path => "/users" },
diff --git a/test/integration/routing/versions_test.rb b/test/integration/routing/versions_test.rb
index d347603d0..28a7969c9 100644
--- a/test/integration/routing/versions_test.rb
+++ b/test/integration/routing/versions_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingVersionsTest < ActionController::IntegrationTest
+class RoutingVersionsTest < ActionDispatch::IntegrationTest
   def test_roadmap
     # /projects/foo/versions is /projects/foo/roadmap
     assert_routing(
diff --git a/test/integration/routing/watchers_test.rb b/test/integration/routing/watchers_test.rb
index 2715d7708..be35d5667 100644
--- a/test/integration/routing/watchers_test.rb
+++ b/test/integration/routing/watchers_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingWatchersTest < ActionController::IntegrationTest
+class RoutingWatchersTest < ActionDispatch::IntegrationTest
   def test_watchers
     assert_routing(
         { :method => 'get', :path => "/watchers/new" },
diff --git a/test/integration/routing/welcome_test.rb b/test/integration/routing/welcome_test.rb
index f873002b0..2c2a32213 100644
--- a/test/integration/routing/welcome_test.rb
+++ b/test/integration/routing/welcome_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingWelcomeTest < ActionController::IntegrationTest
+class RoutingWelcomeTest < ActionDispatch::IntegrationTest
   def test_welcome
     assert_routing(
         { :method => 'get', :path => "/" },
diff --git a/test/integration/routing/wiki_test.rb b/test/integration/routing/wiki_test.rb
index 0d1924758..f677856a8 100644
--- a/test/integration/routing/wiki_test.rb
+++ b/test/integration/routing/wiki_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingWikiTest < ActionController::IntegrationTest
+class RoutingWikiTest < ActionDispatch::IntegrationTest
   def test_wiki_matching
     assert_routing(
         { :method => 'get', :path => "/projects/567/wiki" },
@@ -54,7 +54,7 @@ class RoutingWikiTest < ActionController::IntegrationTest
            :id => 'CookBook_documentation', :version => '2' }
        )
     # Make sure we don't route wiki page sub-uris to let plugins handle them
-    assert_raise(ActionController::RoutingError) do
+    assert_raise(Minitest::Assertion) do
       assert_recognizes({}, {:method => 'get', :path => "/projects/1/wiki/CookBook_documentation/whatever"})
     end
   end
diff --git a/test/integration/routing/wikis_test.rb b/test/integration/routing/wikis_test.rb
index 1fbc6727b..98c83d0a0 100644
--- a/test/integration/routing/wikis_test.rb
+++ b/test/integration/routing/wikis_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingWikisTest < ActionController::IntegrationTest
+class RoutingWikisTest < ActionDispatch::IntegrationTest
   def test_wikis_plural_admin_setup
     ["get", "post"].each do |method|
       assert_routing(
diff --git a/test/integration/routing/workflows_test.rb b/test/integration/routing/workflows_test.rb
index cfa19a2f9..828b827e9 100644
--- a/test/integration/routing/workflows_test.rb
+++ b/test/integration/routing/workflows_test.rb
@@ -17,7 +17,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingWorkflowsTest < ActionController::IntegrationTest
+class RoutingWorkflowsTest < ActionDispatch::IntegrationTest
   def test_workflows
     assert_routing(
         { :method => 'get', :path => "/workflows" },