Merge branch 'fix/gb/avoid-races-when-cleaning-db-in-tests' into 'master'

Resolve transient failures related to testing migrations

Closes #36745

See merge request !13761

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb
index b0f520d08e8..edaee03ea6c 100644
--- a/spec/support/db_cleaner.rb
+++ b/spec/support/db_cleaner.rb
@@ -4,18 +4,18 @@ RSpec.configure do |config|
   end
 
   config.append_after(:context) do
-    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.clean_with(:truncation, cache_tables: false)
   end
 
   config.before(:each) do
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each, js: true) do
+  config.before(:each, :js) do
     DatabaseCleaner.strategy = :truncation
   end
 
-  config.before(:each, truncate: true) do
+  config.before(:each, :truncate) do
     DatabaseCleaner.strategy = :truncation
   end