Rename demarche archivée to demarche close

spec/controllers/admin/procedures_controller_spec.rb

@@ -96,9 +96,9 @@ describe Admin::ProceduresController, type: :controller do
   end
 
   describe 'DELETE #destroy' do
-    let(:procedure_draft)     { create :procedure_with_dossiers, administrateur: admin, instructeurs: [admin.instructeur], published_at: nil, archived_at: nil }
-    let(:procedure_published) { create :procedure_with_dossiers, administrateur: admin, instructeurs: [admin.instructeur], aasm_state: :publiee, published_at: Time.zone.now, archived_at: nil }
-    let(:procedure_archived)  { create :procedure_with_dossiers, administrateur: admin, instructeurs: [admin.instructeur], aasm_state: :archivee, published_at: nil, archived_at: Time.zone.now }
+    let(:procedure_draft)     { create :procedure_with_dossiers, administrateur: admin, instructeurs: [admin.instructeur], published_at: nil, closed_at: nil }
+    let(:procedure_published) { create :procedure_with_dossiers, administrateur: admin, instructeurs: [admin.instructeur], aasm_state: :publiee, published_at: Time.zone.now, closed_at: nil }
+    let(:procedure_closed)    { create :procedure_with_dossiers, administrateur: admin, instructeurs: [admin.instructeur], aasm_state: :close, published_at: nil, closed_at: Time.zone.now }
 
     subject { delete :destroy, params: { id: procedure.id } }
 
@@ -129,8 +129,8 @@ describe Admin::ProceduresController, type: :controller do
       it { expect(subject.status).to eq 401 }
     end
 
-    context 'when procedure is archived' do
-      let!(:procedure) { procedure_archived }
+    context 'when procedure is closed' do
+      let!(:procedure) { procedure_closed }
 
       it { expect { subject }.not_to change { Procedure.count } }
       it { expect { subject }.not_to change { Dossier.count } }
@@ -138,7 +138,7 @@ describe Admin::ProceduresController, type: :controller do
     end
 
     context "when administrateur does not own the procedure" do
-      let(:procedure_not_owned) { create :procedure, administrateur: create(:administrateur), published_at: nil, archived_at: nil }
+      let(:procedure_not_owned) { create :procedure, administrateur: create(:administrateur), published_at: nil, closed_at: nil }
 
       subject { delete :destroy, params: { id: procedure_not_owned.id } }
 
@@ -185,7 +185,7 @@ describe Admin::ProceduresController, type: :controller do
         end
 
         it 'archive previous procedure' do
-          expect(procedure2.archivee?).to be_truthy
+          expect(procedure2.close?).to be_truthy
         end
       end
 
@@ -201,7 +201,7 @@ describe Admin::ProceduresController, type: :controller do
 
         it 'previous procedure remains published' do
           expect(procedure2.publiee?).to be_truthy
-          expect(procedure2.archivee?).to be_falsey
+          expect(procedure2.close?).to be_falsey
           expect(procedure2.path).to match(/fake_path/)
         end
       end
@@ -260,9 +260,9 @@ describe Admin::ProceduresController, type: :controller do
       end
 
       context 'when owner want archive procedure' do
-        it { expect(procedure.archivee?).to be_truthy }
+        it { expect(procedure.close?).to be_truthy }
         it { expect(response).to redirect_to :admin_procedures }
-        it { expect(flash[:notice]).to have_content 'Démarche archivée' }
+        it { expect(flash[:notice]).to have_content 'Démarche close' }
       end
 
       context 'when owner want to re-enable procedure' do
@@ -351,16 +351,16 @@ describe Admin::ProceduresController, type: :controller do
     describe 'selecting' do
       let!(:large_draft_procedure)     { create(:procedure_with_dossiers, dossiers_count: 2) }
       let!(:large_published_procedure) { create(:procedure_with_dossiers, :published, dossiers_count: 2) }
-      let!(:large_archived_procedure)  { create(:procedure_with_dossiers, :archived,  dossiers_count: 2) }
-      let!(:small_archived_procedure)  { create(:procedure_with_dossiers, :archived,  dossiers_count: 1) }
+      let!(:large_closed_procedure)  { create(:procedure_with_dossiers, :closed,  dossiers_count: 2) }
+      let!(:small_closed_procedure)  { create(:procedure_with_dossiers, :closed,  dossiers_count: 1) }
 
-      it 'displays published and archived procedures' do
+      it 'displays published and closed procedures' do
         expect(response_procedures).to include(large_published_procedure)
-        expect(response_procedures).to include(large_archived_procedure)
+        expect(response_procedures).to include(large_closed_procedure)
       end
 
       it 'doesn’t display procedures without a significant number of dossiers' do
-        expect(response_procedures).not_to include(small_archived_procedure)
+        expect(response_procedures).not_to include(small_closed_procedure)
       end
 
       it 'doesn’t display draft procedures' do

spec/controllers/api/v1/procedures_controller_spec.rb

@@ -35,7 +35,7 @@ describe API::V1::ProceduresController, type: :controller do
         it { expect(subject[:description]).to eq(procedure.description) }
         it { expect(subject[:organisation]).to eq(procedure.organisation) }
         it { expect(subject[:direction]).to eq(procedure.direction) }
-        it { expect(subject[:archived_at]).to eq(procedure.archived_at) }
+        it { expect(subject[:archived_at]).to eq(procedure.closed_at) }
         it { expect(subject[:total_dossier]).to eq(procedure.total_dossier) }
         it { is_expected.to have_key(:types_de_champ) }
         it { expect(subject[:types_de_champ]).to be_an(Array) }

spec/controllers/instructeurs/procedures_controller_spec.rb

@@ -99,7 +99,7 @@ describe Instructeurs::ProceduresController, type: :controller do
 
       context "with procedures assigned" do
         let(:procedure1) { create(:procedure, :published) }
-        let(:procedure2) { create(:procedure, :archived) }
+        let(:procedure2) { create(:procedure, :closed) }
         let(:procedure3) { create(:procedure) }
 
         before do

spec/controllers/users/dossiers_controller_spec.rb

@@ -423,8 +423,8 @@ describe Users::DossiersController, type: :controller do
         expect(dossier.reload.state).to eq(Dossier.states.fetch(:en_construction))
       end
 
-      context "on an archived procedure" do
-        before { dossier.procedure.archive }
+      context "on an closed procedure" do
+        before { dossier.procedure.close! }
 
         it "it does not change state" do
           subject
@@ -873,8 +873,8 @@ describe Users::DossiersController, type: :controller do
             it { is_expected.to redirect_to identite_dossier_path(id: Dossier.last) }
           end
 
-          context 'when procedure is archived' do
-            let(:procedure) { create(:procedure, :archived) }
+          context 'when procedure is closed' do
+            let(:procedure) { create(:procedure, :closed) }
 
             it { is_expected.to redirect_to dossiers_path }
           end