aboutsummaryrefslogtreecommitdiffstats
path: root/spec/javascripts
diff options
context:
space:
mode:
authorThomas Haddad2017-05-16 16:28:11 +0200
committerThomas Haddad2017-05-16 16:28:57 +0200
commit34df7a4608cb5ddea8c7fddc63143c921062168c (patch)
treee00d5076d568043a88d7b3f50812bbfb00e4cd4d /spec/javascripts
parent4066aaea24fb1ebdbbe7791089a30fdaf638f2c1 (diff)
downloadchouette-core-34df7a4608cb5ddea8c7fddc63143c921062168c.tar.bz2
Refs #3403: Fix timetables modal now working as expected
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/vehicle_journeys/actions_spec.js8
-rw-r--r--spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js11
2 files changed, 10 insertions, 9 deletions
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/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)
})