From 34df7a4608cb5ddea8c7fddc63143c921062168c Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Tue, 16 May 2017 16:28:11 +0200 Subject: Refs #3403: Fix timetables modal now working as expected Signed-off-by: Thomas Shawarma Haddad --- spec/javascripts/vehicle_journeys/actions_spec.js | 8 +++++--- .../vehicle_journeys/reducers/vehicle_journeys_spec.js | 11 +++++------ 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'spec/javascripts') 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) }) -- cgit v1.2.3 From 7457da790a9551746c6331787e2a9ef875b59000 Mon Sep 17 00:00:00 2001 From: jpl Date: Wed, 17 May 2017 13:22:55 +0200 Subject: Fix tests --- spec/javascripts/vehicle_journeys/reducers/filters_spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'spec/javascripts') diff --git a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js index d5cdff430..350bf546c 100644 --- a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js +++ b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js @@ -28,6 +28,7 @@ describe('filters reducer', () => { } }, journeyPattern: {}, + vehicleJourney: {}, timetable: {}, withoutSchedule: true, }, @@ -144,7 +145,7 @@ 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&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" + 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" expect( statusReducer(state, { type: 'CREATE_QUERY_STRING', -- cgit v1.2.3 From 6d1c591c81f9a000e9e8080bb08701450926250e Mon Sep 17 00:00:00 2001 From: jpl Date: Wed, 17 May 2017 14:43:09 +0200 Subject: Refs #3404: start adding no_timetable filter on VJ --- spec/javascripts/vehicle_journeys/reducers/filters_spec.js | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/javascripts') diff --git a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js index 350bf546c..e0e5460f7 100644 --- a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js +++ b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js @@ -31,6 +31,7 @@ describe('filters reducer', () => { vehicleJourney: {}, timetable: {}, withoutSchedule: true, + withoutTimeTable: true }, queryString: '' } -- cgit v1.2.3 From 7b498a92d79a0305b98418774b65cf9fcb1ce237 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Mon, 22 May 2017 14:39:35 +0200 Subject: vehicle_journeys/reducers/filters_spec: Fix CREATE_QUERY_STRING test My change to add the `vehicle_journey_without_time_table` filter option in c84330abb5f52d42e1aa7ec9e5db930d8e23163e broke this test because my change modified the query string. Add in the new `vehicle_journey_without_time_table` param to the expected query string. Also rewrite the string as an array to make it a little easier to read. --- spec/javascripts/vehicle_journeys/reducers/filters_spec.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'spec/javascripts') diff --git a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js index e0e5460f7..0a6729c8b 100644 --- a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js +++ b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js @@ -146,7 +146,16 @@ describe('filters reducer', () => { }) it('should handle CREATE_QUERY_STRING', () => { - 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" + 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=true" + ].join('') + expect( statusReducer(state, { type: 'CREATE_QUERY_STRING', -- cgit v1.2.3 From b8bc80a30cdee3448cb97483451a16573ee7bc26 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Mon, 22 May 2017 15:27:50 +0200 Subject: vehicle_journeys: Initialize `withoutTimeTable` to `false` This filter, currently called "Afficher les courses sans calendrier", needs to not do anything by default and be set to "Non". When toggled to "Oui", it should filter to show only the vehicle journeys that have no associated calendar. Change the toggle and the initial value of the state variable that it's backed by to "Non" and `false` to reflect this definition. See 44712fe052e0c554c0510d4665a35c66540ffa05 and a6aae5dc43eb89ba7ebc5f794f03ce722986957a for more information. Refs #3427 --- spec/javascripts/vehicle_journeys/reducers/filters_spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/javascripts') diff --git a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js index 0a6729c8b..2ab88386a 100644 --- a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js +++ b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js @@ -31,7 +31,7 @@ describe('filters reducer', () => { vehicleJourney: {}, timetable: {}, withoutSchedule: true, - withoutTimeTable: true + withoutTimeTable: false }, queryString: '' } @@ -153,7 +153,7 @@ describe('filters reducer', () => { "&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=true" + "&q%5Bvehicle_journey_without_time_table%5D=false" ].join('') expect( -- cgit v1.2.3 From b8b9af8b1f7cd29d8974607a946120f379aaf79a Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Mon, 22 May 2017 17:20:53 +0200 Subject: Refs 3448: fix daytypes only applied to days within periods Signed-off-by: Thomas Shawarma Haddad --- spec/javascripts/time_table/actions_spec.js | 5 +++-- spec/javascripts/time_table/reducers/metas_spec.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'spec/javascripts') diff --git a/spec/javascripts/time_table/actions_spec.js b/spec/javascripts/time_table/actions_spec.js index a8abd8f90..ebd1bb04c 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'}})) }) -- cgit v1.2.3