From 65344f254cde87950c7f176cb7aa09c002a6f882 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 14 Apr 2019 23:06:32 +0200
Subject: [PATCH] generate config.cache_classes = false if Spring

---
 railties/CHANGELOG.md                             |  5 +++++
 .../app/templates/config/environments/test.rb.tt  | 15 ++++++++++-----
 railties/test/generators/app_generator_test.rb    |  6 ++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 673cfde3d9..109c4836d5 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   New applications get `config.cache_classes = false` in `config/environments/test.rb`
+    unless `--skip-spring`.
+
+    *Xavier Noria*
+
 *   Autoloading during initialization is deprecated.
 
     *Xavier Noria*
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index 63ed3fa952..c66e349442 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -1,11 +1,16 @@
+# The test environment is used exclusively to run your application's
+# test suite. You never need to work with it otherwise. Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs. Don't rely on the data there!
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
-
-  # The test environment is used exclusively to run your application's
-  # test suite. You never need to work with it otherwise. Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs. Don't rely on the data there!
+  <%# Spring executes the reloaders when files change. %>
+  <%- if spring_install? -%>
+  config.cache_classes = false
+  <%- else -%>
   config.cache_classes = true
+  <%- end -%>
 
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 3bdbc70990..69cec60603 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -827,6 +827,9 @@ class AppGeneratorTest < Rails::Generators::TestCase
   def test_spring
     run_generator
     assert_gem "spring"
+    assert_file("config/environments/test.rb") do |contents|
+      assert_match("config.cache_classes = false", contents)
+    end
   end
 
   def test_bundler_binstub
@@ -857,6 +860,9 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
     assert_no_file "config/spring.rb"
     assert_no_gem "spring"
+    assert_file("config/environments/test.rb") do |contents|
+      assert_match("config.cache_classes = true", contents)
+    end
   end
 
   def test_spring_with_dev_option