Merge branch 'next-minor' into develop

This commit is contained in:
Steffen van Bergerem 2017-09-04 02:49:22 +02:00
commit c9ba7f697b
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B

View file

@ -51,6 +51,9 @@ Capybara.default_max_wait_time = 30
# of your scenarios, as this makes it hard to discover errors in your application. # of your scenarios, as this makes it hard to discover errors in your application.
ActionController::Base.allow_rescue = false ActionController::Base.allow_rescue = false
# TODO: Temporary fix for rails 5, remove the next line after a new version of database_cleaner is released.
# See https://github.com/DatabaseCleaner/database_cleaner/issues/445
Cucumber::Rails::Database.javascript_strategy = :truncation, {except: %w[ar_internal_metadata]}
Cucumber::Rails::Database.autorun_database_cleaner = true Cucumber::Rails::Database.autorun_database_cleaner = true
Cucumber::Rails::World.use_transactional_tests = false Cucumber::Rails::World.use_transactional_tests = false