Merge branch 'master' of dev.gitlabhq.com:gitlabhq

2011-11-16 11:43:27 -05:00 · 2011-11-16 11:43:27 -05:00 · f0b86c5f1e
commit f0b86c5f1e
parent aa02a3b757 e10fb64dd6
3 changed files with 90 additions and 111 deletions
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@ -42,6 +42,7 @@ 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