Merge branch 'master' into staging

2 files changed, 4 insertions, 2 deletions

diff --git a/spec/javascripts/time_table/reducers/metas_spec.js b/spec/javascripts/time_table/reducers/metas_spec.js
index 79dbe1ea3..5ec7a0034 100644
--- a/spec/javascripts/time_table/reducers/metas_spec.js
+++ b/spec/javascripts/time_table/reducers/metas_spec.js
@@ -30,7 +30,7 @@ describe('metas reducer', () => {
         type: 'UPDATE_DAY_TYPES',
         dayTypes: arr
       })
-    ).toEqual(Object.assign({}, state, {day_types: arr, calendar: {name: 'Aucun'}}))
+    ).toEqual(Object.assign({}, state, {day_types: arr, calendar: null}))
   })
 
   it('should handle UPDATE_COMMENT', () => {
diff --git a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
index f805852c7..662c3d82f 100644
--- a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
+++ b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
@@ -88,7 +88,8 @@ describe('vehicleJourneys reducer', () => {
       dummy: true
     }]
     let fakeData = {
-      published_journey_name: {value: 'test'}
+      published_journey_name: {value: 'test'},
+      published_journey_identifier: {value : ''}
     }
     let fakeSelectedJourneyPattern = {id: "1"}
     let fakeSelectedCompany = {name: "ALBATRANS"}
@@ -104,6 +105,7 @@ describe('vehicleJourneys reducer', () => {
       journey_pattern: fakeSelectedJourneyPattern,
       company: fakeSelectedCompany,
       published_journey_name: 'test',
+      published_journey_identifier: '',
       objectid: '',
       footnotes: [],
       time_tables: [],