Discard demarches from manager

spec/controllers/manager/procedures_controller_spec.rb

@@ -1,7 +1,7 @@
 describe Manager::ProceduresController, type: :controller do
   describe '#whitelist' do
     let(:administration) { create :administration }
-    let!(:procedure) { create(:procedure) }
+    let(:procedure) { create(:procedure) }
 
     before do
       sign_in administration
@@ -16,7 +16,7 @@ describe Manager::ProceduresController, type: :controller do
     render_views
 
     let(:administration) { create(:administration) }
-    let!(:procedure) { create(:procedure, :with_repetition) }
+    let(:procedure) { create(:procedure, :with_repetition) }
 
     before do
       sign_in(administration)
@@ -26,6 +26,19 @@ describe Manager::ProceduresController, type: :controller do
     it { expect(response.body).to include('sub type de champ') }
   end
 
+  describe '#discard' do
+    let(:administration) { create :administration }
+    let(:procedure) { create(:procedure) }
+
+    before do
+      sign_in administration
+      post :discard, params: { id: procedure.id }
+      procedure.reload
+    end
+
+    it { expect(procedure.discarded?).to be_truthy }
+  end
+
   describe '#index' do
     render_views
 

spec/factories/procedure.rb

@@ -194,11 +194,7 @@ FactoryBot.define do
     end
 
     trait :discarded do
-      after(:build) do |procedure, _evaluator|
-        procedure.path = generate(:published_path)
-        procedure.publish!
-        procedure.hide!
-      end
+      hidden_at { Time.zone.now }
     end
 
     trait :whitelisted do

spec/models/dossier_spec.rb

@@ -1226,6 +1226,8 @@ describe Dossier do
   end
 
   describe 'discarded_brouillon_expired and discarded_en_construction_expired' do
+    let(:administration) { create(:administration) }
+
     before do
       create(:dossier)
       create(:dossier, :en_construction)
@@ -1236,8 +1238,8 @@ describe Dossier do
         create(:dossier).discard!
         create(:dossier, :en_construction).discard!
 
-        create(:dossier).procedure.hide!
-        create(:dossier, :en_construction).procedure.hide!
+        create(:dossier).procedure.discard_and_keep_track!(administration)
+        create(:dossier, :en_construction).procedure.discard_and_keep_track!(administration)
       end
       Timecop.travel(1.week.ago) do
         create(:dossier).discard!

spec/models/procedure_spec.rb

@@ -836,7 +836,8 @@ describe Procedure do
     end
   end
 
-  describe "#hide!" do
+  describe "#discard_and_keep_track!" do
+    let(:administration) { create(:administration) }
     let(:procedure) { create(:procedure) }
     let!(:dossier) { create(:dossier, procedure: procedure) }
     let!(:dossier2) { create(:dossier, procedure: procedure) }
@@ -845,10 +846,10 @@ describe Procedure do
     it { expect(Dossier.count).to eq(2) }
     it { expect(Dossier.all).to include(dossier, dossier2) }
 
-    context "when hidding procedure" do
+    context "when discarding procedure" do
       before do
         instructeur.followed_dossiers << dossier
-        procedure.hide!
+        procedure.discard_and_keep_track!(administration)
         instructeur.reload
       end