Merge pull request #4495 from nebulab/spaghetticode/delete-discarded-…

…prices

Include discarded prices in delete_prices_with_nil_amount task

core/lib/tasks/solidus/delete_prices_with_nil_amount.rake

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 namespace :solidus do
-  desc "Delete Spree::Price records which amount field is NULL"
+  desc "Delete Spree::Price records (including discarded) which amount field is NULL"
   task delete_prices_with_nil_amount: :environment do
-    Spree::Price.where(amount: nil).delete_all
+    Spree::Price.with_discarded.where(amount: nil).delete_all
   end
 end

core/spec/lib/tasks/solidus/delete_prices_with_nil_amount_spec.rb

@@ -14,7 +14,9 @@
 
     it 'removes all prices which amount column is NULL' do
       price = create(:price)
-      expect(Spree::Price).to receive(:where).with(amount: nil).and_return(Spree::Price.where(id: price))
+      with_discarded = instance_double("Spree::Price::ActiveRecord_Relation", where: Spree::Price.where(id: price))
+
+      expect(Spree::Price).to receive(:with_discarded) { with_discarded }
 
       task.invoke