Revert "Reorganized app/test directory. [#3057 state:resolved]"

This reverts commit a0dc6755db71b33aebccdb95fd0dd7097c934c04.

1 files changed, 4 insertions, 4 deletions

diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 3cc3d49ee9..77ed63b1bb 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -54,7 +54,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   def test_helper_are_invoked_with_a_pluralized_name
     run_generator
     assert_file "app/helpers/users_helper.rb", /module UsersHelper/
-    assert_file "test/helpers/users_helper_test.rb", /class UsersHelperTest < ActionView::TestCase/
+    assert_file "test/unit/helpers/users_helper_test.rb", /class UsersHelperTest < ActionView::TestCase/
   end
 
   def test_views_are_generated
@@ -72,7 +72,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   def test_functional_tests
     run_generator
 
-    assert_file "test/controllers/users_controller_test.rb" do |content|
+    assert_file "test/functional/users_controller_test.rb" do |content|
       assert_match /class UsersControllerTest < ActionController::TestCase/, content
       assert_match /test "should get index"/, content
     end
@@ -85,7 +85,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       assert_no_match /def index/, content
     end
 
-    assert_file "test/controllers/users_controller_test.rb" do |content|
+    assert_file "test/functional/users_controller_test.rb" do |content|
       assert_no_match /test "should get index"/, content
     end
 
@@ -95,7 +95,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   def test_skip_helper_if_required
     run_generator ["User", "name:string", "age:integer", "--no-helper"]
     assert_no_file "app/helpers/users_helper.rb"
-    assert_no_file "test/helpers/users_helper_test.rb"
+    assert_no_file "test/unit/helpers/users_helper_test.rb"
   end
 
   def test_skip_layout_if_required