[fix #504] Dossier: without_continuation -> sans_suite

app/controllers/users/recapitulatif_controller.rb

@@ -18,7 +18,7 @@ class Users::RecapitulatifController < UsersController
 
   def self.route_authorization
     {
-        states: [:en_construction, :en_instruction, :without_continuation, :accepte, :refuse]
+        states: [:en_construction, :en_instruction, :sans_suite, :accepte, :refuse]
     }
   end
 

app/helpers/dossier_helper.rb

@@ -2,7 +2,7 @@ module DossierHelper
   def button_or_label_class(dossier)
     if dossier.accepte?
       'accepted'
-    elsif dossier.without_continuation?
+    elsif dossier.sans_suite?
       'without-continuation'
     elsif dossier.refuse?
       'refuse'

app/models/dossier.rb

@@ -5,7 +5,7 @@ class Dossier < ActiveRecord::Base
     en_instruction:  'en_instruction',
     accepte:         'accepte',
     refuse:          'refuse',
-    without_continuation: 'without_continuation'
+    sans_suite:      'sans_suite'
   }
 
   BROUILLON = %w(brouillon)
@@ -13,7 +13,7 @@ class Dossier < ActiveRecord::Base
   EN_CONSTRUCTION = %w(en_construction)
   EN_INSTRUCTION = %w(en_instruction)
   EN_CONSTRUCTION_OU_INSTRUCTION = EN_CONSTRUCTION + EN_INSTRUCTION
-  TERMINE = %w(accepte refuse without_continuation)
+  TERMINE = %w(accepte refuse sans_suite)
 
   has_one :etablissement, dependent: :destroy
   has_one :entreprise, dependent: :destroy
@@ -186,7 +186,7 @@ class Dossier < ActiveRecord::Base
         end
       when 'without_continuation'
         if en_instruction?
-          without_continuation!
+          sans_suite!
 
           if motivation
             self.motivation = motivation
@@ -283,7 +283,7 @@ class Dossier < ActiveRecord::Base
   end
 
   def read_only?
-    en_instruction? || accepte? || refuse? || without_continuation?
+    en_instruction? || accepte? || refuse? || sans_suite?
   end
 
   def owner? email
@@ -366,7 +366,7 @@ class Dossier < ActiveRecord::Base
   def statut
     if accepte?
       'accepté'
-    elsif without_continuation?
+    elsif sans_suite?
       'classé sans suite'
     elsif refuse?
       'refusé'

app/serializers/dossier_serializer.rb

@@ -45,6 +45,8 @@ class DossierSerializer < ActiveModel::Serializer
       'closed'
     when 'refuse'
       'refused'
+    when 'sans_suite'
+      'without_continuation'
     else
       object.state
     end

app/serializers/dossier_table_export_serializer.rb

@@ -32,6 +32,8 @@ class DossierTableExportSerializer < ActiveModel::Serializer
       'closed'
     when 'refuse'
       'refused'
+    when 'sans_suite'
+      'without_continuation'
     else
       object.state
     end

app/views/new_gestionnaire/procedures/_status.html.haml

@@ -6,5 +6,5 @@
   %span.label.accepted accepté
 - elsif dossier.refuse?
   %span.label.refused refusé
-- elsif dossier.without_continuation?
+- elsif dossier.sans_suite?
   %span.label.without-continuation sans suite

config/locales/models/dossier/fr.yml

@@ -13,7 +13,7 @@ fr:
           en_instruction: "En instruction"
           accepte: "Accepté"
           refuse: "Refusé"
-          without_continuation: "Sans suite"
+          sans_suite: "Sans suite"
 
     errors:
       models:

lib/tasks/2017_12_04_translate_dossier_state_to_french.rake

@@ -18,4 +18,11 @@ namespace :'2017_12_04_translate_dossier_state_to_french' do
   task refuse: :environment do
     Dossier.unscoped.where(state: 'refused').update_all(state: 'refuse')
   end
