From a6d907e5880e15c641fc457f7e96187fe1e8509d Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sun, 9 Apr 2017 10:48:56 +0900
Subject: [PATCH] Don't generate system test files if `skip_system_test` option
 is specified

---
 .../rails/app/templates/config/application.rb         |  4 ++++
 railties/test/generators/app_generator_test.rb        | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index d5d214052f7b4..0b1d22228ed95 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -34,6 +34,10 @@ class Application < Rails::Application
     # Middleware like session, flash, cookies can be added back manually.
     # Skip views, helpers and assets when generating a new resource.
     config.api_only = true
+<%- elsif !depends_on_system_test? -%>
+
+    # Don't generate system test files.
+    config.generators.system_tests = nil
 <%- end -%>
   end
 end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 7965bd68d0bae..001671438368a 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -452,6 +452,17 @@ def test_generator_if_skip_system_test_is_given
     end
   end
 
+  def test_does_not_generate_system_test_files_if_skip_system_test_is_given
+    run_generator [destination_root, "--skip_system_test"]
+
+    Dir.chdir(destination_root) do
+      quietly { `./bin/rails g scaffold User` }
+
+      assert_no_file("test/application_system_test_case.rb")
+      assert_no_file("test/system/users_test.rb")
+    end
+  end
+
   def test_generator_if_api_is_given
     run_generator [destination_root, "--api"]
     assert_file "Gemfile" do |content|