Skip to content

Commit

Permalink
further updates to alleviate test failures
Browse files Browse the repository at this point in the history
  • Loading branch information
@Japenner
Japenner committed Feb 7, 2025
1 parent 87433bc commit 264ba3b
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 25 deletions.
6 changes: 4 additions & 2 deletions src/applications/simple-forms/form-upload/config/form.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,22 @@ const mockData = testData.data;

const formConfig = (pathname = null) => {
const { title, subTitle, formNumber } = getFormContent(pathname);
const formId = `${formNumber.toUpperCase()}-UPLOAD`;
const trackingPrefix = `form-${formNumber.toLowerCase()}-upload-`;

return {
rootUrl: manifest.rootUrl,
urlPrefix: `/${formNumber}/`,
submitUrl: `${environment.API_URL}/simple_forms_api/v1/submit_scanned_form`,
dev: { collapsibleNavLinks: true, showNavLinks: !window.Cypress },
trackingPrefix: 'form-upload-flow-',
trackingPrefix,
confirmation: ConfirmationPage,
CustomTopContent,
CustomReviewTopContent,
customText: { appType: 'form' },
hideReviewChapters: true,
introduction: IntroductionPage,
formId: `${formNumber.toUpperCase()}-UPLOAD`,
formId,
saveInProgress: SAVE_IN_PROGRESS_CONFIG,
version: 0,
prefillEnabled: true,
Expand Down
48 changes: 36 additions & 12 deletions src/platform/forms/constants.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,30 @@ export const VA_FORM_IDS = Object.freeze({
FORM_10_7959F_1: '10-7959F-1',
FORM_10_7959F_2: '10-7959F-2',
FORM_10182: '10182',
FORM_1330M: '1330M',
FORM_1330M2: '1330M2',
FORM_1919: '22-1919',
FORM_20_0995: '20-0995',
FORM_20_0996: '20-0996',
FORM_20_10206: '20-10206',
FORM_20_10207: '20-10207',
FORM_21_0779_UPLOAD: '21-0779-UPLOAD',
FORM_21_0845: '21-0845',
FORM_21_0966: '21-0966',
FORM_21_0972: '21-0972',
FORM_21_10210: '21-10210',
FORM_21_22: '21-22',
FORM_21_22A: '21-22a',
FORM_21_4138: '21-4138',
FORM_21_4140: '21-4140',
FORM_21_4142: '21-4142',
FORM_21_509_UPLOAD: '21-509-UPLOAD',
FORM_21_526EZ: '21-526EZ',
FORM_21_686C: '686C-674',
FORM_21_686CV2: '686C-674-V2',
FORM_21A: '21a',
FORM_21P_0516_1_UPLOAD: '21P-0516-1-UPLOAD',
FORM_21P_0518_1_UPLOAD: '21P-0518-1-UPLOAD',
FORM_21P_0847: '21P-0847',
FORM_21P_0969: '21P-0969',
FORM_21P_527EZ: '21P-527EZ',
Expand All @@ -54,12 +62,12 @@ export const VA_FORM_IDS = Object.freeze({
FORM_40_0247: '40-0247',
FORM_40_10007: '40-10007',
FORM_5655: '5655',
FORM_1919: '22-1919',
FORM_COVID_VACCINATION_EXPANSION: 'COVID-VACCINATION-EXPANSION',
FORM_COVID_VACCINE_TRIAL_UPDATE: 'COVID-VACCINE-TRIAL-UPDATE',
FORM_COVID_VACCINE_TRIAL: 'COVID-VACCINE-TRIAL',
FORM_FORM_UPLOAD_FLOW: 'FORM-UPLOAD-FLOW',
FORM_DISPUTE_DEBT: 'DISPUTE-DEBT',
FORM_HC_QSTNR: 'HC-QSTNR',
FORM_MOCK_AE_DESIGN_PATTERNS: 'FORM-MOCK-AE-DESIGN-PATTERNS',
FORM_MOCK_ALT_HEADER: 'FORM_MOCK_ALT_HEADER',
FORM_MOCK_APPEALS: 'FORM_MOCK_APPEALS',
FORM_MOCK_HLR: 'FORM_MOCK_HLR',
Expand All @@ -69,14 +77,9 @@ export const VA_FORM_IDS = Object.freeze({
FORM_MOCK: '00-1234',
FORM_T_QSTNR: 'T-QSTNR',
FORM_VA_2346A: 'MDOT',
FORM_XX_123: 'XX-123',
FORM_MOCK_AE_DESIGN_PATTERNS: 'FORM-MOCK-AE-DESIGN-PATTERNS',
FORM_WELCOME_VA_SETUP_REVIEW_INFORMATION:
'WELCOME_VA_SETUP_REVIEW_INFORMATION',
FORM_21_4140: '21-4140',
FORM_DISPUTE_DEBT: 'DISPUTE-DEBT',
FORM_1330M2: '1330M2',
FORM_1330M: '1330M',
FORM_XX_123: 'XX-123',
});

export const VA_FORM_IDS_SKIP_INFLECTION = Object.freeze([
Expand Down Expand Up @@ -459,11 +462,32 @@ export const MY_VA_SIP_FORMS = [
trackingPrefix: '0247-pmc-',
},
{
id: VA_FORM_IDS.FORM_FORM_UPLOAD_FLOW,
id: VA_FORM_IDS.FORM_21_0779_UPLOAD,
benefit: `form upload flow`,
title: `form upload flow`,
description: '',
trackingPrefix: '',
title: `form 21-0779 upload`,
description: 'uploaded file for form 21-0779',
trackingPrefix: 'form-21-0779-upload-',
},
{
id: VA_FORM_IDS.FORM_21_509_UPLOAD,
benefit: `form upload flow`,
title: `form 21-509 upload`,
description: 'uploaded file for form 21-509',
trackingPrefix: 'form-21-509-upload-',
},
{
id: VA_FORM_IDS.FORM_21P_0516_1_UPLOAD,
benefit: `form upload flow`,
title: `form 21P-0516-1 upload`,
description: 'uploaded file for form 21P-0516-1',
trackingPrefix: 'form-21p-0516-1-upload-',
},
{
id: VA_FORM_IDS.FORM_21P_0518_1_UPLOAD,
benefit: `form upload flow`,
title: `form 21P-0518-1 upload`,
description: 'uploaded file for form 21P-0518-1',
trackingPrefix: 'form-21p-0518-1-upload-',
},
{
id: VA_FORM_IDS.FORM_DISPUTE_DEBT,
Expand Down
25 changes: 14 additions & 11 deletions src/platform/forms/tests/forms-config-validator.unit.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import trackMemoryUsage from '../../testing/unit/unit-test-track-memory-usage';
const validatedConfigs = new Map();

const formConfigFnParams = {
'form-upload': '/form-upload/21-0779/upload',
'form-upload': '/find-forms/upload/21-0779',
};

const missingFromVetsJsonSchema = [
Expand All @@ -23,20 +23,28 @@ const missingFromVetsJsonSchema = [
VA_FORM_IDS.FORM_10_7959F_1,
VA_FORM_IDS.FORM_10_7959F_2,
VA_FORM_IDS.FORM_10182,
VA_FORM_IDS.FORM_1330M,
VA_FORM_IDS.FORM_1330M2,
VA_FORM_IDS.FORM_1919,
VA_FORM_IDS.FORM_20_0995,
VA_FORM_IDS.FORM_20_10206,
VA_FORM_IDS.FORM_20_10207,
VA_FORM_IDS.FORM_21_0779_UPLOAD,
VA_FORM_IDS.FORM_21_0845,
VA_FORM_IDS.FORM_21_0966,
VA_FORM_IDS.FORM_21_0972,
VA_FORM_IDS.FORM_21_10210,
VA_FORM_IDS.FORM_21_4138,
VA_FORM_IDS.FORM_21_509_UPLOAD,
VA_FORM_IDS.FORM_21A,
VA_FORM_IDS.FORM_21P_0516_1_UPLOAD,
VA_FORM_IDS.FORM_21P_0518_1_UPLOAD,
VA_FORM_IDS.FORM_21P_0847,
VA_FORM_IDS.FORM_22_8794,
VA_FORM_IDS.FORM_40_0247,
VA_FORM_IDS.FORM_COVID_VACCINE_TRIAL_UPDATE,
VA_FORM_IDS.FORM_FORM_UPLOAD_FLOW,
VA_FORM_IDS.FORM_HC_QSTNR,
VA_FORM_IDS.FORM_MOCK_AE_DESIGN_PATTERNS,
VA_FORM_IDS.FORM_MOCK_ALT_HEADER,
VA_FORM_IDS.FORM_MOCK_APPEALS,
VA_FORM_IDS.FORM_MOCK_HLR,
Expand All @@ -45,13 +53,8 @@ const missingFromVetsJsonSchema = [
VA_FORM_IDS.FORM_MOCK_SF_PATTERNS,
VA_FORM_IDS.FORM_MOCK,
VA_FORM_IDS.FORM_T_QSTNR,
VA_FORM_IDS.FORM_MOCK_AE_DESIGN_PATTERNS,
VA_FORM_IDS.FORM_XX_123,
VA_FORM_IDS.FORM_1919,
VA_FORM_IDS.FORM_22_8794,
VA_FORM_IDS.FORM_WELCOME_VA_SETUP_REVIEW_INFORMATION,
VA_FORM_IDS.FORM_1330M2,
VA_FORM_IDS.FORM_1330M,
VA_FORM_IDS.FORM_XX_123,
];

const remapFormId = {
Expand Down Expand Up @@ -248,10 +251,10 @@ const validateFormConfig = {
};

// Modify validateForm to count validations
const validateForm = async formConfigParam => {
const validateForm = async (formSlug, formConfigParam) => {
let config = formConfigParam;
if (typeof config === 'function') {
const key = config.name || 'unknown';
const key = formSlug.split('/')[0] || 'unknown';
const options = formConfigFnParams[key];
config = options ? config(options) : config();
}
Expand Down Expand Up @@ -351,7 +354,7 @@ describe('Form Configuration Tests', function() {

try {
const { default: formConfig } = await import(configPath);
const result = await validateForm(formConfig);
const result = await validateForm(formSlug, formConfig);
validatedConfigs.set(configPath, result);
return result;
} catch (error) {
Expand Down

0 comments on commit 264ba3b

Please sign in to comment.