+
+  task sans_suite: :environment do
+    Dossier.unscoped.where(state: 'without_continuation').update_all(state: 'sans_suite')
+  end
+
+  task all: %i(brouillon en_construction en_instruction accepte refuse sans_suite) do
+  end
 end

spec/controllers/backoffice/dossiers_controller_spec.rb

@@ -260,7 +260,7 @@ describe Backoffice::DossiersController, type: :controller do
       it { is_expected.to redirect_to backoffice_dossier_path(id: dossier.id) }
     end
 
-    context "with without_continuation" do
+    context "with sans_suite" do
       before do
         dossier.en_instruction!
         sign_in gestionnaire
@@ -268,11 +268,11 @@ describe Backoffice::DossiersController, type: :controller do
 
       subject { post :process_dossier, params: { process_action: "without_continuation", dossier_id: dossier_id} }
 
-      it 'change state to without_continuation' do
+      it 'change state to sans_suite' do
         subject
 
         dossier.reload
-        expect(dossier.state).to eq('without_continuation')
+        expect(dossier.state).to eq('sans_suite')
       end
 
       it 'Notification email is sent' do

spec/controllers/new_gestionnaire/dossiers_controller_spec.rb

@@ -143,11 +143,11 @@ describe NewGestionnaire::DossiersController, type: :controller do
 
       subject { post :terminer, params: { process_action: "classer_sans_suite", procedure_id: procedure.id, dossier_id: dossier.id} }
 
-      it 'change state to without_continuation' do
+      it 'change state to sans_suite' do
         subject
 
         dossier.reload
-        expect(dossier.state).to eq('without_continuation')
+        expect(dossier.state).to eq('sans_suite')
       end
 
       it 'Notification email is sent' do

spec/controllers/new_gestionnaire/procedures_controller_spec.rb

@@ -139,7 +139,7 @@ describe NewGestionnaire::ProceduresController, type: :controller do
           before do
             create(:dossier, procedure: procedure, state: "en_construction")
             create(:dossier, procedure: procedure, state: "en_instruction")
-            create(:dossier, procedure: procedure, state: "without_continuation", archived: true)
+            create(:dossier, procedure: procedure, state: "sans_suite", archived: true)
 
             gestionnaire.procedures << procedure2
             create(:dossier, :followed, procedure: procedure2, state: "en_construction")

spec/decorators/dossier_decorator_spec.rb

@@ -42,8 +42,8 @@ describe DossierDecorator do
       expect(subject).to eq('En instruction')
     end
 
-    it 'without_continuation is traité' do
+    it 'sans_suite is traité' do
-      dossier.without_continuation!
+      dossier.sans_suite!
       expect(subject).to eq('Sans suite')
     end
 

spec/features/users/onglets_link_spec.rb

@@ -10,7 +10,7 @@ feature 'on click on tabs button' do
     create(:dossier, :with_entreprise, user: user, state: 'en_instruction')
     create(:dossier, :with_entreprise, user: user, state: 'accepte')
     create(:dossier, :with_entreprise, user: user, state: 'refuse')
-    create(:dossier, :with_entreprise, user: user, state: 'without_continuation')
+    create(:dossier, :with_entreprise, user: user, state: 'sans_suite')
 
     create :invite, dossier: dossier_invite, user: user
 

spec/jobs/auto_archive_procedure_job_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe AutoArchiveProcedureJob, type: :job do
     let!(:dossier5) { create(:dossier, procedure: procedure_hier, state: 'en_instruction', archived: false)}
     let!(:dossier6) { create(:dossier, procedure: procedure_hier, state: 'accepte', archived: false)}
     let!(:dossier7) { create(:dossier, procedure: procedure_hier, state: 'refuse', archived: false)}
-    let!(:dossier8) { create(:dossier, procedure: procedure_hier, state: 'without_continuation', archived: false)}
+    let!(:dossier8) { create(:dossier, procedure: procedure_hier, state: 'sans_suite', archived: false)}
     let!(:dossier9) { create(:dossier, procedure: procedure_aujourdhui, state: 'en_construction', archived: false)}
 
     before do
