diff --git a/app/graphql/schema.graphql b/app/graphql/schema.graphql index 76d2b930f..e53f05039 100644 --- a/app/graphql/schema.graphql +++ b/app/graphql/schema.graphql @@ -1921,12 +1921,12 @@ enum DossierState { accepte """ - En construction + En construction """ en_construction """ - En instruction + En instruction """ en_instruction @@ -1936,7 +1936,7 @@ enum DossierState { refuse """ - Classé sans suite + Classé sans suite """ sans_suite } diff --git a/config/locales/models/dossier/en.yml b/config/locales/models/dossier/en.yml index 19fe8ff63..77edfb763 100644 --- a/config/locales/models/dossier/en.yml +++ b/config/locales/models/dossier/en.yml @@ -10,11 +10,11 @@ en: state: "State" dossier/state: &state brouillon: "Draft" - en_construction: "In progress" + en_construction: "In progress" en_instruction: "Processing" accepte: "Accepted" refuse: "Refused" - sans_suite: "No further action" + sans_suite: "No further action" traitement: state: "State" traitement/state: diff --git a/config/locales/models/dossier/fr.yml b/config/locales/models/dossier/fr.yml index 7f9f119c7..ba3638d05 100644 --- a/config/locales/models/dossier/fr.yml +++ b/config/locales/models/dossier/fr.yml @@ -14,11 +14,11 @@ fr: autorisation_donnees: Acceptation des CGU dossier/state: &state brouillon: "Brouillon" - en_construction: "En construction" - en_instruction: "En instruction" + en_construction: "En construction" + en_instruction: "En instruction" accepte: "Accepté" refuse: "Refusé" - sans_suite: "Classé sans suite" + sans_suite: "Classé sans suite" traitement: state: "État" traitement/state: diff --git a/spec/controllers/api/v2/graphql_controller_spec.rb b/spec/controllers/api/v2/graphql_controller_spec.rb index f91064be9..7d696111f 100644 --- a/spec/controllers/api/v2/graphql_controller_spec.rb +++ b/spec/controllers/api/v2/graphql_controller_spec.rb @@ -1072,7 +1072,7 @@ describe API::V2::GraphqlController do it "should fail" do expect(gql_errors).to eq(nil) expect(gql_data).to eq(dossierPasserEnInstruction: { - errors: [{ message: "Le dossier est déjà en instruction" }], + errors: [{ message: "Le dossier est déjà en instruction" }], dossier: nil }) end @@ -1289,7 +1289,7 @@ describe API::V2::GraphqlController do it "should fail" do expect(gql_errors).to eq(nil) expect(gql_data).to eq(dossierRefuser: { - errors: [{ message: "Le dossier est déjà classé sans suite" }], + errors: [{ message: "Le dossier est déjà classé sans suite" }], dossier: nil }) end diff --git a/spec/controllers/instructeurs/dossiers_controller_spec.rb b/spec/controllers/instructeurs/dossiers_controller_spec.rb index 3c55f2b49..06f94d716 100644 --- a/spec/controllers/instructeurs/dossiers_controller_spec.rb +++ b/spec/controllers/instructeurs/dossiers_controller_spec.rb @@ -162,7 +162,7 @@ describe Instructeurs::DossiersController, type: :controller do it 'warns about the error' do expect(dossier.reload.state).to eq(Dossier.states.fetch(:en_instruction)) expect(response).to have_http_status(:ok) - expect(response.body).to include('Le dossier est déjà en instruction.') + expect(response.body).to include('Le dossier est déjà en instruction.') end end @@ -175,7 +175,7 @@ describe Instructeurs::DossiersController, type: :controller do it 'warns about the error' do expect(response).to have_http_status(:ok) - expect(response.body).to include('Le dossier est en ce moment accepté : il n’est pas possible de le passer en instruction.') + expect(response.body).to include('Le dossier est en ce moment accepté : il n’est pas possible de le passer en instruction.') end end @@ -208,7 +208,7 @@ describe Instructeurs::DossiersController, type: :controller do it 'warns about the error' do expect(dossier.reload.state).to eq(Dossier.states.fetch(:en_construction)) expect(response).to have_http_status(:ok) - expect(response.body).to include('Le dossier est déjà en construction.') + expect(response.body).to include('Le dossier est déjà en construction.') end end @@ -245,7 +245,7 @@ describe Instructeurs::DossiersController, type: :controller do it 'warns about the error' do expect(dossier.reload.state).to eq(Dossier.states.fetch(:en_instruction)) expect(response).to have_http_status(:ok) - expect(response.body).to include('Le dossier est déjà en instruction.') + expect(response.body).to include('Le dossier est déjà en instruction.') end end diff --git a/spec/helpers/dossier_helper_spec.rb b/spec/helpers/dossier_helper_spec.rb index 72dcc91b6..d85eca805 100644 --- a/spec/helpers/dossier_helper_spec.rb +++ b/spec/helpers/dossier_helper_spec.rb @@ -141,7 +141,7 @@ RSpec.describe DossierHelper, type: :helper do it 'en_construction is En construction' do dossier.en_construction! - expect(subject).to eq('En construction') + expect(subject).to eq('En construction') end it 'accepte is traité' do @@ -151,12 +151,12 @@ RSpec.describe DossierHelper, type: :helper do it 'en_instruction is reçu' do dossier.en_instruction! - expect(subject).to eq('En instruction') + expect(subject).to eq('En instruction') end it 'sans_suite is traité' do dossier.sans_suite! - expect(subject).to eq('Classé sans suite') + expect(subject).to eq('Classé sans suite') end it 'refuse is traité' do diff --git a/spec/models/procedure_presentation_spec.rb b/spec/models/procedure_presentation_spec.rb index a4bd21d45..e0c898c64 100644 --- a/spec/models/procedure_presentation_spec.rb +++ b/spec/models/procedure_presentation_spec.rb @@ -789,7 +789,7 @@ describe ProcedurePresentation do let(:filters) { { "suivis" => [{ "table" => "self", "column" => "state", "value" => "en_construction" }] } } it 'should get i18n value' do - expect(subject).to eq("En construction") + expect(subject).to eq("En construction") end end end diff --git a/spec/views/instructeur/dossiers/show.html.haml_spec.rb b/spec/views/instructeur/dossiers/show.html.haml_spec.rb index b19e9cf9d..d521b2fda 100644 --- a/spec/views/instructeur/dossiers/show.html.haml_spec.rb +++ b/spec/views/instructeur/dossiers/show.html.haml_spec.rb @@ -20,7 +20,7 @@ describe 'instructeurs/dossiers/show.html.haml', type: :view do end it 'renders the correct dossier state' do - expect(subject).to have_text('en construction') + expect(subject).to have_text('en construction') end context 'with a motivation' do diff --git a/spec/views/users/dossiers/show/_header.html.haml_spec.rb b/spec/views/users/dossiers/show/_header.html.haml_spec.rb index bc931b537..f24cc1e14 100644 --- a/spec/views/users/dossiers/show/_header.html.haml_spec.rb +++ b/spec/views/users/dossiers/show/_header.html.haml_spec.rb @@ -11,7 +11,7 @@ describe 'users/dossiers/show/header.html.haml', type: :view do it 'affiche les informations du dossier' do expect(rendered).to have_text(dossier.procedure.libelle) expect(rendered).to have_text("Dossier nº #{dossier.id}") - expect(rendered).to have_text("en construction") + expect(rendered).to have_text("en construction") expect(rendered).to have_selector("nav.tabs") expect(rendered).to have_link("Résumé", href: dossier_path(dossier))