cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IntegrationTest is now in ActionDispatch not ActionController

Browse source
This commit is contained in:
Tom Hughes 2013-07-08 22:57:53 +01:00
parent bd8d207ea4
commit d8399d3e18
10 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/integration/client_application_test.rb
View file

@ -1,6 +1,6 @@
require File.dirname(__FILE__) + '/../test_helper'
class ClientApplicationTest < ActionController::IntegrationTest
class ClientApplicationTest < ActionDispatch::IntegrationTest
fixtures :users, :client_applications
##

2
test/integration/cors_test.rb
View file

@ -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)

2
test/integration/oauth_test.rb
View file

@ -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

2
test/integration/short_links_test.rb
View file

@ -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.

2
test/integration/user_blocks_test.rb
View file

@ -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)

2
test/integration/user_creation_test.rb
View file

@ -1,6 +1,6 @@
require File.dirname(__FILE__) + '/../test_helper'
class UserCreationTest < ActionController::IntegrationTest
class UserCreationTest < ActionDispatch::IntegrationTest
fixtures :users
def setup

2
test/integration/user_diaries_test.rb
View file

@ -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

2
test/integration/user_login_test.rb
View file

@ -1,6 +1,6 @@
require File.dirname(__FILE__) + '/../test_helper'
class UserLoginTest < ActionController::IntegrationTest
class UserLoginTest < ActionDispatch::IntegrationTest
fixtures :users
def setup

2
test/integration/user_roles_test.rb
View file

@ -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

2
test/integration/user_terms_seen_test.rb
View file

@ -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)