@@ -46,7 +46,7 @@ RSpec.describe AutoArchiveProcedureJob, type: :job do
     it { expect(dossier5.state).to eq 'en_instruction' }
     it { expect(dossier6.state).to eq 'accepte' }
     it { expect(dossier7.state).to eq 'refuse' }
-    it { expect(dossier8.state).to eq 'without_continuation' }
+    it { expect(dossier8.state).to eq 'sans_suite' }
     it { expect(dossier9.state).to eq 'en_instruction' }
 
     it { expect(procedure_hier.archivee?).to eq true }

spec/models/dossier_spec.rb

@@ -258,9 +258,9 @@ describe Dossier do
         end
       end
 
-      context 'when dossier is at state without_continuation' do
+      context 'when dossier is at state sans_suite' do
         before do
-          dossier.without_continuation!
+          dossier.sans_suite!
         end
 
         context 'when user is connected' do
@@ -269,7 +269,7 @@ describe Dossier do
           context 'when he posts a comment' do
             let(:action) { 'comment' }
 
-            it { is_expected.to eq('without_continuation') }
+            it { is_expected.to eq('sans_suite') }
           end
         end
 
@@ -279,7 +279,7 @@ describe Dossier do
           context 'when he posts a comment' do
             let(:action) { 'comment' }
 
-            it { is_expected.to eq('without_continuation') }
+            it { is_expected.to eq('sans_suite') }
           end
         end
       end
@@ -751,10 +751,10 @@ describe Dossier do
       it_behaves_like 'dossier is processed', 'refuse'
     end
 
-    context 'when dossier is without_continuation' do
+    context 'when dossier is sans_suite' do
       let(:state) { 'en_instruction' }
 
-      it_behaves_like 'dossier is processed', 'without_continuation'
+      it_behaves_like 'dossier is processed', 'sans_suite'
     end
   end
 
@@ -809,7 +809,7 @@ describe Dossier do
       expect { Dossier.create(procedure: procedure, state: "en_instruction", user: user) }.not_to change(ActionMailer::Base.deliveries, :size)
       expect { Dossier.create(procedure: procedure, state: "accepte", user: user) }.not_to change(ActionMailer::Base.deliveries, :size)
       expect { Dossier.create(procedure: procedure, state: "refuse", user: user) }.not_to change(ActionMailer::Base.deliveries, :size)
-      expect { Dossier.create(procedure: procedure, state: "without_continuation", user: user) }.not_to change(ActionMailer::Base.deliveries, :size)
+      expect { Dossier.create(procedure: procedure, state: "sans_suite", user: user) }.not_to change(ActionMailer::Base.deliveries, :size)
     end
   end
 

spec/serializers/dossier_serializer_spec.rb

@@ -27,5 +27,11 @@ describe DossierSerializer do
 
       it { is_expected.to include(state: 'refused') }
     end
+
+    context 'when the dossier is sans_suite' do
+      let(:dossier) { create(:dossier, state: :sans_suite) }
+
+      it { is_expected.to include(state: 'without_continuation') }
+    end
   end
 end

spec/serializers/dossier_table_export_serializer_spec.rb

@@ -29,6 +29,12 @@ describe DossierTableExportSerializer do
 
       it { is_expected.to include(state: 'refused') }
     end
+
+    context 'when the dossier is sans_suite' do
+      let(:dossier) { create(:dossier, state: :sans_suite) }
+
+      it { is_expected.to include(state: 'without_continuation') }
+    end
   end
 
   describe '#emails_accompagnateurs' do

spec/services/dossiers_list_gestionnaire_service_spec.rb

@@ -352,7 +352,7 @@ describe DossiersListGestionnaireService do
     let!(:dossier7) { create(:dossier, procedure: procedure, state: 'en_instruction') } #a_instruire
     let!(:dossier8) { create(:dossier, procedure: procedure, state: 'accepte') } #termine
     let!(:dossier9) { create(:dossier, procedure: procedure, state: 'refuse') } #termine
