Refs #6998: Fix JS specs6998-fix-jest-specs

4 files changed, 26 insertions, 24 deletions

diff --git a/spec/javascript/vehicle_journeys/actions_spec.js b/spec/javascript/vehicle_journeys/actions_spec.js
index bfbb4fb36..29e5586d0 100644
--- a/spec/javascript/vehicle_journeys/actions_spec.js
+++ b/spec/javascript/vehicle_journeys/actions_spec.js
@@ -1,4 +1,6 @@
 import actions from '../../../app/javascript/vehicle_journeys/actions/index'
+import _ from 'lodash'
+window._  = _
 
 const dispatch = function(){}
 window.fetch = function(){return Promise.resolve()}
@@ -94,10 +96,12 @@ describe('when using select2 to pick a journey pattern', () => {
       selectedItem:{
         id: selectedJP.id,
         objectid: selectedJP.object_id,
+        object_id: selectedJP.object_id,
         short_id: selectedJP.object_id,
         name: selectedJP.name,
         published_name: selectedJP.published_name,
-        stop_areas: selectedJP.stop_area_short_descriptions
+        stop_areas: selectedJP.stop_area_short_descriptions,
+        stop_area_short_descriptions: selectedJP.stop_area_short_descriptions
       }
     }
     expect(actions.selectJPCreateModal(selectedJP)).toEqual(expectedAction)
diff --git a/spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js b/spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js
index 4f8d42d2d..1ca386346 100644
--- a/spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js
+++ b/spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import CustomFieldsInputs from '../../../../app/javascript/vehicle_journeys/components/tools/CustomFieldsInputs'
+import CustomFieldsInputs from '../../../../app/javascript/helpers/CustomFieldsInputs'
 import renderer from 'react-test-renderer'
 require('select2')
 
diff --git a/spec/javascript/vehicle_journeys/components/VehicleJourneys_spec.js b/spec/javascript/vehicle_journeys/components/VehicleJourneys_spec.js
index f78d5238c..38e4f17a7 100644
--- a/spec/javascript/vehicle_journeys/components/VehicleJourneys_spec.js
+++ b/spec/javascript/vehicle_journeys/components/VehicleJourneys_spec.js
@@ -1,13 +1,8 @@
 import React, { Component } from 'react'
 import VehicleJourneys from '../../../../app/javascript/vehicle_journeys/components/VehicleJourneys'
 import renderer from 'react-test-renderer'
-import fs from 'fs'
 
-import I18n from '../../../../public/javascripts/i18n'
-import decorateI18n from '../../../../app/assets/javascripts/i18n/extended.coffee'
-window.I18n = decorateI18n(I18n)
-I18n.locale = "fr"
-eval(fs.readFileSync('./public/javascripts/translations.js')+'')
+import I18n from '../../support/jest-i18n'
 
 describe('stopPointHeader', () => {
   set('features', () => {
diff --git a/spec/javascript/vehicle_journeys/reducers/vehicleJourneys_spec.js b/spec/javascript/vehicle_journeys/reducers/vehicleJourneys_spec.js
index bfa0942c6..a48a4431d 100644
--- a/spec/javascript/vehicle_journeys/reducers/vehicleJourneys_spec.js
+++ b/spec/javascript/vehicle_journeys/reducers/vehicleJourneys_spec.js
@@ -107,6 +107,7 @@ describe('vehicleJourneys reducer', () => {
         selectedCompany: fakeSelectedCompany
       })
     ).toEqual([{
+      ignored_routing_contraint_zone_ids: [],
       journey_pattern: fakeSelectedJourneyPattern,
       company: fakeSelectedCompany,
       published_journey_name: 'test',
@@ -145,7 +146,7 @@ describe('vehicleJourneys reducer', () => {
       dummy: false
     },
     {
-      delta : 0,
+      delta : 10,
       arrival_time : {
         hour: 23,
         minute: 2
@@ -154,8 +155,6 @@ describe('vehicleJourneys reducer', () => {
         hour: 23,
         minute: 12
       },
-      departure_day_offset: -1,
-      arrival_day_offset: -1,
       stop_point_objectid: 'test-2',
       stop_area_cityname: 'city',
       dummy: false
@@ -223,6 +222,7 @@ describe('vehicleJourneys reducer', () => {
         selectedCompany: fakeSelectedCompany
       })
     ).toEqual([{
+      ignored_routing_contraint_zone_ids: [],
       journey_pattern: fakeSelectedJourneyPattern,
       company: fakeSelectedCompany,
       published_journey_name: 'test',
@@ -245,26 +245,26 @@ describe('vehicleJourneys reducer', () => {
     let pristineVjasList = [{
       delta : 0,
       arrival_time : {
-        hour: 21,
-        minute: 54
+        hour: 22,
+        minute: 59
       },
       departure_time : {
-        hour: 21,
-        minute: 54
+        hour: 22,
+        minute: 59
       },
       stop_point_objectid: 'test-1',
       stop_area_cityname: 'city',
       dummy: false
     },
     {
-      delta : 0,
+      delta : 10,
       arrival_time : {
-        hour: 21,
-        minute: 57
+        hour: 23,
+        minute: 2
       },
       departure_time : {
-        hour: 22,
-        minute: 7
+        hour: 23,
+        minute: 12
       },
       stop_point_objectid: 'test-2',
       stop_area_cityname: 'city',
@@ -287,12 +287,12 @@ describe('vehicleJourneys reducer', () => {
     {
       delta : 0,
       arrival_time : {
-        hour: 23,
-        minute: 37
+        hour: 0,
+        minute: 42
       },
       departure_time : {
-        hour: 23,
-        minute: 37
+        hour: 0,
+        minute: 42
       },
       stop_point_objectid: 'test-4',
       stop_area_cityname: 'city',
@@ -334,6 +334,7 @@ describe('vehicleJourneys reducer', () => {
         selectedCompany: fakeSelectedCompany
       })
     ).toEqual([{
+      ignored_routing_contraint_zone_ids: [],
       journey_pattern: fakeSelectedJourneyPattern,
       company: fakeSelectedCompany,
       published_journey_name: 'test',
@@ -418,6 +419,7 @@ describe('vehicleJourneys reducer', () => {
       short_id: '',
       objectid: '',
       footnotes: [],
+      ignored_routing_contraint_zone_ids: [],
       time_tables: [],
       purchase_windows: [],
       vehicle_journey_at_stops: pristineVjasList,
@@ -495,6 +497,7 @@ describe('vehicleJourneys reducer', () => {
       short_id: '',
       objectid: '',
       footnotes: [],
+      ignored_routing_contraint_zone_ids: [],
       time_tables: [],
       purchase_windows: [],
       vehicle_journey_at_stops: pristineVjasList,