From 466251e98255a90fc4c8cc7b975b9e6a7eb11ceb Mon Sep 17 00:00:00 2001 From: Dumitru Ceban Date: Fri, 31 Jan 2020 18:50:36 +0100 Subject: [PATCH] Don't include Paranoia for handling soft-deletions We're replacing Paranoia with Discard as the only option for soft-deleting records. --- core/app/models/concerns/spree/soft_deletable.rb | 6 ++---- core/spec/models/spree/concerns/soft_deletable_spec.rb | 5 ----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/core/app/models/concerns/spree/soft_deletable.rb b/core/app/models/concerns/spree/soft_deletable.rb index a765d6d6da9..8a07fff9363 100644 --- a/core/app/models/concerns/spree/soft_deletable.rb +++ b/core/app/models/concerns/spree/soft_deletable.rb @@ -7,12 +7,10 @@ module SoftDeletable extend ActiveSupport::Concern included do - acts_as_paranoid - include Spree::ParanoiaDeprecations::InstanceMethods - extend Spree::ParanoiaDeprecations::ClassMethods - include Discard::Model self.discard_column = :deleted_at + + default_scope { kept } end end end diff --git a/core/spec/models/spree/concerns/soft_deletable_spec.rb b/core/spec/models/spree/concerns/soft_deletable_spec.rb index 359898fb3e4..48dc840f53f 100644 --- a/core/spec/models/spree/concerns/soft_deletable_spec.rb +++ b/core/spec/models/spree/concerns/soft_deletable_spec.rb @@ -13,11 +13,6 @@ end end - it 'includes Paranoia' do - expect(Post).to respond_to(:with_deleted) - expect(Post.new).to respond_to(:deleted?) - end - it 'includes Discard' do expect(Post).to respond_to(:with_discarded) expect(Post.new).to respond_to(:discarded?)