diff options
| author | Michel Etienne | 2014-09-11 22:12:07 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-09-11 22:12:07 +0200 |
| commit | fa653dca5e37b9b8cd5bbc5a63a6b21451c4d204 (patch) | |
| tree | 336d3f2ceba06c51c97e455675266c4315e2e1b3 /spec | |
| parent | 06ff98378cc619a111e9f105424c920aa21561dc (diff) | |
| download | chouette-core-fa653dca5e37b9b8cd5bbc5a63a6b21451c4d204.tar.bz2 | |
add vehicle_type_identifier and set id instead of objectid on csv vehicle_journey exchange
Diffstat (limited to 'spec')
5 files changed, 16 insertions, 3 deletions
diff --git a/spec/fixtures/vehicle_journey_imports_valid.csv b/spec/fixtures/vehicle_journey_imports_valid.csv index 15f66a26f..13b59b102 100644 --- a/spec/fixtures/vehicle_journey_imports_valid.csv +++ b/spec/fixtures/vehicle_journey_imports_valid.csv @@ -1,5 +1,6 @@ ;id course;import:VehicleJourney:1;import:VehicleJourney:2;import:VehicleJourney:3; ;numéro;1;2;3;4 +;identifiant véhicule;11;12;13;14 ;PMR (O(ui)|N(on)|vide si inconnu);Oui;;; ;TAD (O(ui)|N(on)|vide si inconnu);Oui;;; ;calendriers;;;; diff --git a/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv b/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv index 6ed6d90b2..34fbbb6bb 100644 --- a/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv +++ b/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv @@ -1,5 +1,6 @@ -;id course;invalid vj;import:VehicleJourney:2;import:VehicleJourney:3 +;id course;9999;import:VehicleJourney:2;import:VehicleJourney:3 ;numéro;1;2;3 +;identifiant véhicule;11;12;13 ;PMR (O(ui)|N(on)|vide si inconnu);Oui;; ;TAD (O(ui)|N(on)|vide si inconnu);Oui;; ;calendriers;;; diff --git a/spec/fixtures/vehicle_journey_imports_with_vjas_bad_order.csv b/spec/fixtures/vehicle_journey_imports_with_vjas_bad_order.csv index d4da585d0..6dc20cfeb 100644 --- a/spec/fixtures/vehicle_journey_imports_with_vjas_bad_order.csv +++ b/spec/fixtures/vehicle_journey_imports_with_vjas_bad_order.csv @@ -1,5 +1,6 @@ ;id course;import:VehicleJourney:1;import:VehicleJourney:2; ;numéro;1;2;3 +;identifiant véhicule;11;12;13 ;PMR (O(ui)|N(on)|vide si inconnu);Oui;; ;TAD (O(ui)|N(on)|vide si inconnu);Oui;; ;calendriers;;; diff --git a/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv b/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv index 687f6b09a..c7745849f 100644 --- a/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv +++ b/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv @@ -1,5 +1,6 @@ ;id course;import:VehicleJourney:1;import:VehicleJourney:2; ;numéro;1;2;3 +;identifiant véhicule;11;12;13 ;PMR (O(ui)|N(on)|vide si inconnu);Oui;; ;TAD (O(ui)|N(on)|vide si inconnu);Oui;; ;calendriers;;;; diff --git a/spec/models/vehicle_journey_import_spec.rb b/spec/models/vehicle_journey_import_spec.rb index f6e82bccb..68f8669e0 100644 --- a/spec/models/vehicle_journey_import_spec.rb +++ b/spec/models/vehicle_journey_import_spec.rb @@ -7,10 +7,19 @@ describe VehicleJourneyImport do csv_file = CSV.open("/tmp/#{filename}", "wb",{ :col_sep => ";"}) do |csv| counter = 0 CSV.foreach( Rails.root.join("spec", "fixtures", "#{filename}").to_s , {:col_sep => ";"}) do |row| - if counter < 6 + if counter == 0 + row2 = [] + row.each do |cell| + cell = vehicle_journey1.id.to_s if cell == "import:VehicleJourney:1" + cell = vehicle_journey2.id.to_s if cell == "import:VehicleJourney:2" + cell = vehicle_journey3.id.to_s if cell == "import:VehicleJourney:3" + row2 << cell + end + csv << row2 + elsif counter < 7 csv << row else - csv << ( row[0] = route.stop_points[counter - 6].id; row) + csv << ( row[0] = route.stop_points[counter - 7].id; row) end counter += 1 end |