diff options
| author | José Valim <jose.valim@gmail.com> | 2010-05-29 22:29:14 +0200 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-06-03 23:32:10 +1000 |
| commit | 2740943634fe151fb3fb87e2af7881a93f5dd6b5 (patch) | |
| tree | 4916366ccf706c49f7e2082a406a2a90471dff79 /railties/test | |
| parent | 27939bd753b79c8205d1d3c1cdc7db6205642302 (diff) | |
| download | rails-2740943634fe151fb3fb87e2af7881a93f5dd6b5.tar.gz rails-2740943634fe151fb3fb87e2af7881a93f5dd6b5.tar.bz2 rails-2740943634fe151fb3fb87e2af7881a93f5dd6b5.zip | |
Remove the laziness from the middleware stack.
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/middleware_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/integration_test_generator_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/performance_test_generator_test.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index 78e7c39660..bab17d8af5 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -164,7 +164,7 @@ module ApplicationTests end def middleware - AppTemplate::Application.middleware.active.map(&:klass).map(&:name) + AppTemplate::Application.middleware.map(&:klass).map(&:name) end def remote_ip(env = {}) diff --git a/railties/test/generators/integration_test_generator_test.rb b/railties/test/generators/integration_test_generator_test.rb index cf282a0911..d05ed76d24 100644 --- a/railties/test/generators/integration_test_generator_test.rb +++ b/railties/test/generators/integration_test_generator_test.rb @@ -7,6 +7,6 @@ class IntegrationTestGeneratorTest < Rails::Generators::TestCase def test_integration_test_skeleton_is_created run_generator - assert_file "test/integration/integration_test.rb", /class IntegrationTest < ActionController::IntegrationTest/ + assert_file "test/integration/integration_test.rb", /class IntegrationTest < ActionDispatch::IntegrationTest/ end end diff --git a/railties/test/generators/performance_test_generator_test.rb b/railties/test/generators/performance_test_generator_test.rb index 8fda83b36f..37f9857193 100644 --- a/railties/test/generators/performance_test_generator_test.rb +++ b/railties/test/generators/performance_test_generator_test.rb @@ -7,6 +7,6 @@ class PerformanceTestGeneratorTest < Rails::Generators::TestCase def test_performance_test_skeleton_is_created run_generator - assert_file "test/performance/performance_test.rb", /class PerformanceTest < ActionController::PerformanceTest/ + assert_file "test/performance/performance_test.rb", /class PerformanceTest < ActionDispatch::PerformanceTest/ end end |