Skip to content

Commit bc9fd6d

Browse files
committed
chore(auth-server): remove Mocha and split CI test workflows
Remove Mocha test runner and migrate all remaining integration tests to Jest. Split the single CI integration job into separate integration and scripts jobs. Clean up dead code, migration comments, and stale frozen-file rules for deleted Mocha tests.
1 parent 02cc4c2 commit bc9fd6d

316 files changed

Lines changed: 882 additions & 117540 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.circleci/config.yml

Lines changed: 15 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -971,27 +971,18 @@ workflows:
971971
nx_run: affected --base=main --head=$CIRCLE_SHA1
972972
projects: --exclude '*,!tag:scope:server:auth'
973973
start_customs: true
974+
resource_class: large
975+
target: -t test-integration
974976
test_suite: servers-auth-integration
975977
workflow: test_pull_request
976978
requires:
977979
- Build (PR)
978980
- integration-test:
979-
name: Integration Test - Servers - Auth V2 (PR)
981+
name: Integration Test - Servers - Auth Scripts (PR)
980982
nx_run: affected --base=main --head=$CIRCLE_SHA1
981983
projects: --exclude '*,!tag:scope:server:auth'
982-
start_customs: true
983-
target: -t test-integration-v2
984-
test_suite: servers-auth-v2-integration
985-
workflow: test_pull_request
986-
requires:
987-
- Build (PR)
988-
- integration-test:
989-
name: Integration Test Jest - Servers - Auth (PR)
990-
nx_run: affected --base=main --head=$CIRCLE_SHA1
991-
projects: --exclude '*,!tag:scope:server:auth'
992-
start_customs: true
993-
target: -t test-integration-jest
994-
test_suite: servers-auth-jest-integration
984+
target: -t test-scripts
985+
test_suite: servers-auth-scripts
995986
workflow: test_pull_request
996987
requires:
997988
- Build (PR)
@@ -1019,8 +1010,7 @@ workflows:
10191010
- Integration Test - Frontends (PR)
10201011
- Integration Test - Servers (PR)
10211012
- Integration Test - Servers - Auth (PR)
1022-
- Integration Test - Servers - Auth V2 (PR)
1023-
- Integration Test Jest - Servers - Auth (PR)
1013+
- Integration Test - Servers - Auth Scripts (PR)
10241014
- Integration Test - Libraries (PR)
10251015
- Firefox Functional Tests - Playwright (PR)
10261016

@@ -1182,6 +1172,7 @@ workflows:
11821172
name: Integration Test - Servers - Auth
11831173
projects: --exclude '*,!tag:scope:server:auth'
11841174
start_customs: true
1175+
target: -t test-integration
11851176
test_suite: servers-auth-integration
11861177
workflow: test_and_deploy_tag
11871178
filters:
@@ -1193,26 +1184,10 @@ workflows:
11931184
requires:
11941185
- Build
11951186
- integration-test:
1196-
name: Integration Test - Servers - Auth V2
1187+
name: Integration Test - Servers - Auth Scripts
11971188
projects: --exclude '*,!tag:scope:server:auth'
1198-
start_customs: true
1199-
target: -t test-integration-v2
1200-
test_suite: servers-auth-v2-integration
1201-
workflow: test_and_deploy_tag
1202-
filters:
1203-
branches:
1204-
ignore: /.*/
1205-
tags:
1206-
only: /.*/
1207-
nx_run: run-many --no-cloud
1208-
requires:
1209-
- Build
1210-
- integration-test:
1211-
name: Integration Test Jest - Servers - Auth
1212-
projects: --exclude '*,!tag:scope:server:auth'
1213-
start_customs: true
1214-
target: -t test-integration-jest
1215-
test_suite: servers-auth-jest-integration
1189+
target: -t test-scripts
1190+
test_suite: servers-auth-scripts
12161191
workflow: test_and_deploy_tag
12171192
filters:
12181193
branches:
@@ -1311,31 +1286,21 @@ workflows:
13111286
name: Integration Test - Servers - Auth (nightly)
13121287
projects: --exclude '*,!tag:scope:server:auth'
13131288
start_customs: true
1289+
target: -t test-integration
13141290
test_suite: servers-auth-integration
13151291
workflow: nightly
13161292
nx_run: run-many --skipRemoteCache
13171293
requires:
13181294
- Build (nightly)
13191295
- integration-test:
1320-
name: Integration Test - Servers - Auth V2 (nightly)
1296+
name: Integration Test - Servers - Auth Scripts (nightly)
13211297
projects: --exclude '*,!tag:scope:server:auth'
1322-
start_customs: true
1323-
target: -t test-integration-v2
1324-
test_suite: servers-auth-v2-integration
1298+
target: -t test-scripts
1299+
test_suite: servers-auth-scripts
13251300
workflow: nightly
13261301
nx_run: run-many --skipRemoteCache
13271302
requires:
13281303
- Build (nightly)
1329-
- integration-test:
1330-
name: Integration Test Jest - Servers - Auth (nightly)
1331-
projects: --exclude '*,!tag:scope:server:auth'
1332-
start_customs: true
1333-
target: -t test-integration-jest
1334-
test_suite: servers-auth-jest-integration
1335-
workflow: test_pull_request
1336-
nx_run: run-many --skipRemoteCache
1337-
requires:
1338-
- Build (nightly)
13391304
- integration-test:
13401305
name: Integration Test - Libraries (nightly)
13411306
projects: --exclude '*,!tag:scope:shared:*'
@@ -1361,8 +1326,7 @@ workflows:
13611326
- Integration Test - Frontends (nightly)
13621327
- Integration Test - Servers (nightly)
13631328
- Integration Test - Servers - Auth (nightly)
1364-
- Integration Test - Servers - Auth V2 (nightly)
1365-
- Integration Test Jest - Servers - Auth (nightly)
1329+
- Integration Test - Servers - Auth Scripts (nightly)
13661330
- Integration Test - Libraries (nightly)
13671331
- Firefox Functional Tests - Playwright (nightly)
13681332
- create-fxa-image:

