aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert2017-10-31 18:24:57 +0100
committerRobert2017-10-31 18:24:57 +0100
commitdb6ef457149b333e75fb2015c510fb6aa01b2572 (patch)
treede9fa80d33724e14bfd885ab675e33a375ce6b53
parentf9a4e2b828f689853c19f885c3cc9f0b96211590 (diff)
downloadchouette-core-db6ef457149b333e75fb2015c510fb6aa01b2572.tar.bz2
Refs: #4817@0.3h; Hotfix for wrong message for spurious directories in zip file4817-better-traduction
-rw-r--r--app/workers/workbench_import_worker.rb4
-rw-r--r--spec/workers/workbench_import/workbench_import_worker_spec.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/workers/workbench_import_worker.rb b/app/workers/workbench_import_worker.rb
index 1260f22cc..de51efded 100644
--- a/app/workers/workbench_import_worker.rb
+++ b/app/workers/workbench_import_worker.rb
@@ -55,8 +55,8 @@ class WorkbenchImportWorker
criticity: :warning,
message_key: 'inconsistent_zip_file',
message_attributes: {
- 'import_name' => @workbench_import.name,
- 'spurious_dirs' => entry.spurious.join(', ')
+ 'source_filename' => @workbench_import.file.file.file,
+ 'spurious_dirs' => entry.spurious.join(', ')
})
end
end
diff --git a/spec/workers/workbench_import/workbench_import_worker_spec.rb b/spec/workers/workbench_import/workbench_import_worker_spec.rb
index deaa1e3a5..47ca2b4ff 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.join(', ')}) }
- let( :message2_attributes ){ message_attributes.merge(message_attributes: {'import_name' => import.name, 'spurious_dirs' => spurious2.join(', ')}) }
+ let( :message1_attributes ){ message_attributes.merge(message_attributes: {'source_filename' => import.file.file.file, 'spurious_dirs' => spurious1.join(', ')}) }
+ let( :message2_attributes ){ message_attributes.merge(message_attributes: {'source_filename' => import.file.file.file, 'spurious_dirs' => spurious2.join(', ')}) }
before do
allow(import).to receive(:messages).and_return(messages)