-    let!(:dossier10) { create(:dossier, procedure: procedure, state: 'without_continuation') } #termine
+    let!(:dossier10) { create(:dossier, procedure: procedure, state: 'sans_suite') } #termine
     let!(:dossier11) { create(:dossier, procedure: procedure, state: 'accepte') } #termine
     let!(:dossier12) { create(:dossier, procedure: procedure, state: 'en_construction', archived: true) } #a_traiter #archived
     let!(:dossier14) { create(:dossier, procedure: procedure, state: 'accepte', archived: true) } #termine #archived

spec/views/backoffice/dossiers/index_html.haml_spec.rb

@@ -10,7 +10,7 @@ describe 'backoffice/dossiers/index.html.haml', type: :view do
   let!(:decorate_dossier_en_instruction) { create(:dossier, :with_entreprise, procedure: procedure, state: 'en_instruction').decorate }
   let!(:decorate_dossier_accepte) { create(:dossier, :with_entreprise, procedure: procedure, state: 'accepte').decorate }
   let!(:decorate_dossier_refuse) { create(:dossier, :with_entreprise, procedure: procedure, state: 'refuse').decorate }
-  let!(:decorate_dossier_without_continuation) { create(:dossier, :with_entreprise, procedure: procedure, state: 'without_continuation').decorate }
+  let!(:decorate_dossier_sans_suite) { create(:dossier, :with_entreprise, procedure: procedure, state: 'sans_suite').decorate }
 
   let(:dossiers_list_facade) { DossiersListFacades.new gestionnaire, nil }
 
@@ -22,7 +22,7 @@ describe 'backoffice/dossiers/index.html.haml', type: :view do
     decorate_dossier_en_instruction.entreprise.update_column(:raison_sociale, 'plup')
     decorate_dossier_accepte.entreprise.update_column(:raison_sociale, 'plyp')
     decorate_dossier_refuse.entreprise.update_column(:raison_sociale, 'plzp')
-    decorate_dossier_without_continuation.entreprise.update_column(:raison_sociale, 'plnp')
+    decorate_dossier_sans_suite.entreprise.update_column(:raison_sociale, 'plnp')
 
     create :preference_list_dossier,
       gestionnaire: gestionnaire,

spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb

@@ -72,8 +72,8 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm
       end
     end
 
-    context 'when dossier have state without_continuation' do
+    context 'when dossier have state sans_suite' do
-      let(:state) { 'without_continuation' }
+      let(:state) { 'sans_suite' }
 
       before do
         render

spec/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show_spec.rb

@@ -48,8 +48,8 @@ describe 'layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.htm
       end
     end
 
-    context 'when dossier state is without_continuation' do
+    context 'when dossier state is sans_suite' do
-      let(:state) { 'without_continuation' }
+      let(:state) { 'sans_suite' }
 
       before do
         render

spec/views/users/dossiers/index_html.haml_spec.rb

@@ -7,7 +7,7 @@ describe 'users/dossiers/index.html.haml', type: :view do
   let!(:decorate_dossier_en_instruction) { create(:dossier, :with_entreprise, user: user, state: 'en_instruction').decorate }
   let!(:decorate_dossier_accepte) { create(:dossier, :with_entreprise, user: user, state: 'accepte').decorate }
   let!(:decorate_dossier_refuse) { create(:dossier, :with_entreprise, user: user, state: 'refuse').decorate }
-  let!(:decorate_dossier_without_continuation) { create(:dossier, :with_entreprise, user: user, state: 'without_continuation').decorate }
+  let!(:decorate_dossier_sans_suite) { create(:dossier, :with_entreprise, user: user, state: 'sans_suite').decorate }
   let!(:decorate_dossier_invite) { create(:dossier, :with_entreprise, user: create(:user), state: 'en_construction').decorate }
 
   before do
@@ -75,7 +75,7 @@ describe 'users/dossiers/index.html.haml', type: :view do
     end
 
     it_behaves_like 'check_tab_content' do
-      let(:decorate_dossier_at_check) { decorate_dossier_without_continuation }
+      let(:decorate_dossier_at_check) { decorate_dossier_sans_suite }
     end
   end