diff options
| -rw-r--r-- | app/models/chouette/vehicle_journey.rb | 2 | ||||
| -rw-r--r-- | spec/models/chouette/vehicle_journey_spec.rb | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb index 3bbd89f7b..5dcb671f1 100644 --- a/app/models/chouette/vehicle_journey.rb +++ b/app/models/chouette/vehicle_journey.rb @@ -392,7 +392,7 @@ module Chouette time -= day_offset*24.hours empty_vjas.update_attribute :arrival_time, time - empty_vjas.update_attribute :arrival_day_offset, previous_stop.arrival_day_offset + day_offset + empty_vjas.update_attribute :arrival_day_offset, previous_stop.departure_day_offset + day_offset empty_vjas.update_attribute :departure_time, time empty_vjas.update_attribute :departure_day_offset, previous_stop.departure_day_offset + day_offset previous = empty_vjas diff --git a/spec/models/chouette/vehicle_journey_spec.rb b/spec/models/chouette/vehicle_journey_spec.rb index 05560f9e3..5ab6378f9 100644 --- a/spec/models/chouette/vehicle_journey_spec.rb +++ b/spec/models/chouette/vehicle_journey_spec.rb @@ -983,6 +983,18 @@ describe Chouette::VehicleJourney, :type => :model do expect(@target_4.departure_time).to eq @target_3.arrival_time end + context "with a stop across midnight" do + before do + @middle.update arrival_time: @start.departure_time + 11.hours, departure_time: @start.departure_time + 13.hours, departure_day_offset: 1, arrival_day_offset: 0 + end + + it "should set the following stop day offset" do + @journey.reload.fill_passing_times! + expect(@target_3.reload.arrival_day_offset).to eq 1 + expect(@target_3.departure_day_offset).to eq 1 + end + end + context "with a day offset" do before do @end.update arrival_time: offset_passing_time(@middle.departure_time, - 4.hours), departure_time: offset_passing_time(@middle.departure_time, - 4.hours), departure_day_offset: 1, arrival_day_offset: 1 |