From 340259eb2a82353232aad0218a628f986a537817 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Tue, 26 Jun 2012 16:05:21 +1000
Subject: [PATCH] Fix database cleaner strategy:
 http://blog.55minutes.com/2012/05/faster-capybara-specs/

---
 spec/spec_helper.rb | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 872b50039f..c1334085e1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -48,22 +48,15 @@ Spork.prefork do
     #
     config.filter_run_excluding :skip => true
 
-    config.before(:suite) do
-      DatabaseCleaner.strategy = :transaction
-    end
-
     config.before(:each) do
+      if example.metadata[:js]
+        DatabaseCleaner.strategy = :truncation, { :except => ['spree_countries', 'spree_states'] }
+      else
+        DatabaseCleaner.strategy = :transaction
+      end
       DatabaseCleaner.start
     end
 
-    config.before(type: :request, js: true) do
-      DatabaseCleaner.strategy = :truncation, { :except => ['spree_countries', 'spree_states'] }
-    end
-
-    config.before(js: false) do
-      DatabaseCleaner.strategy = :transaction
-    end
-
     config.after(:each) do
       DatabaseCleaner.clean
     end