From d8399d3e188f2786c7a90661b7c806eb1ee7612b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 8 Jul 2013 22:57:53 +0100 Subject: [PATCH] IntegrationTest is now in ActionDispatch not ActionController --- test/integration/client_application_test.rb | 2 +- test/integration/cors_test.rb | 2 +- test/integration/oauth_test.rb | 2 +- test/integration/short_links_test.rb | 2 +- test/integration/user_blocks_test.rb | 2 +- test/integration/user_creation_test.rb | 2 +- test/integration/user_diaries_test.rb | 2 +- test/integration/user_login_test.rb | 2 +- test/integration/user_roles_test.rb | 2 +- test/integration/user_terms_seen_test.rb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb index f34a9c430..fd6f5ecfa 100644 --- 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 b1323c819..fa4821b7a 100644 --- 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 2bda77379..11b874e6b 100644 --- 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 d4f6f8abc..aec204e71 100644 --- 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 fda9de6f7..94ec46e0a 100644 --- 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 76397ae28..179f9eae1 100644 --- 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 23687fa8e..79436a7db 100644 --- 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 cd6762dca..1d7e429cf 100644 --- 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 948bb895c..3d2fab4d0 100644 --- 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 64a101024..d1841f507 100644 --- 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) -- 2.43.2