.husky/post-checkout

100644100755
File mode changed.

.husky/post-merge

100644100755
File mode changed.

_scripts/check-frozen.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,6 @@ const frozen: Array<{ pattern: string; reason: string }> = [
1616
pattern: 'packages/fxa-auth-server/lib/senders/(emails|renderer)/.*',
1717
reason: 'Files moved to libs/accounts/email-renderer',
1818
},
19-
{
20-
pattern: 'packages/fxa-auth-server/test/local/.*\\.(js|ts)$',
21-
reason:
22-
'Mocha unit tests are frozen. Add new tests as co-located Jest specs (lib/**/*.spec.ts)',
23-
},
24-
{
25-
pattern: 'packages/fxa-auth-server/test/remote/.*_tests\\.js$',
26-
reason:
27-
'Mocha integration tests are frozen. Add new tests as Jest specs (test/remote/*.in.spec.ts)',
28-
},
29-
{
30-
pattern: 'packages/fxa-auth-server/test/oauth/.*\\.(js|ts)$',
31-
reason:
32-
'Mocha OAuth tests are frozen. Add new tests as Jest specs (lib/oauth/*.spec.ts)',
33-
},
3419
];
3520

3621
export const getChangedFiles = () => {

nx.json

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,16 @@
9898
"{projectRoot}/test-results.xml"
9999
]
100100
},
101-
"test-integration": {
101+
"test-scripts": {
102102
"dependsOn": ["build", "gen-keys"],
103103
"inputs": ["test", "^test"],
104104
"outputs": [
105-
"{workspaceRoot}/artifacts/tests/{projectName}",
106-
"{projectRoot}/coverage",
107-
"{projectRoot}/.nyc_output",
108-
"{projectRoot}/test-results.xml",
105+
"{workspaceRoot}/artifacts/tests/{projectName}-scripts",
109106
"{projectRoot}/test/scripts/test_output"
110107
],
111108
"cache": true
112109
},
113-
"test-integration-v2": {
110+
"test-integration": {
114111
"dependsOn": ["build", "gen-keys"],
115112
"inputs": ["test", "^test"],
116113
"outputs": [
@@ -122,17 +119,6 @@
122119
],
123120
"cache": true
124121
},
125-
"test-integration-jest": {
126-
"dependsOn": ["build", "gen-keys"],
127-
"inputs": ["test", "^test"],
128-
"outputs": [
129-
"{workspaceRoot}/artifacts/tests/{projectName}",
130-
"{projectRoot}/coverage",
131-
"{projectRoot}/.nyc_output",
132-
"{projectRoot}/test-results.xml"
133-
],
134-
"cache": true
135-
},
136122
"test-unit": {
137123
"dependsOn": ["build", "gen-keys"],
138124
"inputs": ["test", "^test"],

packages/fxa-auth-server/.mocharc.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)