From f7ea564a0b5dafed61d0028d8e1329d7d4eb9920 Mon Sep 17 00:00:00 2001 From: Daniel Morris Date: Sat, 8 Apr 2017 12:53:44 +0100 Subject: [PATCH 1/2] Remove superfluous keep file Removes the generated keep file within the fixtures directory, since this directory now has a files subdirectory with it's own keep file, the keep file in the parent directory is no longer required. --- railties/lib/rails/generators/rails/app/app_generator.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 324843a5f5..9da37421ed 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -173,7 +173,6 @@ module Rails end def test - empty_directory_with_keep_file "test/fixtures" empty_directory_with_keep_file "test/fixtures/files" empty_directory_with_keep_file "test/controllers" empty_directory_with_keep_file "test/mailers" From f9f459ebe40cdb2e4ed041c975110c9c5c3e058a Mon Sep 17 00:00:00 2001 From: Daniel Morris Date: Sun, 9 Apr 2017 09:47:44 +0100 Subject: [PATCH 2/2] Update the expected folders containing keeps --- railties/test/generators/app_generator_test.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 7965bd68d0..5ba3dfc61f 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -761,7 +761,6 @@ class AppGeneratorTest < Rails::Generators::TestCase lib/tasks lib/assets log - test/fixtures test/fixtures/files test/controllers test/mailers