Refs #2791: Add company select2 in add / edit modal

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>

3 files changed, 42 insertions, 6 deletions

diff --git a/spec/javascripts/vehicle_journeys/actions_spec.js b/spec/javascripts/vehicle_journeys/actions_spec.js
index b9876b331..351b8038b 100644
--- a/spec/javascripts/vehicle_journeys/actions_spec.js
+++ b/spec/javascripts/vehicle_journeys/actions_spec.js
@@ -63,14 +63,16 @@ describe('when clicking on validate button inside create modal', () => {
   it('should create an action to create a new vehicle journey', () => {
     const data = {}
     const selectedJourneyPattern = {}
+    const selectedCompany = {}
     const stopPointsList = []
     const expectedAction = {
       type: 'ADD_VEHICLEJOURNEY',
       data,
       selectedJourneyPattern,
-      stopPointsList
+      stopPointsList,
+      selectedCompany
     }
-    expect(actions.addVehicleJourney(data, selectedJourneyPattern, stopPointsList)).toEqual(expectedAction)
+    expect(actions.addVehicleJourney(data, selectedJourneyPattern, stopPointsList, selectedCompany)).toEqual(expectedAction)
   })
 })
 describe('when previous navigation button is clicked', () => {
@@ -174,11 +176,13 @@ describe('when clicking on validate button inside shifting modal', () => {
 describe('when clicking on validate button inside editing modal', () => {
   it('should create an action to update a vehiclejourney', () => {
     const data = {}
+    const selectedCompany = {}
     const expectedAction = {
       type: 'EDIT_VEHICLEJOURNEY',
-      data
+      data,
+      selectedCompany
     }
-    expect(actions.editVehicleJourney(data)).toEqual(expectedAction)
+    expect(actions.editVehicleJourney(data, selectedCompany)).toEqual(expectedAction)
   })
 })
 describe('when clicking on validate button inside duplicating modal', () => {
@@ -406,3 +410,21 @@ describe('when receiving vj', () => {
     expect(actions.receiveTotalCount(total)).toEqual(expectedAction)
   })
 })
+describe('when using select2 to pick a company', () => {
+  it('should create an action to select a company inside modal', () => {
+    let selectedCompany = {
+      id: 1,
+      objectid: 2,
+      name: 'test',
+    }
+    const expectedAction = {
+      type: 'SELECT_CP_EDIT_MODAL',
+      selectedItem:{
+        id: selectedCompany.id,
+        objectid: selectedCompany.objectid,
+        name: selectedCompany.name,
+      }
+    }
+    expect(actions.select2Company(selectedCompany)).toEqual(expectedAction)
+  })
+})
diff --git a/spec/javascripts/vehicle_journeys/reducers/modal_spec.js b/spec/javascripts/vehicle_journeys/reducers/modal_spec.js
index 7c81d729b..c016812da 100644
--- a/spec/javascripts/vehicle_journeys/reducers/modal_spec.js
+++ b/spec/javascripts/vehicle_journeys/reducers/modal_spec.js
@@ -157,4 +157,14 @@ describe('modal reducer', () => {
       })
     ).toEqual(newState)
   })
+
+  it('should handle SELECT_CP_EDIT_MODAL', () => {
+    let newModalProps = {selectedCompany : {name: 'ALBATRANS'}}
+    expect(
+      modalReducer(state, {
+        type: 'SELECT_CP_EDIT_MODAL',
+        selectedItem: {name: 'ALBATRANS'}
+      })
+    ).toEqual(Object.assign({}, state, {modalProps: newModalProps}))
+  })
 })
diff --git a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
index 6bc592bd1..6dc07e9bd 100644
--- a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
+++ b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
@@ -91,15 +91,18 @@ describe('vehicleJourneys reducer', () => {
       published_journey_name: {value: 'test'}
     }
     let fakeSelectedJourneyPattern = {id: "1"}
+    let fakeSelectedCompany = {name: "ALBATRANS"}
     expect(
       vjReducer(state, {
         type: 'ADD_VEHICLEJOURNEY',
         data: fakeData,
         selectedJourneyPattern: fakeSelectedJourneyPattern,
-        stopPointsList: [{object_id: 'test', city_name: 'city'}]
+        stopPointsList: [{object_id: 'test', city_name: 'city'}],
+        selectedCompany: fakeSelectedCompany
       })
     ).toEqual([{
       journey_pattern: fakeSelectedJourneyPattern,
+      company: fakeSelectedCompany,
       published_journey_name: 'test',
       objectid: '',
       footnotes: [],
@@ -237,7 +240,8 @@ describe('vehicleJourneys reducer', () => {
       published_journey_name: {value : 'test'},
       published_journey_identifier: {value: 'test'}
     }
-    let newVJ = Object.assign({}, state[0], {published_journey_name: fakeData.published_journey_name.value, published_journey_identifier: fakeData.published_journey_identifier.value})
+    let fakeSelectedCompany : {name : 'ALBATRANS'}
+    let newVJ = Object.assign({}, state[0], {company: fakeSelectedCompany, published_journey_name: fakeData.published_journey_name.value, published_journey_identifier: fakeData.published_journey_identifier.value})
     expect(
       vjReducer(state, {
         type: 'EDIT_VEHICLEJOURNEY',