aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test/application')
-rw-r--r--railties/test/application/console_test.rb4
-rw-r--r--railties/test/application/test_test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index a72e6916dd..25b4a21902 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -17,14 +17,14 @@ class ConsoleTest < Test::Unit::TestCase
load_environment
console_session = app
assert_not_nil console_session
- assert_instance_of ActionController::Integration::Session, console_session
+ assert_instance_of ActionDispatch::Integration::Session, console_session
end
def test_new_session_should_return_integration_session
load_environment
session = new_session
assert_not_nil session
- assert_instance_of ActionController::Integration::Session, session
+ assert_instance_of ActionDispatch::Integration::Session, session
end
def test_reload_should_fire_preparation_callbacks
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index de316a6fd0..1fbbb40132 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -53,7 +53,7 @@ module ApplicationTests
app_file 'test/integration/posts_test.rb', <<-RUBY
require 'test_helper'
- class PostsTest < ActionController::IntegrationTest
+ class PostsTest < ActionDispatch::IntegrationTest
def test_index
get '/posts'
assert_response :success