From 8877b88223aed6fc40d2ef21d0dffb616ba0e70d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fran=C3=A7a?= Date: Wed, 23 Jun 2021 15:22:40 -0400 Subject: [PATCH] Merge pull request #42153 from kevinsjoberg/ignore-file-fixtures-on-load Ignore file fixtures on `db:fixtures:load` --- actionpack/CHANGELOG.md | 4 ++++ activerecord/lib/active_record/railties/databases.rake | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index e9438cc9c59bf..4a86163f7f1cf 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,7 @@ +* Ignore file fixtures on `db:fixtures:load` + + *Kevin Sjöberg* + * Fix ActionController::Live controller test deadlocks by removing the body buffer size limit for tests. *Dylan Thacker-Smith* diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 504b3eaa1563f..de8af5012943e 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -413,8 +413,9 @@ db_namespace = namespace :db do fixture_files = if ENV["FIXTURES"] ENV["FIXTURES"].split(",") else - # The use of String#[] here is to support namespaced fixtures. - Dir["#{fixtures_dir}/**/*.yml"].map { |f| f[(fixtures_dir.size + 1)..-5] } + files = Dir[File.join(fixtures_dir, "**/*.{yml}")] + files.reject! { |f| f.start_with?(File.join(fixtures_dir, "files")) } + files.map! { |f| f[fixtures_dir.to_s.size..-5].delete_prefix("/") } end ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, fixture_files)