Merge pull request #227 from af83/5551-handle-custom-fields-in-vjs-editor

5551 Handle custom fields in VJs editor

3 files changed, 65 insertions, 4 deletions

diff --git a/spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js b/spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js
new file mode 100644
index 000000000..62013354a
--- /dev/null
+++ b/spec/javascript/vehicle_journeys/components/CustomFieldsInputs_spec.js
@@ -0,0 +1,42 @@
+import React, { Component } from 'react'
+import CustomFieldsInputs from '../../../../app/javascript/vehicle_journeys/components/tools/CustomFieldsInputs'
+import renderer from 'react-test-renderer'
+require('select2')
+console.log($().jquery)
+
+describe('CustomFieldsInputs', () => {
+  set('values', () => {
+    return {}
+  })
+
+  set('component', () => {
+    let inputs = renderer.create(
+      <CustomFieldsInputs
+        values={values}
+        disabled={false}
+        onUpdate={()=>{}}
+      />
+    ).toJSON()
+
+    return inputs
+  })
+
+  it('should match the snapshot', () => {
+    expect(component).toMatchSnapshot()
+  })
+
+  context('with fields', () => {
+    set('values', () => {
+      return {
+        foo: {
+          options: { list_values: ["", "1", "2"] },
+          field_type: "list",
+          name: "test"
+        }
+      }
+    })
+    it('should match the snapshot', () => {
+      expect(component).toMatchSnapshot()
+    })
+  })
+})
diff --git a/spec/javascript/vehicle_journeys/components/__snapshots__/CustomFieldsInputs_spec.js.snap b/spec/javascript/vehicle_journeys/components/__snapshots__/CustomFieldsInputs_spec.js.snap
new file mode 100644
index 000000000..c93ec0097
--- /dev/null
+++ b/spec/javascript/vehicle_journeys/components/__snapshots__/CustomFieldsInputs_spec.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CustomFieldsInputs should match the snapshot 1`] = `<div />`;
diff --git a/spec/javascript/vehicle_journeys/reducers/vehicleJourneys_spec.js b/spec/javascript/vehicle_journeys/reducers/vehicleJourneys_spec.js
index 44e11aadf..573eebf4f 100644
--- a/spec/javascript/vehicle_journeys/reducers/vehicleJourneys_spec.js
+++ b/spec/javascript/vehicle_journeys/reducers/vehicleJourneys_spec.js
@@ -89,7 +89,12 @@ describe('vehicleJourneys reducer', () => {
     }]
     let fakeData = {
       published_journey_name: {value: 'test'},
-      published_journey_identifier: {value : ''}
+      published_journey_identifier: {value : ''},
+      custom_fields: {
+        foo: {
+          value: 12
+        }
+      }
     }
     let fakeSelectedJourneyPattern = {id: "1"}
     let fakeSelectedCompany = {name: "ALBATRANS"}
@@ -115,7 +120,12 @@ describe('vehicleJourneys reducer', () => {
       selected: false,
       deletable: false,
       transport_mode: 'undefined',
-      transport_submode: 'undefined'
+      transport_submode: 'undefined',
+      custom_fields: {
+        foo: {
+          value: 12
+        }
+      }
     }, ...state])
   })
 
@@ -345,12 +355,18 @@ describe('vehicleJourneys reducer', () => {
   })
 
   it('should handle EDIT_VEHICLEJOURNEY', () => {
+    let custom_fields = {
+      foo: {
+        value: 12
+      }
+    }
     let fakeData = {
       published_journey_name: {value : 'test'},
-      published_journey_identifier: {value: 'test'}
+      published_journey_identifier: {value: 'test'},
+      custom_fields: {foo: 12}
     }
     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})
+    let newVJ = Object.assign({}, state[0], {company: fakeSelectedCompany, published_journey_name: fakeData.published_journey_name.value, published_journey_identifier: fakeData.published_journey_identifier.value, custom_fields})
     expect(
       vjReducer(state, {
         type: 'EDIT_VEHICLEJOURNEY',