2 files changed, 14 insertions, 8 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 9b6ceff9ff..58470e2f10 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,7 +1,9 @@
 *   Avoid running system tests by default with the `bin/rails test`
     and `bin/rake test` commands since they may be expensive.
 
-    *Robin Dupret* (#28286)
+    Fixes #28286.
+
+    *Robin Dupret*
 
 *   Improve encryption for encrypted secrets.
 
@@ -124,6 +126,10 @@
 
     *Tsukuru Tanimichi*
 
+*   Add `--skip-coffee` option to `rails new`
+
+    *Seunghwan Oh*
+
 *   Allow the use of listen's 3.1.x branch
 
     *Esteban Santana Santana*
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 986afb6d2a..79fe4e4eb7 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -133,7 +133,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_rails_update_generates_correct_session_key
+  def test_app_update_generates_correct_session_key
     app_root = File.join(destination_root, "myapp")
     run_generator [app_root]
 
@@ -156,7 +156,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_no_file "config/initializers/cors.rb"
   end
 
-  def test_rails_update_keep_the_cookie_serializer_if_it_is_already_configured
+  def test_app_update_keep_the_cookie_serializer_if_it_is_already_configured
     app_root = File.join(destination_root, "myapp")
     run_generator [app_root]
 
@@ -168,7 +168,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_rails_update_set_the_cookie_serializer_to_marshal_if_it_is_not_already_configured
+  def test_app_update_set_the_cookie_serializer_to_marshal_if_it_is_not_already_configured
     app_root = File.join(destination_root, "myapp")
     run_generator [app_root]
 
@@ -183,7 +183,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_rails_update_dont_set_file_watcher
+  def test_app_update_dont_set_file_watcher
     app_root = File.join(destination_root, "myapp")
     run_generator [app_root]
 
@@ -197,7 +197,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_rails_update_does_not_create_new_framework_defaults_by_default
+  def test_app_update_does_not_create_new_framework_defaults_by_default
     app_root = File.join(destination_root, "myapp")
     run_generator [app_root]
 
@@ -215,7 +215,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_rails_update_does_not_create_rack_cors
+  def test_app_update_does_not_create_rack_cors
     app_root = File.join(destination_root, "myapp")
     run_generator [app_root]
 
@@ -227,7 +227,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_rails_update_does_not_remove_rack_cors_if_already_present
+  def test_app_update_does_not_remove_rack_cors_if_already_present
     app_root = File.join(destination_root, "myapp")
     run_generator [app_root]