diff options
Diffstat (limited to 'spec')
7 files changed, 11 insertions, 6 deletions
diff --git a/spec/fixtures/vehicle_journey_imports_valid.csv b/spec/fixtures/vehicle_journey_imports_valid.csv index 3126ffe2b..85a505ab6 100644 --- a/spec/fixtures/vehicle_journey_imports_valid.csv +++ b/spec/fixtures/vehicle_journey_imports_valid.csv @@ -4,6 +4,7 @@ ;PMR (O(ui)|N(on)|vide si inconnu);Oui;;; ;TAD (O(ui)|N(on)|vide si inconnu);Oui;;; ;calendriers;;;; +;notes de bas de page;;;; id arrêt;nom arrêt;;;; 1;Arrêt 1;9:00:00;;11:10:00;12:10:00 2;Arrêt 2;9:05:00;10:05:00;11:15:00;12:15:00 diff --git a/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv b/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv index 7aa59009e..beec85c4c 100644 --- a/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv +++ b/spec/fixtures/vehicle_journey_imports_with_vj_invalid.csv @@ -4,6 +4,7 @@ ;PMR (O(ui)|N(on)|vide si inconnu);Oui;; ;TAD (O(ui)|N(on)|vide si inconnu);Oui;; ;calendriers;;; +;notes de bas de page;;; id arrêt;nom arrêt;;; 1;Arrêt 1;9:00:00;10:05:00;11:10:00 2;Arrêt 2;11:05:00;;11:15:00 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 df6b1acff..c1bb85881 100644 --- a/spec/fixtures/vehicle_journey_imports_with_vjas_bad_order.csv +++ b/spec/fixtures/vehicle_journey_imports_with_vjas_bad_order.csv @@ -4,6 +4,7 @@ ;PMR (O(ui)|N(on)|vide si inconnu);Oui;; ;TAD (O(ui)|N(on)|vide si inconnu);Oui;; ;calendriers;;; +;notes de bas de page;;; id arrêt;nom arrêt;;; 1;Arrêt 1;9:05:00;10:05:00;11:10:00 2;Arrêt 2;11:05:00;;11:15:00 diff --git a/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv b/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv index bcb07a177..95799e9d9 100644 --- a/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv +++ b/spec/fixtures/vehicle_journey_imports_with_vjas_invalid.csv @@ -4,6 +4,7 @@ ;PMR (O(ui)|N(on)|vide si inconnu);Oui;; ;TAD (O(ui)|N(on)|vide si inconnu);Oui;; ;calendriers;;;; +;notes de bas de page;;;; id arrêt;nom arrêt;;; 1;Arrêt 1;invalid time;10:05:00;11:10:00 2;Arrêt 2;9:05:00;;11:15:00 diff --git a/spec/models/vehicle_journey_export_spec.rb b/spec/models/vehicle_journey_export_spec.rb index 5ce3b9bfc..a5e0c2f6d 100644 --- a/spec/models/vehicle_journey_export_spec.rb +++ b/spec/models/vehicle_journey_export_spec.rb @@ -3,8 +3,9 @@ require 'spec_helper' describe VehicleJourneyExport do - let!(:route) { create(:route) } - let!(:other_route) { create(:route) } + let!(:line) { create(:line) } + let!(:route) { create(:route, :line => line) } + let!(:other_route) { create(:route, :line => line) } let!(:journey_pattern) { create(:journey_pattern, :route => route) } let!(:other_journey_pattern) { create(:journey_pattern_even, :route => route) } diff --git a/spec/models/vehicle_journey_import_spec.rb b/spec/models/vehicle_journey_import_spec.rb index 68f8669e0..820d92382 100644 --- a/spec/models/vehicle_journey_import_spec.rb +++ b/spec/models/vehicle_journey_import_spec.rb @@ -16,10 +16,10 @@ describe VehicleJourneyImport do row2 << cell end csv << row2 - elsif counter < 7 + elsif counter < 8 csv << row else - csv << ( row[0] = route.stop_points[counter - 7].id; row) + csv << ( row[0] = route.stop_points[counter - 8].id; row) end counter += 1 end diff --git a/spec/requests/vehicle_journey_imports_spec.rb b/spec/requests/vehicle_journey_imports_spec.rb index 68fe04e0b..e1e046980 100644 --- a/spec/requests/vehicle_journey_imports_spec.rb +++ b/spec/requests/vehicle_journey_imports_spec.rb @@ -29,10 +29,10 @@ describe "VehicleJourneyImports" do row2 << cell end csv << row2 - elsif counter < 7 + elsif counter < 8 csv << row else - csv << ( row[0] = route.stop_points[counter - 7].id; row) + csv << ( row[0] = route.stop_points[counter - 8].id; row) end counter += 1 end |