Merge pull request #42153 from kevinsjoberg/ignore-file-fixtures-on-load

Ignore file fixtures on `db:fixtures:load`
rails · Jun 23, 2021 · 8877b88 · 8877b88
1 parent 9040eb1
commit 8877b88
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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)