Added config to optionally disable deleting digitals on variant deletion

spec/models/variant_spec.rb

@@ -11,19 +11,26 @@ describe Spree::Variant do
     let(:digital) { @digital }
 
     it "should destroy associated digitals by default" do
+      # default is false
+      Spree::DigitalConfiguration[:keep_digitals] = false
+
       Spree::Digital.count.should == 1
       variant.digitals.present?.should be_true
-      variant.destroy
+      variant.deleted_at = Time.now
+      variant.deleted?.should be_true
+      variant.save!
       expect { digital.reload.present? }.to raise_error
       Spree::Digital.count.should == 0
     end
 
     it "should conditionally keep associated digitals" do
       Spree::DigitalConfiguration[:keep_digitals] = true
-      
+
       Spree::Digital.count.should == 1
-      variant.digitals.present?.should be_false
-      variant.destroy
+      variant.digitals.present?.should be_true
+      variant.deleted_at = Time.now
+      variant.save!
+      variant.deleted?.should be_true
       expect { digital.reload.present? }.to_not raise_error
       Spree::Digital.count.should == 1
     end

spec/spec_helper.rb

@@ -4,14 +4,18 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 
 require 'rspec/rails'
+require 'database_cleaner'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f }
 
 # Requires factories defined in spree_core
+require 'spree/core/testing_support/env'
 require 'spree/core/testing_support/factories'
 
+Dir[File.join(File.dirname(__FILE__), "factories/*.rb")].each {|f| require f }
+
 RSpec.configure do |config|
   # == Mock Framework
   #
@@ -28,10 +32,25 @@ RSpec.configure do |config|
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
-  config.use_transactional_fixtures = true
-end
+  config.use_transactional_fixtures = false
 
-Dir[File.join(File.dirname(__FILE__), "factories/*.rb")].each {|f| require f }
+  config.before(:each) do
+    if example.metadata[:js]
+      DatabaseCleaner.strategy = :truncation, { :except => ['spree_countries', 'spree_zones', 'spree_zone_members', 'spree_states', 'spree_roles'] }
+    else
+      DatabaseCleaner.strategy = :transaction
+    end
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+    # reset_spree_preferences
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end
 
 # not sure if this really adds anything, but this existed in the intial version of the spree_digital rspec testing
 RSpec::Matchers.define :have_valid_factory do |factory_name|