Rename delete_and_keep_track -> discard_and_keep_track

spec/controllers/manager/dossiers_controller_spec.rb

@@ -1,20 +1,20 @@
 describe Manager::DossiersController, type: :controller do
-  describe '#hide' do
+  describe '#discard' do
     let(:administration) { create :administration }
-    let!(:dossier) { create(:dossier) }
+    let(:dossier) { create(:dossier) }
 
     before do
       sign_in administration
-      post :hide, params: { id: dossier.id }
+      post :discard, params: { id: dossier.id }
       dossier.reload
     end
 
-    it { expect(dossier.hidden_at).not_to be_nil }
+    it { expect(dossier.discarded?).to be_truthy }
   end
 
   describe '#repasser_en_instruction' do
     let(:administration) { create :administration }
-    let!(:dossier) { create(:dossier, :accepte) }
+    let(:dossier) { create(:dossier, :accepte) }
 
     before do
       sign_in administration
@@ -22,6 +22,6 @@ describe Manager::DossiersController, type: :controller do
       dossier.reload
     end
 
-    it { expect(dossier.en_instruction?).to be true }
+    it { expect(dossier.en_instruction?).to be_truthy }
   end
 end

spec/models/dossier_spec.rb

@@ -670,7 +670,7 @@ describe Dossier do
     end
   end
 
-  describe "#delete_and_keep_track!" do
+  describe "#discard_and_keep_track!" do
     let(:dossier) { create(:dossier, :en_construction) }
     let(:deleted_dossier) { DeletedDossier.find_by(dossier_id: dossier.id) }
     let(:last_operation) { dossier.dossier_operation_logs.last }
@@ -681,7 +681,7 @@ describe Dossier do
       allow(DossierMailer).to receive(:notify_deletion_to_administration).and_return(double(deliver_later: nil))
     end
 
-    subject! { dossier.delete_and_keep_track!(dossier.user, reason) }
+    subject! { dossier.discard_and_keep_track!(dossier.user, reason) }
 
     context 'brouillon' do
       let(:dossier) { create(:dossier) }

spec/models/user_spec.rb

@@ -278,7 +278,7 @@ describe User, type: :model do
         end
 
         it "keep track of dossiers and delete user" do
-          dossier_cache.delete_and_keep_track!(administration, :user_request)
+          dossier_cache.discard_and_keep_track!(administration, :user_request)
           user.delete_and_keep_track_dossiers(administration)
 
           expect(DeletedDossier.find_by(dossier_id: dossier_en_construction)).to be_present
@@ -287,7 +287,7 @@ describe User, type: :model do
         end
 
         it "doesn't destroy dossiers of another user" do
-          dossier_cache.delete_and_keep_track!(administration, :user_request)
+          dossier_cache.discard_and_keep_track!(administration, :user_request)
           user.delete_and_keep_track_dossiers(administration)
 
           expect(Dossier.find_by(id: dossier_from_another_user.id)).to be_present