#VYE-134 #comment schema for direct deposit is complete with tests pa…

…ssing
department-of-veterans-affairs · Nov 25, 2023 · e89a2b6 · e89a2b6
1 parent c14ab94
commit e89a2b6
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 22 deletions.
diff --git a/dist/VYE-DIRECT-DEPOSIT-CHANGE-schema.json b/dist/VYE-DIRECT-DEPOSIT-CHANGE-schema.json
@@ -29,15 +29,15 @@
     }
   },
   "properties": {
-    "bankAccount": {
-      "$ref": "#/definitions/bankAccount"
-    },
     "checkDigit": {
       "type": "string"
     },
     "bankName": {
       "type": "string"
     },
+    "bankAccount": {
+      "$ref": "#/definitions/bankAccount"
+    },
     "bankPhone": {
       "$ref": "#/definitions/usaPhone"
     }

diff --git a/src/schemas/VYE-Direct-Deposit-Change/schema.js b/src/schemas/VYE-Direct-Deposit-Change/schema.js
@@ -1,29 +1,28 @@
-import _ from 'lodash';
-import definitions from '../../common/definitions';
-
+import schemaHelpers from '../../common/schema-helpers';
 
 const schema = {
   $schema: 'http://json-schema.org/draft-04/schema#',
   title: 'VERIFY YOUR ENROLLMENT CHANGE OF DIRECT DEPOSIT',
   type: 'object',
   additionalProperties: false,
-  definitions:_.merge(
-    _.pick(definitions,['bankAccount','usaPhone'])
-  ),
+  definitions:{},
   properties: {
-    bankAccount: {
-      $ref: '#/definitions/bankAccount',
-    },
+
     checkDigit: {
       type: 'string',
     },
     bankName:{
       type:'string'
     },
-    bankPhone:{
-      $ref: '#/definitions/usaPhone',
-    },
   },
   required: ['bankName', 'bankAccount', 'bankPhone',],
 };
+
+[
+  ['bankAccount'],
+  ['usaPhone', 'bankPhone'],
+].forEach(args => {
+  schemaHelpers.addDefinitionToSchema(schema, ...args);
+});
+
 export default schema;
diff --git a/test/schemas/VYE-Direct-Deposit-Change/schema.spec.js b/test/schemas/VYE-Direct-Deposit-Change/schema.spec.js
@@ -4,14 +4,21 @@ import SharedTests from '../../support/shared-tests';
 
 const schema = schemas['VYE-DIRECT-DEPOSIT-CHANGE'];
 
-let schemaTestHelper = new SchemaTestHelper(schema);
-let sharedTests = new SharedTests(schemaTestHelper);
+const schemaTestHelper = new SchemaTestHelper(schema,{
+  bankName: "Test Name",
+  bankAccount: { accountType: 'checking', routingNumber: '123123123', accountNumber: '1234' },
+  bankPhone: '1231231231',
+});
+
+const sharedTests = new SharedTests(schemaTestHelper);
+
 
 describe('VYE direct deposit change', () => {
-  [
-    'bankAccount',
-    'usaPhone'
-  ].forEach((test) => {
-    sharedTests.runTest(test);
+  sharedTests.runTest('bankAccount', ['bankAccount']);
+  sharedTests.runTest('usaPhone', ['bankPhone'])
+
+  schemaTestHelper.testValidAndInvalid('bankName', {
+    valid: ['Test Name'],
+    invalid: [234],
   });
 });