Merge branch 'master' into staging

5 files changed, 27 insertions, 14 deletions

diff --git a/spec/javascripts/time_table/actions_spec.js b/spec/javascripts/time_table/actions_spec.js
index 1ab5635a0..9756e797f 100644
--- a/spec/javascripts/time_table/actions_spec.js
+++ b/spec/javascripts/time_table/actions_spec.js
@@ -13,11 +13,12 @@ const day = {
 }
 describe('actions', () => {
   it('should create an action to update dayTypes', () => {
+    let obj = {}
     const expectedAction = {
       type: 'UPDATE_DAY_TYPES',
-      index: 1
+      dayTypes: obj
     }
-    expect(actions.updateDayTypes(1)).toEqual(expectedAction)
+    expect(actions.updateDayTypes(obj)).toEqual(expectedAction)
   })
 
   it('should create an action to update comment', () => {
diff --git a/spec/javascripts/time_table/reducers/metas_spec.js b/spec/javascripts/time_table/reducers/metas_spec.js
index 61e3048db..79dbe1ea3 100644
--- a/spec/javascripts/time_table/reducers/metas_spec.js
+++ b/spec/javascripts/time_table/reducers/metas_spec.js
@@ -24,11 +24,11 @@ describe('metas reducer', () => {
   })
 
   it('should handle UPDATE_DAY_TYPES', () => {
-    const arr = [false, true, true, true, true, true, true]
+    const arr = [false, false, true, true, true, true, true]
     expect(
       metasReducer(state, {
         type: 'UPDATE_DAY_TYPES',
-        index: 0
+        dayTypes: arr
       })
     ).toEqual(Object.assign({}, state, {day_types: arr, calendar: {name: 'Aucun'}}))
   })
diff --git a/spec/javascripts/vehicle_journeys/actions_spec.js b/spec/javascripts/vehicle_journeys/actions_spec.js
index 351b8038b..19f65046f 100644
--- a/spec/javascripts/vehicle_journeys/actions_spec.js
+++ b/spec/javascripts/vehicle_journeys/actions_spec.js
@@ -249,11 +249,13 @@ describe('when clicking on delete button next to a timetable inside modal', () =
 describe('when clicking on validate button inside calendars modal', () => {
   it('should create an action to update vj calendars', () => {
     const vehicleJourneys = []
+    const timetables = []
     const expectedAction = {
-      type: 'EDIT_VEHICLEJOURNEYS_CALENDARS',
-      vehicleJourneys
+      type: 'EDIT_VEHICLEJOURNEYS_TIMETABLES',
+      vehicleJourneys,
+      timetables
     }
-    expect(actions.editVehicleJourneyCalendars(vehicleJourneys)).toEqual(expectedAction)
+    expect(actions.editVehicleJourneyTimetables(vehicleJourneys, timetables)).toEqual(expectedAction)
   })
 })
 describe('when clicking on add button inside calendars modal', () => {
diff --git a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js
index 1dea403cb..2ab88386a 100644
--- a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js
+++ b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js
@@ -28,8 +28,10 @@ describe('filters reducer', () => {
         }
       },
       journeyPattern: {},
+      vehicleJourney: {},
       timetable: {},
       withoutSchedule: true,
+      withoutTimeTable: false
     },
     queryString: ''
     }
@@ -144,7 +146,16 @@ describe('filters reducer', () => {
   })
 
   it('should handle CREATE_QUERY_STRING', () => {
-    let strResult = 'q%5Bjourney_pattern_id_eq%5D=undefined&q%5Btime_tables_id_eq%5D=undefined'
+    let strResult = [
+      "q%5Bjourney_pattern_id_eq%5D=undefined",
+      "&q%5Bobjectid_cont%5D=undefined",
+      "&q%5Btime_tables_id_eq%5D=undefined",
+      "&q%5Bvehicle_journey_at_stops_departure_time_gteq%5D=11%3A11",
+      "&q%5Bvehicle_journey_at_stops_departure_time_lteq%5D=22%3A22",
+      "&q%5Bvehicle_journey_without_departure_time%5D=true",
+      "&q%5Bvehicle_journey_without_time_table%5D=false"
+    ].join('')
+
     expect(
       statusReducer(state, {
         type: 'CREATE_QUERY_STRING',
diff --git a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
index 6dc07e9bd..f805852c7 100644
--- a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
+++ b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
@@ -251,15 +251,14 @@ describe('vehicleJourneys reducer', () => {
   })
 
 
-  it('should handle EDIT_VEHICLEJOURNEYS_CALENDARS', () => {
+  it('should handle EDIT_VEHICLEJOURNEYS_TIMETABLES', () => {
     let newState = JSON.parse(JSON.stringify(state))
-    newState.map((vj, i) =>{
-      return Object.assign({}, vj, {time_tables : vj.time_tables[0]})
-    })
+    newState[0].time_tables = [fakeTimeTables[0]]
     expect(
       vjReducer(state, {
-        type: 'EDIT_VEHICLEJOURNEYS_CALENDARS',
-        vehicleJourneys: newState
+        type: 'EDIT_VEHICLEJOURNEYS_TIMETABLES',
+        vehicleJourneys: state,
+        timetables: [fakeTimeTables[0]]
       })
     ).toEqual(newState)
   })