diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-24 09:08:34 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-24 09:08:34 +0000 |
commit | 87119f78cfcf51d8748115e5921aa78b3295f7f1 (patch) | |
tree | c055228d54385dea0c762f66f6ed4c5d64fce115 | |
parent | 39b5bd69ba575351f9ca4a4048acece296b9e715 (diff) | |
parent | 72018278a4bf79a3cdfa63258534d4bbc8ac8161 (diff) | |
download | gitlab-ce-87119f78cfcf51d8748115e5921aa78b3295f7f1.tar.gz |
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
-rw-r--r-- | spec/support/db_cleaner.rb | 6 |
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 |