diff options
| -rw-r--r-- | app/controllers/api/v1/netex_imports_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/netex_import.rb | 1 | ||||
| -rw-r--r-- | lib/stif/netex_file.rb | 2 | ||||
| -rw-r--r-- | spec/factories/netex_imports.rb | 2 | ||||
| -rw-r--r-- | spec/models/import/netex_import_spec.rb | 25 | ||||
| -rw-r--r-- | spec/models/import_spec.rb | 16 |
6 files changed, 36 insertions, 12 deletions
diff --git a/app/controllers/api/v1/netex_imports_controller.rb b/app/controllers/api/v1/netex_imports_controller.rb index fc85e35dd..0934ce915 100644 --- a/app/controllers/api/v1/netex_imports_controller.rb +++ b/app/controllers/api/v1/netex_imports_controller.rb @@ -33,7 +33,7 @@ module Api if @new_referential.persisted? attributes = attributes.merge referential_id: @new_referential.id else - attributes = attributes.merge status: "failed" + attributes = attributes.merge status: "aborted" end @netex_import = NetexImport.new attributes diff --git a/app/models/netex_import.rb b/app/models/netex_import.rb index b8702a561..b0033264d 100644 --- a/app/models/netex_import.rb +++ b/app/models/netex_import.rb @@ -25,4 +25,5 @@ class NetexImport < Import referential.destroy end end + end diff --git a/lib/stif/netex_file.rb b/lib/stif/netex_file.rb index 424663c1c..a977c1ad3 100644 --- a/lib/stif/netex_file.rb +++ b/lib/stif/netex_file.rb @@ -52,8 +52,6 @@ module STIF end end - LINE_FORMAT = /^offre_.*\.xml$/ - def add_offer_file(file_name) if file_name =~ /^offre_([^_]*)_/ line_refs << $1 diff --git a/spec/factories/netex_imports.rb b/spec/factories/netex_imports.rb index 9e9d836e4..b59267a0a 100644 --- a/spec/factories/netex_imports.rb +++ b/spec/factories/netex_imports.rb @@ -1,5 +1,7 @@ FactoryGirl.define do factory :netex_import, class: NetexImport, parent: :import do file { File.open(Rails.root.join('spec', 'fixtures', 'OFFRE_TRANSDEV_2017030112251.zip')) } + association :parent, factory: :workbench_import + end end diff --git a/spec/models/import/netex_import_spec.rb b/spec/models/import/netex_import_spec.rb new file mode 100644 index 000000000..e15fbb977 --- /dev/null +++ b/spec/models/import/netex_import_spec.rb @@ -0,0 +1,25 @@ +RSpec.describe NetexImport, type: :model do + + + context 'with referential' do + it 'will trigger the Java API' do + + end + end + + context 'without referential' do + subject { build :netex_import, referential_id: nil } + + it 'is aborted if it does not have a referential' do + require 'pry'; binding.pry + + + end + + it 'will not trigger the Java API' do + + end + + end + +end diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb index 7be05908a..4e8aac3f4 100644 --- a/spec/models/import_spec.rb +++ b/spec/models/import_spec.rb @@ -13,9 +13,9 @@ RSpec.describe Import, type: :model do it { should allow_value('file.zip').for(:file).with_message(I18n.t('activerecord.errors.models.import.attributes.file.wrong_file_extension')) } it { should_not allow_values('file.json', 'file.png', 'file.pdf').for(:file) } - let(:workbench_import) { build_stubbed(:workbench_import) } + let(:workbench_import) {netex_import.parent} let(:workbench_import_with_completed_steps) do - workbench_import = build_stubbed( + build_stubbed( :workbench_import, total_steps: 2, current_step: 2 @@ -23,20 +23,18 @@ RSpec.describe Import, type: :model do end let(:netex_import) do - netex_import = build_stubbed( - :netex_import, - parent: workbench_import + build_stubbed( + :netex_import ) end describe "#destroy" do it "must destroy all child imports" do - workbench_import = create(:workbench_import) - create(:netex_import, parent: workbench_import) + netex_import = create(:netex_import) - workbench_import.destroy + netex_import.parent.destroy - expect(workbench_import).to be_destroyed + expect(netex_import.parent).to be_destroyed expect(NetexImport.count).to eq(0) end |
