IntegrationTest is now in ActionDispatch not ActionController

diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb
index f34a9c430fbf14463727caa42f8b24b4ccf2e9e1..fd6f5ecfa0f23eec3604f3628c848126bf434fec 100644 (file)
--- a/test/integration/client_application_test.rb
+++ b/test/integration/client_application_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ClientApplicationTest < ActionController::IntegrationTest
+class ClientApplicationTest < ActionDispatch::IntegrationTest
   fixtures :users, :client_applications
 
   ##

diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb
index b1323c8194849bcc40ba2ed491acc290a23223ee..fa4821b7a8eeb8bdc5516029923b20272b0eaccb 100644 (file)
--- a/test/integration/cors_test.rb
+++ b/test/integration/cors_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class CORSTest < ActionController::IntegrationTest
+class CORSTest < ActionDispatch::IntegrationTest
   # Rails 4 adds a built-in `options` method. When we upgrade, we can remove
   # this definition.
   unless instance_methods.include?(:options)

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 2bda77379b46bac15368472528204eb6823eaa4f..11b874e6bed14535fe08d1f30b130e0f5d2075d2 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class OAuthTest < ActionController::IntegrationTest
+class OAuthTest < ActionDispatch::IntegrationTest
   fixtures :users, :client_applications, :gpx_files
 
   include OAuth::Helper

diff --git a/test/integration/short_links_test.rb b/test/integration/short_links_test.rb
index d4f6f8abcc41ddd50944ba6c4c4c671649a0c90f..aec204e71f23f21e22eb8a971e000c3efa8e53ef 100644 (file)
--- a/test/integration/short_links_test.rb
+++ b/test/integration/short_links_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ShortLinksTest < ActionController::IntegrationTest
+class ShortLinksTest < ActionDispatch::IntegrationTest
   ##
   # test the short link with various parameters and ensure they're
   # kept in the redirect.

diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb
index fda9de6f7881cd8568d81356b00e71236740053f..94ec46e0a43f9d251da101f861ff7b6b334c081b 100644 (file)
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserBlocksTest < ActionController::IntegrationTest
+class UserBlocksTest < ActionDispatch::IntegrationTest
   fixtures :users, :user_blocks, :user_roles
 
   def auth_header(user, pass)

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 76397ae28f6c2355d455cf7c33b61c71b5cd7172..179f9eae169f077b60df02ee9b2a2f2cf18e893c 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserCreationTest < ActionController::IntegrationTest
+class UserCreationTest < ActionDispatch::IntegrationTest
   fixtures :users
 
   def setup

diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
index 23687fa8e948646e2195a8af34a0019bc98ad1eb..79436a7db29d15a425e6a738bb4dfff8d4167f6f 100644 (file)
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserDiariesTest < ActionController::IntegrationTest
+class UserDiariesTest < ActionDispatch::IntegrationTest
   fixtures :users, :diary_entries
 
   # Test the creation of a diary entry, making sure that you are redirected to 

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index cd6762dca95704aa04e7ed9b666d7174adea51da..1d7e429cff711b78d4d6a0ee7536aa94d9413834 100644 (file)
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserLoginTest < ActionController::IntegrationTest
+class UserLoginTest < ActionDispatch::IntegrationTest
   fixtures :users
 
   def setup

diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index 948bb895cd10a7c3110ea6f81d85ca5fe3f8713a..3d2fab4d01a8ae677671e42491d6b426dafd2a2b 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserRolesTest < ActionController::IntegrationTest
+class UserRolesTest < ActionDispatch::IntegrationTest
   fixtures :users, :user_roles
 
   test "grant" do

diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb
index 64a101024738c3642bc8d5ebe07efe3accd425d7..d1841f507b9243c71108be79ace909fa1340c6ac 100644 (file)
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserTermsSeenTest < ActionController::IntegrationTest
+class UserTermsSeenTest < ActionDispatch::IntegrationTest
   fixtures :users
 
   def auth_header(user, pass)