diff options
| author | Xinhui | 2017-06-16 17:58:08 +0200 |
|---|---|---|
| committer | Xinhui | 2017-06-16 17:58:08 +0200 |
| commit | 641b1458236d2718a76ffaf0c04a5998623276bf (patch) | |
| tree | db738af25bcdd7b3b400a0f8db5e6350ef373c51 /spec/javascripts | |
| parent | 6886441ce86bcd720b27cdd089567def5b9d771a (diff) | |
| parent | 9ef3d205aa091d509455b3607d5ecc74431c6196 (diff) | |
| download | chouette-core-641b1458236d2718a76ffaf0c04a5998623276bf.tar.bz2 | |
Merge branch 'master' into staging
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/time_table/reducers/pagination_spec.js | 7 | ||||
| -rw-r--r-- | spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/spec/javascripts/time_table/reducers/pagination_spec.js b/spec/javascripts/time_table/reducers/pagination_spec.js index 740ded3ac..5da58427e 100644 --- a/spec/javascripts/time_table/reducers/pagination_spec.js +++ b/spec/javascripts/time_table/reducers/pagination_spec.js @@ -118,11 +118,4 @@ describe('pagination reducer', () => { }) ).toEqual(Object.assign({}, state, {stateChanged: true})) }) - it('should handle UPDATE_DAY_TYPES', () => { - expect( - paginationReducer(state, { - type: 'UPDATE_DAY_TYPES' - }) - ).toEqual(Object.assign({}, state, {stateChanged: true})) - }) }) diff --git a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js index 662c3d82f..23ebc3d9f 100644 --- a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js +++ b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js @@ -111,7 +111,9 @@ describe('vehicleJourneys reducer', () => { time_tables: [], vehicle_journey_at_stops: pristineVjasList, selected: false, - deletable: false + deletable: false, + transport_mode: 'undefined', + transport_submode: 'undefined' }, ...state]) }) |
