diff options
author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-06-07 10:09:56 +0200 |
---|---|---|
committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-06-07 10:09:56 +0200 |
commit | 2838a993da78bf365d7a84dc51f57a605fc99c96 (patch) | |
tree | e9e33678f52d5a44c6ebfefe0fb93070e02591a7 /spec | |
parent | 7cf1a4259ac123725f2eb0ab6fc682e739d45734 (diff) | |
download | gitlab-ce-2838a993da78bf365d7a84dc51f57a605fc99c96.tar.gz |
DB cleaner reverted to a known working version
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Diffstat (limited to 'spec')
-rw-r--r-- | spec/support/db_cleaner.rb | 41 |
1 files changed, 31 insertions, 10 deletions
diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb index fa466ef5aea..d2d532d9738 100644 --- a/spec/support/db_cleaner.rb +++ b/spec/support/db_cleaner.rb @@ -1,18 +1,39 @@ +# RSpec.configure do |config| + +# config.around(:each) do |example| +# DatabaseCleaner.strategy = :transaction +# DatabaseCleaner.clean_with(:truncation) +# DatabaseCleaner.cleaning do +# example.run +# end +# end + +# config.around(:each, js: true) do |example| +# DatabaseCleaner.strategy = :truncation +# DatabaseCleaner.clean_with(:truncation) +# DatabaseCleaner.cleaning do +# example.run +# end +# end +# end RSpec.configure do |config| + config.before(:suite) do + DatabaseCleaner.clean_with(:truncation) + end - config.around(:each) do |example| + config.before(:each) do DatabaseCleaner.strategy = :transaction - DatabaseCleaner.clean_with(:truncation) - DatabaseCleaner.cleaning do - example.run - end end - config.around(:each, js: true) do |example| + config.before(:each, :js => true) do DatabaseCleaner.strategy = :truncation - DatabaseCleaner.clean_with(:truncation) - DatabaseCleaner.cleaning do - example.run - end + end + + config.before(:each) do + DatabaseCleaner.start + end + + config.after(:each) do + DatabaseCleaner.clean end end |