Write unit tests for new functionality

usds · Jul 12, 2018 · b4f7814 · b4f7814
1 parent 2c004fd
commit b4f7814
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 9 deletions.
diff --git a/lib/js/helpers.js b/lib/js/helpers.js
diff --git a/lib/js/helpers.js.map b/lib/js/helpers.js.map
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "lint": "npm run lint:js && npm run lint:sass",
     "lint:js": "eslint --quiet --ext .js --ext .jsx .",
     "lint:sass": "sass-lint -c test/config/sass-lint.yaml --verbose",
-    "test": "BABEL_ENV=test mocha --require test/config/unit-test-setup.js --require test/config/enzyme-setup.jsx --compilers js:babel-core/register ./test/**/*.spec.jsx",
+    "test": "BABEL_ENV=test mocha --require test/config/unit-test-setup.js --require test/config/enzyme-setup.jsx --compilers js:babel-core/register './test/**/*.spec.js?(x)' ",
     "webpack": "webpack"
   },
   "repository": {

diff --git a/src/js/helpers.js b/src/js/helpers.js
@@ -27,7 +27,9 @@ export function getActivePages(pages, data) {
 export function getActiveProperties(activePages) {
   let allProperties = [];
   activePages.map(page => {
-    allProperties = _.uniq(_.concat(Object.keys(page.schema.properties), allProperties));
+    if (page.schema) {
+      allProperties = _.uniq(_.concat(Object.keys(page.schema.properties), allProperties));
+    }
     return allProperties;
   });
 
@@ -227,14 +229,15 @@ export function filterViewFields(data) {
 
 export function filterInactivePages(inactivePages, activePages, form) {
   const activeProperties = getActiveProperties(activePages);
+  let newData;
 
   return inactivePages.reduce((formData, page) => {
     return Object.keys(page.schema.properties)
       .reduce((currentData, prop) => {
         if (!activeProperties.includes(prop)) {
-          _.unset(prop, currentData);
+          newData = _.unset(prop, currentData);
         }
-        return currentData;
+        return newData;
       }, formData);
   }, form.data);
 }

diff --git a/test/js/helpers.unit.spec.js b/test/js/helpers.unit.spec.js
@@ -348,7 +348,12 @@ describe('Schemaform helpers:', () => {
           },
           chapter2: {
             pages: {
-              page2: {}
+              page2: {
+                schema: {
+                  type: 'object',
+                  properties: {}
+                }
+              }
             }
           }
         }
@@ -366,6 +371,60 @@ describe('Schemaform helpers:', () => {
         field: 'testing'
       });
     });
+    it('should not remove properties that are on both active and inactive pages', () => {
+      const formConfig = {
+        chapters: {
+          chapter1: {
+            pages: {
+              page1: {
+                schema: {
+                  type: 'object',
+                  properties: {
+                    otherField: {
+                      type: 'string'
+                    },
+                    anotherField: {
+                      type: 'string'
+                    }
+                  }
+                },
+                depends: {
+                  field: 'something'
+                }
+              },
+            }
+          },
+          chapter2: {
+            pages: {
+              page2: {
+                schema: {
+                  type: 'object',
+                  properties: {
+                    anotherField: {
+                      type: 'string'
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      };
+      const formData = {
+        data: {
+          otherField: 'testing2',
+          anotherField: 'testing3',
+          field: 'testing'
+        }
+      };
+
+      const output = JSON.parse(transformForSubmit(formConfig, formData));
+
+      expect(output).to.eql({
+        field: 'testing',
+        anotherField: 'testing3'
+      });
+    });
     it('should remove empty addresses', () => {
       const formConfig = {
         chapters: {