Merge pull request #28704 from unfunco/remove-superfluous-keep

Remove superfluous keep file
rails · Dec 18, 2019 · 6da2152 · 6da2152
2 parents 4be763a + f9f459e
commit 6da2152
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -210,7 +210,6 @@ def storage
     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"

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
@@ -1022,7 +1022,6 @@ def test_create_keeps
       lib/tasks
       lib/assets
       log
-      test/fixtures
       test/fixtures/files
       test/controllers
       test/mailers