aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2017-08-27 14:20:15 +0200
committerAlban Peignier2017-08-27 14:20:15 +0200
commit954902fde8f78bd276a1ce11048fe26af47a0d64 (patch)
treef7247e1f7fece65333f8c80421a3a71fc70fa50b
parent15ab19a081cc2272f6d1fff280a72060d02a35d4 (diff)
downloadchouette-core-954902fde8f78bd276a1ce11048fe26af47a0d64.tar.bz2
Import#referential is mandatory only for NetexImport. Refs #4273
-rw-r--r--app/models/import.rb2
-rw-r--r--app/models/netex_import.rb1
-rw-r--r--spec/models/import_spec.rb1
-rw-r--r--spec/models/netex_import_spec.rb5
4 files changed, 7 insertions, 2 deletions
diff --git a/app/models/import.rb b/app/models/import.rb
index f8702c115..421c2e7c1 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -9,7 +9,7 @@ class Import < ActiveRecord::Base
enumerize :status, in: %i(new pending successful failed running aborted canceled)
validates :file, presence: true
- validates_presence_of :referential, :workbench
+ validates_presence_of :workbench
before_create :initialize_fields
diff --git a/app/models/netex_import.rb b/app/models/netex_import.rb
index d07acd821..bb4d53bd7 100644
--- a/app/models/netex_import.rb
+++ b/app/models/netex_import.rb
@@ -2,6 +2,7 @@ require 'net/http'
class NetexImport < Import
after_commit :launch_java_import
+ validates_presence_of :referential
def launch_java_import
logger.warn "Call iev get #{Rails.configuration.iev_url}/boiv_iev/referentials/importer/new?id=#{id}"
diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb
index 164769fd5..adefadd2b 100644
--- a/spec/models/import_spec.rb
+++ b/spec/models/import_spec.rb
@@ -7,7 +7,6 @@ RSpec.describe Import, :type => :model do
it { should enumerize(:status).in("aborted", "canceled", "failed", "new", "pending", "running", "successful") }
it { should validate_presence_of(:file) }
- it { should validate_presence_of(:referential) }
it { should validate_presence_of(:workbench) }
let(:workbench_import) { build_stubbed(:workbench_import) }
diff --git a/spec/models/netex_import_spec.rb b/spec/models/netex_import_spec.rb
new file mode 100644
index 000000000..6013bdfae
--- /dev/null
+++ b/spec/models/netex_import_spec.rb
@@ -0,0 +1,5 @@
+RSpec.describe NetexImport, :type => :model do
+
+ it { should validate_presence_of(:referential) }
+
+end