Merge pull request #385 from af83/6203-journeypatternscollection-show--use-route-WayCosts-in-c

JourneyPatternsCollection#show use route way costs as default cost. Refs #6203

3 files changed, 70 insertions, 2 deletions

diff --git a/spec/javascript/journey_patterns/components/JourneyPattern_spec.js b/spec/javascript/journey_patterns/components/JourneyPattern_spec.js
index 0da75ad47..82c996424 100644
--- a/spec/javascript/journey_patterns/components/JourneyPattern_spec.js
+++ b/spec/javascript/journey_patterns/components/JourneyPattern_spec.js
@@ -26,7 +26,8 @@ describe('the edit button', () => {
         stop_points: []
       },
       index: 0,
-      editMode: editMode
+      editMode: editMode,
+      fetchRouteCosts: () => {}
     }
     let list = renderer.create(
       <JourneyPattern
@@ -38,6 +39,7 @@ describe('the edit button', () => {
         onDeleteJourneyPattern={props.onDeleteJourneyPattern}
         onOpenEditModal={props.onOpenEditModal}
         editMode={props.editMode}
+        fetchRouteCosts={props.fetchRouteCosts}
       />
     )
 
diff --git a/spec/javascript/journey_patterns/components/JourneyPatterns_spec.js b/spec/javascript/journey_patterns/components/JourneyPatterns_spec.js
index 0c852deff..b6f83963b 100644
--- a/spec/javascript/journey_patterns/components/JourneyPatterns_spec.js
+++ b/spec/javascript/journey_patterns/components/JourneyPatterns_spec.js
@@ -15,7 +15,8 @@ describe('stopPointHeader', () => {
       onLoadFirstPage: ()=>{},
       onOpenEditModal: ()=>{},
       stopPointsList: [stop_point, same_city_stop_point, other_country_stop_point],
-      journeyPatterns: []
+      journeyPatterns: [],
+      fetchRouteCosts: () => {}
     }
     let list = renderer.create(
       <JourneyPatterns
@@ -25,6 +26,7 @@ describe('stopPointHeader', () => {
         onCheckboxChange={props.onCheckboxChange}
         onLoadFirstPage={props.onLoadFirstPage}
         onOpenEditModal={props.onOpenEditModal}
+        fetchRouteCosts={props.fetchRouteCosts}
       />
     ).toJSON()
 
diff --git a/spec/javascript/journey_patterns/reducers/journey_patterns_spec.js b/spec/javascript/journey_patterns/reducers/journey_patterns_spec.js
index bfa87d24a..ce3bdc055 100644
--- a/spec/javascript/journey_patterns/reducers/journey_patterns_spec.js
+++ b/spec/javascript/journey_patterns/reducers/journey_patterns_spec.js
@@ -132,6 +132,70 @@ describe('journeyPatterns reducer', () => {
     ).toEqual([state[0], new_state])
   })
 
+  it('should handle RECEIVE_ROUTE_COSTS', () => {
+    const costs = {
+      "1-2": {
+        distance: 1,
+        time: 9,
+      },
+      "2-3": {
+        distance: 23,
+        time: 10
+      }
+    }
+    const new_costs = {
+      "1-2": {
+        distance: 0,
+        time: 10,
+      },
+      "2-3": {
+        distance: 23,
+        time: 10
+      }
+    }
+    const new_state = Object.assign({}, state[1], {costs: new_costs})
+    expect(
+      jpReducer(state, {
+        type: 'RECEIVE_ROUTE_COSTS',
+        costs,
+        key: '2-3',
+        index: 1
+      })
+    ).toEqual([state[0], new_state])
+  })
+
+  it('should handle RECEIVE_ROUTE_COSTS when cost key is missing', () => {
+    const costs = {
+      "1-2": {
+        distance: 1,
+        time: 9,
+      },
+      "2-3": {
+        distance: 23,
+        time: 10
+      }
+    }
+    const new_costs = {
+      "1-2": {
+        distance: 0,
+        time: 10,
+      },
+      "3-4": {
+        distance: 0,
+        time: 0
+      }
+    }
+    const new_state = Object.assign({}, state[1], {costs: new_costs})
+    expect(
+      jpReducer(state, {
+        type: 'RECEIVE_ROUTE_COSTS',
+        costs,
+        key: '3-4',
+        index: 1
+      })
+    ).toEqual([state[0], new_state])
+  })
+
   it('should handle DELETE_JOURNEYPATTERN', () => {
     expect(
       jpReducer(state, {