diff options
author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-06-05 20:21:28 +0200 |
---|---|---|
committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-06-05 20:21:28 +0200 |
commit | 2545b0f85851d1e4ebc1137a2c8786a238e02ee4 (patch) | |
tree | 21a69bc5fb3e8e24d95c41618d1ef5a5be63e70d /spec/support/db_cleaner.rb | |
parent | a76bf07ae2ecaf47dab58cbeac37cb82ae8d3ad8 (diff) | |
download | gitlab-ce-2545b0f85851d1e4ebc1137a2c8786a238e02ee4.tar.gz |
Revert "Fix for failing specs"
This reverts commit 2314438925af827b694fbaaf59c31c49dd2c0c31.
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Conflicts:
Gemfile.lock
Diffstat (limited to 'spec/support/db_cleaner.rb')
-rw-r--r-- | spec/support/db_cleaner.rb | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb index f2b310245bd..8c9c74f14bd 100644 --- a/spec/support/db_cleaner.rb +++ b/spec/support/db_cleaner.rb @@ -1,21 +1,22 @@ -RSpec.configure do |config| - config.around(:each) do - DatabaseCleaner.clean_with(:truncation) - end - - config.around(:each) do - DatabaseCleaner.strategy = :transaction - end +require 'database_cleaner' - config.around(:each, js: true) do - DatabaseCleaner.strategy = :truncation - end +RSpec.configure do |config| + config.before do + if example.metadata[:js] + DatabaseCleaner.strategy = :truncation + Capybara::Selenium::Driver::DEFAULT_OPTIONS[:resynchronize] = true + else + DatabaseCleaner.strategy = :transaction + end - config.before(:each) do - DatabaseCleaner.start + unless example.metadata[:no_db] + DatabaseCleaner.start + end end - config.after(:each) do - DatabaseCleaner.clean + config.after do + unless example.metadata[:no_db] + DatabaseCleaner.clean + end end end |