Skip to content

Commit 1d29acc

Browse files
authored
Merge pull request #5680 from raft-tech/chore/cypress-yarn-failures
Fix cypress deploy failures
2 parents 4daf358 + d336fc5 commit 1d29acc

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

.circleci/deployment/jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
app-dir: tdrs-frontend
126126
- run:
127127
name: Run Cypress e2e tests
128-
command: cd tdrs-frontend; yarn test:e2e-ci -- --config baseUrl="https://tdp-frontend-develop.acf.hhs.gov" --env cypressToken=$CYPRESS_TOKEN,apiUrl="https://tdp-frontend-develop.acf.hhs.gov/v1",adminUrl="https://tdp-frontend-develop.acf.hhs.gov/admin"
128+
command: cd tdrs-frontend; yarn test:e2e-ci --config baseUrl="https://tdp-frontend-develop.acf.hhs.gov" --env cypressToken=$CYPRESS_TOKEN,apiUrl="https://tdp-frontend-develop.acf.hhs.gov/v1",adminUrl="https://tdp-frontend-develop.acf.hhs.gov/admin"
129129
- store_artifacts:
130130
path: tdrs-frontend/cypress/screenshots/
131131
- store_artifacts:

Taskfile.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,9 @@ tasks:
303303
- docker compose -f docker-compose.local.yml up -d --build tdp-frontend
304304
- |
305305
if command -v corepack >/dev/null 2>&1; then
306-
corepack prepare yarn@4.6.0 --activate && CYPRESS_API_URL=http://localhost:8989/v1 CYPRESS_ADMIN_URL=http://localhost:8989/admin env -u ELECTRON_RUN_AS_NODE yarn test:e2e
306+
corepack prepare yarn@4.6.0 --activate && env -u ELECTRON_RUN_AS_NODE yarn test:e2e
307307
else
308-
CYPRESS_API_URL=http://localhost:8989/v1 CYPRESS_ADMIN_URL=http://localhost:8989/admin env -u ELECTRON_RUN_AS_NODE npx --yes @yarnpkg/cli-dist@4.6.0 test:e2e
308+
env -u ELECTRON_RUN_AS_NODE npx --yes @yarnpkg/cli-dist@4.6.0 test:e2e
309309
fi
310310
311311
frontend-e2e-ci-local:
@@ -320,9 +320,9 @@ tasks:
320320
- env -u ELECTRON_RUN_AS_NODE npx cypress verify || env -u ELECTRON_RUN_AS_NODE npx cypress install --force
321321
- |
322322
if command -v corepack >/dev/null 2>&1; then
323-
corepack prepare yarn@4.6.0 --activate && CYPRESS_API_URL=http://localhost:8989/v1 CYPRESS_ADMIN_URL=http://localhost:8989/admin CYPRESS_TOKEN={{.CYPRESS_TOKEN}} env -u ELECTRON_RUN_AS_NODE yarn test:e2e-ci
323+
env -u ELECTRON_RUN_AS_NODE yarn test:e2e-ci
324324
else
325-
CYPRESS_API_URL=http://localhost:8989/v1 CYPRESS_ADMIN_URL=http://localhost:8989/admin CYPRESS_TOKEN={{.CYPRESS_TOKEN}} env -u ELECTRON_RUN_AS_NODE npx --yes @yarnpkg/cli-dist@4.6.0 test:e2e-ci
325+
env -u ELECTRON_RUN_AS_NODE npx --yes @yarnpkg/cli-dist@4.6.0 test:e2e-ci
326326
fi
327327
328328
frontend-e2e-cmd:

tdrs-frontend/cypress.config.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ const fs = require('fs')
55

66
module.exports = defineConfig({
77
video: true,
8-
experimentalMemoryManagement: true,
9-
numTestsKeptInMemory: 0,
108
reporter: 'mocha-multi-reporters',
119
reporterOptions: {
1210
configFile: 'cypress/reporters/multi-reporters-config.json',
@@ -23,8 +21,8 @@ module.exports = defineConfig({
2321
baseUrl: 'http://localhost:3000',
2422
specPattern: ['**/*.feature', 'a11y/**/*.{js,ts}'],
2523
env: {
26-
apiUrl: process.env.CYPRESS_API_URL || 'http://localhost:3000/v1',
27-
adminUrl: process.env.CYPRESS_ADMIN_URL || 'http://localhost:3000/admin',
24+
apiUrl: 'http://localhost:3000/v1',
25+
adminUrl: 'http://localhost:3000/admin',
2826
cypressToken: 'local-cypress-token',
2927
},
3028

0 commit comments

Comments
 (0)