conflicts resolved

2 files changed, 9 insertions, 5 deletions

diff --git a/spec/javascripts/vehicle_journeys/actions_spec.js b/spec/javascripts/vehicle_journeys/actions_spec.js
index 19f65046f..d96baf8ef 100644
--- a/spec/javascripts/vehicle_journeys/actions_spec.js
+++ b/spec/javascripts/vehicle_journeys/actions_spec.js
@@ -188,11 +188,13 @@ describe('when clicking on validate button inside editing modal', () => {
 describe('when clicking on validate button inside duplicating modal', () => {
   it('should create an action to duplicate a vehiclejourney schedule', () => {
     const data = {}
+    const departureDelta = 0
     const expectedAction = {
       type: 'DUPLICATE_VEHICLEJOURNEY',
-      data
+      data,
+      departureDelta
     }
-    expect(actions.duplicateVehicleJourney(data)).toEqual(expectedAction)
+    expect(actions.duplicateVehicleJourney(data, departureDelta)).toEqual(expectedAction)
   })
 })
 describe('when clicking on edit notes modal', () => {
diff --git a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
index 23ebc3d9f..620e2ffdd 100644
--- a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
+++ b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
@@ -216,14 +216,15 @@ describe('vehicleJourneys reducer', () => {
       delta: 627,
       arrival_time : {
         hour: '12',
-        minute: '00'
+        minute: '01'
       },
       departure_time : {
         hour: '22',
-        minute: '27'
+        minute: '28'
       },
       stop_area_object_id : "FR:92024:ZDE:420553:STIF"
     }]
+    let departureDelta = 1
     let fakeData = {
       duplicate_number: {value : 1},
       additional_time: {value: '5'}
@@ -234,7 +235,8 @@ describe('vehicleJourneys reducer', () => {
     expect(
       vjReducer(state, {
         type: 'DUPLICATE_VEHICLEJOURNEY',
-        data: fakeData
+        data: fakeData,
+        departureDelta
       })
     ).toEqual([state[0], newVJ, state[1]])
   })