Tidy up spec helper, clean database before suite run

spec/spec_helper.rb

@@ -71,26 +71,20 @@ RSpec.configure do |config|
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
 
-  # ## Filters
-  #
+  # Filters
   config.filter_run_excluding :skip => true, :future => true, :to_figure_out => true
 
-  config.before(:each) do
-    Spree::Address.any_instance.stub(:geocode).and_return([1,1])
+  # DatabaseCleaner
+  config.before(:suite)          { DatabaseCleaner.clean_with :deletion, {except: ['spree_countries', 'spree_states']} }
+  config.before(:each)           { DatabaseCleaner.strategy = :transaction }
+  config.before(:each, js: true) { DatabaseCleaner.strategy = :deletion, {except: ['spree_countries', 'spree_states']} }
+  config.before(:each)           { DatabaseCleaner.start }
+  config.after(:each)            { DatabaseCleaner.clean }
 
-    if example.metadata[:js]
-      DatabaseCleaner.strategy = :deletion, { :except => ['spree_countries', 'spree_states'] }
-    else
-      DatabaseCleaner.strategy = :transaction
-    end
-
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
+  # Geocoding
+  config.before(:each) { Spree::Address.any_instance.stub(:geocode).and_return([1,1]) }
 
+  # Helpers
   config.include Rails.application.routes.url_helpers
   config.include Spree::UrlHelpers
   config.include Spree::CheckoutHelpers
@@ -103,7 +97,7 @@ RSpec.configure do |config|
   config.include OpenFoodNetwork::DistributionHelper
   config.include ActionView::Helpers::DateHelper
 
-  # Factory girl
+  # FactoryGirl
   require 'factory_girl_rails'
   config.include FactoryGirl::Syntax::Methods