Skip to content

Commit

Permalink
Merge branch 'main' into 50504-Update-Navigating-Away-User-Flows
Browse files Browse the repository at this point in the history
  • Loading branch information
vsaleem committed Oct 4, 2024
2 parents cb837ac + 83dc437 commit 6312e0d
Show file tree
Hide file tree
Showing 395 changed files with 7,161 additions and 5,212 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,14 @@ src/applications/check-in @department-of-veterans-affairs/patient-check-in @depa

# GOVCIO Team

src/applications/yellow-ribbon @department-of-veterans-affairs/govcio-codereviewers @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/yellow-ribbon @department-of-veterans-affairs/govcio-vfep-codereviewers @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/static-pages/school-resources @department-of-veterans-affairs/govcio-vfep-codereviewers @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/gi @department-of-veterans-affairs/govcio-vfep-codereviewers @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/sco @department-of-veterans-affairs/govcio-vfep-codereviewers @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/gi-sandbox @department-of-veterans-affairs/govcio-vfep-codereviewers @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/edu-benefits @department-of-veterans-affairs/govcio-vfep-codereviewers @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/verify-your-enrollment @department-of-veterans-affairs/govcio-vye-codereviewers @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/post-911-gib-status @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/post-911-gib-status @department-of-veterans-affairs/govcio-vfep-codereviewers @department-of-veterans-affairs/va-platform-cop-frontend

# CTO Health Products

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ jobs:
name: Unit Tests
needs: [fetch-allow-lists, tests-prep]
timeout-minutes: 30
runs-on: ubuntu-latest
runs-on: ubuntu-16-cores-latest
outputs:
app_folders: ${{ steps.get-changed-apps.outputs.folders }}
changed-files: ${{ steps.get-changed-apps.outputs.changed_files }}
Expand Down Expand Up @@ -338,7 +338,7 @@ jobs:
output-type: 'folder'

- name: Run unit tests
run: yarn test:unit:gha ${APP_FOLDERS:+"{script,$APP_FOLDERS}/**/*.unit.spec.js?(x)"} --coverage
run: yarn test:unit:gha ${APP_FOLDERS:+"{script,$APP_FOLDERS}/**/*.unit.spec.js?(x)"} --coverage --log-level verbose
env:
MOCHA_FILE: test-results/unit-tests.xml
CHANGED_FILES: ${{ steps.get-changed-apps.outputs.changed_files }}
Expand Down Expand Up @@ -417,7 +417,7 @@ jobs:
path: .

- name: Run unit tests
run: yarn test:unit:gha ${APP_FOLDERS:+"{script,$APP_FOLDERS}/**/*.unit.spec.js?(x)"} --coverage --log-level trace
run: yarn test:unit:gha ${APP_FOLDERS:+"{script,$APP_FOLDERS}/**/*.unit.spec.js?(x)"} --log-level trace
env:
MOCHA_FILE: test-results/unit-tests.xml
APP_FOLDERS: ${{ steps.get-changed-apps.outputs.folders }}
Expand Down
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,9 @@
"@babel/runtime": "^7.15.4",
"@datadog/browser-logs": "^5.8.0",
"@datadog/browser-rum": "^4.49.0",
"@department-of-veterans-affairs/component-library": "^46.3.0",
"@department-of-veterans-affairs/css-library": "^0.11.1",
"@department-of-veterans-affairs/formation": "11.0.23",
"@department-of-veterans-affairs/component-library": "^47.0.0",
"@department-of-veterans-affairs/css-library": "^0.12.1",
"@department-of-veterans-affairs/formation": "11.0.26",
"@department-of-veterans-affairs/react-jsonschema-form": "^1.2.5",
"@department-of-veterans-affairs/va-forms-system-core": "1.6.1",
"@department-of-veterans-affairs/vagov-platform": "^0.0.1",
Expand Down Expand Up @@ -334,7 +334,7 @@
"url-search-params-polyfill": "^8.1.1",
"uswds": "1.6.10",
"vanilla-lazyload": "^16.1.0",
"vets-json-schema": "https://github.com/department-of-veterans-affairs/vets-json-schema.git#08651bd4cf96ca7e90c5740508a11f14c8551e01"
"vets-json-schema": "https://github.com/department-of-veterans-affairs/vets-json-schema.git#778143dfa278f18e257d0ec6634171d881e3bcac"
},
"resolutions": {
"**/lodash": "4.17.21",
Expand Down Expand Up @@ -439,5 +439,6 @@
"**/platform-testing/table",
"**/platform-testing/winston"
]
}
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
2 changes: 1 addition & 1 deletion script/github-actions/run-unit-tests-gha.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ if (testsToVerify === null) {
: `--recursive ${glob.sync(updatedPath)}`;
const command = `LOG_LEVEL=${options[
'log-level'
].toLowerCase()} ${testRunner} --max-old-space-size=8192 --config ${configFile} ${testsToRun.replace(
].toLowerCase()} ${testRunner} --max-old-space-size=32768 --config ${configFile} ${testsToRun.replace(
/,/g,
' ',
)} `;
Expand Down
27 changes: 9 additions & 18 deletions script/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,17 @@ process.on('SIGINT', () => {
});

const runCommand = cmd => {
return new Promise((resolve, reject) => {
const child = spawn(cmd, [], { shell: true, stdio: 'inherit' });
const child = spawn(cmd, [], { shell: true, stdio: 'inherit' });

// When the child process exits, resolve or reject the promise
child.on('exit', code => {
if (code === 0) {
resolve(); // Successfully completed
} else {
reject(new Error(`Process exited with code ${code}`)); // Error occurred
}
});

// When we ^C out of the parent Node script, also interrupt the child
childProcesses.push(child);

// Handle process errors like spawning failure
child.on('error', err => {
reject(err);
});
// If the child process exits abnormally, exit parent with the same code
child.on('exit', code => {
if (code) {
process.exit(code);
}
});

// When we ^C out of the parent Node script, also interrupt the child
childProcesses.push(child);
};

const runCommandSync = cmd => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const mailingAddressUpdateReceivedPrefillTaskGreen = {
id: '',
type: 'async_transaction_va_profile_address_transactions',
attributes: {
transactionId: 'mock-update-mailing-address-transaction-id',
transactionId: 'mock-update-mailing-address-success-transaction-id',
transactionStatus: 'RECEIVED',
type: 'AsyncTransaction::VAProfile::AddressTransaction',
metadata: [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const homePhoneUpdateReceivedPrefillTaskPurple = {
id: '',
type: 'async_transaction_va_profile_telephone_transactions',
attributes: {
transactionId: 'mock-update-home-phone-transaction-id',
transactionId: 'mock-update-home-phone-success-transaction-id',
transactionStatus: 'RECEIVED',
type: 'AsyncTransaction::VAProfile::TelephoneTransaction',
metadata: [],
Expand Down
Loading

0 comments on commit 6312e0d

Please sign in to comment.