1 files changed, 26 insertions, 7 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index ce29d93d6e..1ac2b4cde0 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -42,6 +42,7 @@ DEFAULT_APP_FILES = %w(
   test/helpers
   test/mailers
   test/integration
+  test/system
   vendor
   tmp
   tmp/cache
@@ -339,7 +340,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
   def test_generator_defaults_to_puma_version
     run_generator [destination_root]
-    assert_gem "puma", "'~> 3.0'"
+    assert_gem "puma", "'~> 3.7'"
   end
 
   def test_generator_if_skip_puma_is_given
@@ -421,7 +422,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
   def test_generator_if_skip_yarn_is_given
     run_generator [destination_root, "--skip-yarn"]
 
-    assert_no_file "vendor/package.json"
+    assert_no_file "package.json"
     assert_no_file "bin/yarn"
   end
 
@@ -496,21 +497,21 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
   def test_generator_for_yarn
     run_generator([destination_root])
-    assert_file "vendor/package.json", /dependencies/
+    assert_file "package.json", /dependencies/
     assert_file "config/initializers/assets.rb", /node_modules/
   end
 
   def test_generator_for_yarn_skipped
     run_generator([destination_root, "--skip-yarn"])
-    assert_no_file "vendor/package.json"
+    assert_no_file "package.json"
 
     assert_file "config/initializers/assets.rb" do |content|
       assert_no_match(/node_modules/, content)
     end
 
     assert_file ".gitignore" do |content|
-      assert_no_match(/vendor\/node_modules/, content)
-      assert_no_match(/vendor\/yarn-error\.log/, content)
+      assert_no_match(/node_modules/, content)
+      assert_no_match(/yarn-error\.log/, content)
     end
   end
 
@@ -805,8 +806,26 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_equal 4, @sequence_step
   end
 
-  private
+  def test_system_tests_directory_generated
+    run_generator
 
+    assert_file("test/system/.keep")
+    assert_directory("test/system")
+  end
+
+  def test_system_tests_are_not_generated_on_system_test_skip
+    run_generator [destination_root, "--skip-system-test"]
+
+    assert_no_directory("test/system")
+  end
+
+  def test_system_tests_are_not_generated_on_test_skip
+    run_generator [destination_root, "--skip-test"]
+
+    assert_no_directory("test/system")
+  end
+
+  private
     def stub_rails_application(root)
       Rails.application.config.root = root
       Rails.application.class.stub(:name, "Myapp") do