Rollback #484 due to runtime error. Updated PropType definitions instead

coryhouse · Oct 9, 2017 · f255702 · f255702
1 parent 79fbeae
commit f255702
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/components/FuelSavingsForm.js b/src/components/FuelSavingsForm.js
@@ -91,19 +91,19 @@ FuelSavingsForm.propTypes = {
   saveFuelSavings: func.isRequired,
   calculateFuelSavings: func.isRequired,
   fuelSavings: shape({
-    newMpg: number,
-    tradeMpg: number,
-    newPpg: number,
-    tradePpg: number,
-    milesDriven: number,
+    newMpg: PropTypes.oneOf[number,string],
+    tradeMpg: PropTypes.oneOf[number,string],
+    newPpg: PropTypes.oneOf[number,string],
+    tradePpg: PropTypes.oneOf[number,string],
+    milesDriven: PropTypes.oneOf[number,string],
     milesDrivenTimeframe: string,
     displayResult: bool,
     dateModified: string,
     necessaryDataIsProvidedToCalculateSavings: bool,
     savings: shape({
-      monthly: number,
-      annual: number,
-      threeYear: number,
+      monthly: PropTypes.oneOf[number,string],
+      annual: PropTypes.oneOf[number,string],
+      threeYear: PropTypes.oneOf[number,string],
     }),
   }).isRequired
 };

diff --git a/src/reducers/fuelSavingsReducer.spec.js b/src/reducers/fuelSavingsReducer.spec.js
@@ -5,11 +5,11 @@ import {getFormattedDateTime} from '../utils/dateHelper';
 describe('Reducers::FuelSavings', () => {
   const getInitialState = () => {
     return {
-      newMpg: 0,
-      tradeMpg: 0,
-      newPpg: 0,
-      tradePpg: 0,
-      milesDriven: 0,
+      newMpg: '',
+      tradeMpg: '',
+      newPpg: '',
+      tradePpg: '',
+      milesDriven: '',
       milesDrivenTimeframe: 'week',
       displayResults: false,
       dateModified: null,

diff --git a/src/reducers/initialState.js b/src/reducers/initialState.js
@@ -1,10 +1,10 @@
 export default {
   fuelSavings: {
-    newMpg: 0,
-    tradeMpg: 0,
-    newPpg: 0,
-    tradePpg: 0,
-    milesDriven: 0,
+    newMpg: '',
+    tradeMpg: '',
+    newPpg: '',
+    tradePpg: '',
+    milesDriven: '',
     milesDrivenTimeframe: 'week',
     displayResults: false,
     dateModified: null,

diff --git a/src/store/store.spec.js b/src/store/store.spec.js
@@ -66,7 +66,7 @@ describe('Store', () => {
     const expected = {
       newMpg: 20,
       tradeMpg: 10,
-      newPpg: 0,
+      newPpg: '',
       tradePpg: 1.5,
       milesDriven: 100,
       milesDrivenTimeframe: 'month',