Fixes: #4633;@0.5h; CR changes4633-import-handle-incorrect-zip

4 files changed, 4 insertions, 8 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 1da342e39..6e497b580 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -27,11 +27,6 @@ Otherwise please make sure to use a compatible version, still best to use the sa
 
 Then install yarn (`brew install yarn` does nicely on macOS).
 
-## Webpack
-
-... is managed by the webpacker gem, thusly at latest
- before starting your server and tests, setup webpacker with `bundle exec rake webpacker:install`.
-
 ### Installation Caveats
 
 #### Node Related Issue, libv8
diff --git a/app/workers/workbench_import_worker.rb b/app/workers/workbench_import_worker.rb
index 80f458e1c..300fad9e2 100644
--- a/app/workers/workbench_import_worker.rb
+++ b/app/workers/workbench_import_worker.rb
@@ -56,7 +56,7 @@ class WorkbenchImportWorker
         message_key: 'inconsistent_zip_file',
         message_attributes: {
           'import_name' => @workbench_import.name,
-          'spurious_dirs' => entry.spurious.inspect
+          'spurious_dirs' => entry.spurious.join(', ')
         }) 
     end
   end
diff --git a/config/locales/import_messages.fr.yml b/config/locales/import_messages.fr.yml
index f77c32b34..15de6eed8 100644
--- a/config/locales/import_messages.fr.yml
+++ b/config/locales/import_messages.fr.yml
@@ -2,6 +2,7 @@ fr:
   import_messages:
     compliance_check_messages:
       corrupt_zip_file: "Le fichier zip du WorkbenchImport %{import_name} est corrompu, et ne peut être lu" 
+      inconsistent_zip_file: "Le fichier zip du WorkbenchImport %{import_name} contient les repertoirs illegeaux %{spurious_dirs} qui seront ignorés"
       referential_creation: "Le référentiel n'a pas pu être créé car un référentiel existe déjà sur les même périodes et lignes"
       1_netexstif_2: "Le fichier %{source_filename} ne respecte pas la syntaxe XML ou la XSD NeTEx : erreur '%{error_value}' rencontré"
       1_netexstif_5: "%{source_filename}-Ligne %{source_line_number}-Colonne %{source_column_number} : l'objet %{source_label} d'identifiant %{source_objectid} a une date de mise à jour dans le futur"
diff --git a/spec/workers/workbench_import/workbench_import_worker_spec.rb b/spec/workers/workbench_import/workbench_import_worker_spec.rb
index 9f860a6b3..deaa1e3a5 100644
--- a/spec/workers/workbench_import/workbench_import_worker_spec.rb
+++ b/spec/workers/workbench_import/workbench_import_worker_spec.rb
@@ -115,8 +115,8 @@ RSpec.describe WorkbenchImportWorker, type: [:worker, :request] do
     let( :spurious ){ [spurious1, spurious2] }
     let( :messages ){ double('messages') }
     let( :message_attributes ){{criticity: :warning, message_key: 'inconsistent_zip_file'}}
-    let( :message1_attributes ){ message_attributes.merge(message_attributes: {'import_name' => import.name, 'spurious_dirs' => spurious1.inspect}) }
-    let( :message2_attributes ){ message_attributes.merge(message_attributes: {'import_name' => import.name, 'spurious_dirs' => spurious2.inspect}) }
+    let( :message1_attributes ){ message_attributes.merge(message_attributes: {'import_name' => import.name, 'spurious_dirs' => spurious1.join(', ')}) }
+    let( :message2_attributes ){ message_attributes.merge(message_attributes: {'import_name' => import.name, 'spurious_dirs' => spurious2.join(', ')}) }
 
     before do
       allow(import).to receive(:messages).and_return(messages)