Undo discard dossiers and demarches from manager

spec/controllers/manager/dossiers_controller_spec.rb

@@ -1,23 +1,43 @@
 describe Manager::DossiersController, type: :controller do
+  let(:administration) { create :administration }
+  let(:deleted_dossier) { DeletedDossier.find_by(dossier_id: dossier) }
+  let(:operations) { dossier.dossier_operation_logs.map(&:operation).map(&:to_sym) }
+
+  before { sign_in administration }
+
   describe '#discard' do
-    let(:administration) { create :administration }
-    let(:dossier) { create(:dossier) }
+    let(:dossier) { create(:dossier, :en_construction) }
 
     before do
-      sign_in administration
       post :discard, params: { id: dossier.id }
       dossier.reload
     end
 
     it { expect(dossier.discarded?).to be_truthy }
+    it { expect(deleted_dossier).not_to be_nil }
+    it { expect(deleted_dossier.reason).to eq("manager_request") }
+    it { expect(operations).to eq([:supprimer]) }
+  end
+
+  describe '#restore' do
+    let(:dossier) { create(:dossier, :en_construction) }
+
+    before do
+      dossier.discard_and_keep_track!(administration, :manager_request)
+
+      post :restore, params: { id: dossier.id }
+      dossier.reload
+    end
+
+    it { expect(dossier.kept?).to be_truthy }
+    it { expect(deleted_dossier).to be_nil }
+    it { expect(operations).to eq([:supprimer, :restaurer]) }
   end
 
   describe '#repasser_en_instruction' do
-    let(:administration) { create :administration }
     let(:dossier) { create(:dossier, :accepte) }
 
     before do
-      sign_in administration
       post :repasser_en_instruction, params: { id: dossier.id }
       dossier.reload
     end

spec/controllers/manager/procedures_controller_spec.rb

@@ -1,25 +1,25 @@
 describe Manager::ProceduresController, type: :controller do
+  let(:administration) { create :administration }
+
+  before { sign_in administration }
+
   describe '#whitelist' do
-    let(:administration) { create :administration }
     let(:procedure) { create(:procedure) }
 
     before do
-      sign_in administration
       post :whitelist, params: { id: procedure.id }
       procedure.reload
     end
 
-    it { expect(procedure.whitelisted_at).not_to be_nil }
+    it { expect(procedure.whitelisted?).to be_truthy }
   end
 
   describe '#show' do
     render_views
 
-    let(:administration) { create(:administration) }
     let(:procedure) { create(:procedure, :with_repetition) }
 
     before do
-      sign_in(administration)
       get :show, params: { id: procedure.id }
     end
 
@@ -27,27 +27,50 @@ describe Manager::ProceduresController, type: :controller do
   end
 
   describe '#discard' do
-    let(:administration) { create :administration }
-    let(:procedure) { create(:procedure) }
+    let(:dossier) { create(:dossier, :en_construction) }
+    let(:procedure) { dossier.procedure }
+    let(:deleted_dossier) { DeletedDossier.find_by(dossier_id: dossier.id) }
+    let(:operations) { dossier.dossier_operation_logs.map(&:operation).map(&:to_sym) }
 
     before do
-      sign_in administration
       post :discard, params: { id: procedure.id }
       procedure.reload
+      dossier.reload
     end
 
     it { expect(procedure.discarded?).to be_truthy }
+    it { expect(dossier.discarded?).to be_truthy }
+    it { expect(deleted_dossier).not_to be_nil }
+    it { expect(deleted_dossier.reason).to eq("procedure_removed") }
+    it { expect(operations).to eq([:supprimer]) }
+  end
+
+  describe '#restore' do
+    let(:dossier) { create(:dossier, :en_construction) }
+    let(:procedure) { dossier.procedure }
+    let(:deleted_dossier) { DeletedDossier.find_by(dossier_id: dossier.id) }
+    let(:operations) { dossier.dossier_operation_logs.map(&:operation).map(&:to_sym) }
+
+    before do
+      procedure.discard_and_keep_track!(administration)
+
+      post :restore, params: { id: procedure.id }
+      procedure.reload
+    end
+
+    it { expect(procedure.kept?).to be_truthy }
+    it { expect(dossier.kept?).to be_truthy }
+    it { expect(deleted_dossier).to be_nil }
+    it { expect(operations).to eq([:supprimer, :restaurer]) }
   end
 
   describe '#index' do
     render_views
 
-    let(:administration) { create(:administration) }
-    let!(:dossier) { create(:dossier) }
-
     context 'sort by dossiers' do
+      let!(:dossier) { create(:dossier) }
+
       before do
-        sign_in(administration)
         get :index, params: { procedure: { direction: 'asc', order: 'dossiers' } }
       end