From 39711caaf6d7fb38875935e0afb7103ad96d1230 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 27 Jul 2015 11:39:25 +0200 Subject: [PATCH] fixes transaction fixtures call [#21] --- spec/rails_helper.rb | 2 +- spec/spec_helper.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 91b1313a5..93619a5b1 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -2,8 +2,8 @@ ENV['RAILS_ENV'] ||= 'test' require File.expand_path('../../config/environment', __FILE__) abort("The Rails environment is running in production mode!") if Rails.env.production? -require 'spec_helper' require 'rspec/rails' +require 'spec_helper' require 'capybara/rails' require 'capybara/rspec' require 'capybara/poltergeist' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 07d14fcb6..8bb7b2c82 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,16 +3,16 @@ require 'database_cleaner' RSpec.configure do |config| config.use_transactional_fixtures = false + config.filter_run :focus config.run_all_when_everything_filtered = true config.include FactoryGirl::Syntax::Methods - config.before(:suite) do + config.before(:suite) do DatabaseCleaner.clean_with :truncation - DatabaseCleaner.strategy = :transaction end - config.before(:each) do + config.before(:each) do |example| DatabaseCleaner.strategy= example.metadata[:js] ? :truncation : :transaction DatabaseCleaner.start end