Commit ea58c95f authored by Jonne Haß's avatar Jonne Haß
Browse files

Switch back to database cleaner

database_rewinder seems to cause deadlocks in postgres and other
subtle bugs for us.
parent 3df3b896
......@@ -250,7 +250,7 @@ group :test do
# Cucumber (integration tests)
gem "capybara", "2.4.4"
gem "database_rewinder", "0.5.1"
gem "database_cleaner" , "1.4.1"
gem "selenium-webdriver", "2.45.0"
# General helpers
......
......@@ -140,7 +140,7 @@ GEM
mime-types (>= 1.16, < 3)
nokogiri (~> 1.5)
rails (>= 3, < 5)
database_rewinder (0.5.1)
database_cleaner (1.4.1)
devise (3.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
......@@ -716,7 +716,7 @@ DEPENDENCIES
compass-rails (= 2.0.4)
configurate (= 0.2.0)
cucumber-rails (= 1.4.2)
database_rewinder (= 0.5.1)
database_cleaner (= 1.4.1)
devise (= 3.4.1)
devise-token_authenticatable (~> 0.3.0)
devise_lastseenable (= 0.0.4)
......
......@@ -47,15 +47,9 @@ Capybara.default_wait_time = 15
# of your scenarios, as this makes it hard to discover errors in your application.
ActionController::Base.allow_rescue = false
Cucumber::Rails::Database.autorun_database_cleaner = false
Cucumber::Rails::Database.autorun_database_cleaner = true
Cucumber::Rails::World.use_transactional_fixtures = false
DatabaseRewinder.clean_all
After do
DatabaseRewinder.clean
end
require File.join(File.dirname(__FILE__), "integration_sessions_controller")
require File.join(File.dirname(__FILE__), "poor_mans_webmock")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment