Refs: #3507@1h; Merge with 1726_... and validations on NetexImport

3 files changed, 24 insertions, 2 deletions

diff --git a/app/models/netex_import.rb b/app/models/netex_import.rb
index 0cf4d0a7c..d79346d0d 100644
--- a/app/models/netex_import.rb
+++ b/app/models/netex_import.rb
@@ -2,6 +2,8 @@ require 'net/http'
 class NetexImport < Import
   after_commit :launch_java_import
 
+  validates_presence_of :referential, :workbench
+
   def launch_java_import
     logger.warn  "Call iev get #{Rails.configuration.iev_url}/boiv_iev/referentials/importer/new?id=#{id}"
     begin
diff --git a/spec/models/netex_import_spec.rb b/spec/models/netex_import_spec.rb
new file mode 100644
index 000000000..baffea456
--- /dev/null
+++ b/spec/models/netex_import_spec.rb
@@ -0,0 +1,21 @@
+RSpec.describe NetexImport do
+
+  subject{ build :netex_import }
+
+  it 'base case' do
+    expect_it.to be_valid
+  end
+
+  context 'validates presence of' do 
+    it 'referential' do
+      subject.referential_id = nil
+      expect_it.not_to be_valid
+    end
+
+
+    it 'workbench' do
+      subject.workbench_id = nil
+      expect_it.not_to be_valid
+    end
+  end
+end
diff --git a/spec/workers/workbench_import_worker_spec.rb b/spec/workers/workbench_import_worker_spec.rb
index bfe631fc4..e87e6873f 100644
--- a/spec/workers/workbench_import_worker_spec.rb
+++ b/spec/workers/workbench_import_worker_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe WorkbenchImportWorker, type: [:worker, :request] do
   let( :referential ){ import.referential }
   let( :api_key ){ build_stubbed :api_key, referential: referential }
 
+  # /workbenches/:workbench_id/imports/:id/download
   let( :path ){ download_workbench_import_path(workbench, import) }
   let( :result ){ import.file.read }
 
@@ -14,11 +15,9 @@ RSpec.describe WorkbenchImportWorker, type: [:worker, :request] do
     allow(Import).to receive(:find).with(import.id).and_return(import)
   end
   it 'downloads a zip file' do
-    # /workbenches/:workbench_id/imports/:id/download
     stub_request(:get, path)
       .with(headers: authorization_token_header(api_key))
       .to_return(body: result)
-    # WTH was I trying to test ;) Ah yeah HTTP into download
     worker.perform import.id
     expect( worker.downloaded ).to eq( result )
   end