Skip to content

Migrate tests to vitest #4710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 13 commits into
base: feat/improve-cli-bootstrap-tsx
Choose a base branch
from
Draft

Migrate tests to vitest #4710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d3617f3
wip: migrate tests to vitest
Pavel910 Sep 3, 2025
0dbca4c
wip: migrate tests to vitest
Pavel910 Sep 5, 2025
d79af54
wip: migrate tests to vitest
Pavel910 Sep 5, 2025
f8427e8
fix: api headless cms tests
brunozoric Sep 8, 2025
47262ff
test(api-elasticsearch): convert to vitest
brunozoric Sep 8, 2025
7049d5d
test(api-elasticsearch-tasks): convert to vitest
brunozoric Sep 8, 2025
8766952
test(api-headless-cms-bulk-actions): convert to vitest
brunozoric Sep 8, 2025
46190eb
test(api-headless-cms-aco): convert to vitest
brunozoric Sep 8, 2025
f3bfc3e
fix(api-elasticsearch): get es client
brunozoric Sep 9, 2025
04b8ca2
fix(project-utils): use env var for storage ops choice
brunozoric Sep 9, 2025
1c40f7e
fix(api-headless-cms-es-tasks): tests
brunozoric Sep 9, 2025
0a66f0d
fix(api-headless-cms-import-export): tests
brunozoric Sep 9, 2025
1bb80c0
fix(api-headless-cms-tasks): tests
brunozoric Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 6 additions & 7 deletions .eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function getNoUnusedVars() {
module.exports = {
extends: [
"plugin:@typescript-eslint/recommended",
"plugin:jest/recommended",
"plugin:@vitest/legacy-recommended",
"plugin:react/recommended"
],
parser: "@typescript-eslint/parser",
Expand All @@ -18,9 +18,8 @@ module.exports = {
tsconfigRootDir: __dirname,
sourceType: "module"
},
plugins: ["@typescript-eslint", "jest", "import", "react", "lodash"],
plugins: ["@typescript-eslint", "@vitest", "import", "react", "lodash"],
env: {
jest: true,
commonjs: true,
node: true,
es6: true
Expand Down Expand Up @@ -59,12 +58,12 @@ module.exports = {
// Temporarily disable this rule
"@typescript-eslint/no-non-null-assertion": 0,
curly: ["error"],
"jest/expect-expect": 0,
"@vitest/expect-expect": 0,
// Sometimes we have to use expect() inside try/catch clause (for async calls).
// This rule raises an error when you do that, so we disabled it.
"jest/no-conditional-expect": 0,
"jest/no-commented-out-tests": 0,
"jest/no-disabled-tests": 0,
"@vitest/no-conditional-expect": 0,
"@vitest/no-commented-out-tests": 0,
"@vitest/no-disabled-tests": 0,
"lodash/import-scope": [2, "method"],
"no-restricted-imports": [
"error",
Expand Down
192 changes: 58 additions & 134 deletions .github/workflows/wac/utils/listPackagesWithJestTests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,221 +42,145 @@ const CUSTOM_HANDLERS: Record<string, () => Array<PackageWithTests>> = {
"project-utils": () => [],

"api-tenancy": () => {
return [{ cmd: "packages/api-tenancy --storage=ddb", storage: "ddb" }];
return [{ cmd: "packages/api-tenancy -- --storage=ddb", storage: "ddb" }];
},

"api-security": () => {
return [{ cmd: "packages/api-security --storage=ddb", storage: "ddb" }];
return [{ cmd: "packages/api-security -- --storage=ddb", storage: "ddb" }];
},

"api-security-cognito": () => {
return [{ cmd: "packages/api-security-cognito --storage=ddb", storage: "ddb" }];
return [{ cmd: "packages/api-security-cognito -- --storage=ddb", storage: "ddb" }];
},

"api-i18n": () => {
return [{ cmd: "packages/api-i18n --storage=ddb", storage: "ddb" }];
return [{ cmd: "packages/api-i18n -- --storage=ddb", storage: "ddb" }];
},

"api-tenant-manager": () => {
return [{ cmd: "packages/api-tenant-manager --storage=ddb", storage: "ddb" }];
return [{ cmd: "packages/api-tenant-manager -- --storage=ddb", storage: "ddb" }];
},

"api-log": () => {
return [{ cmd: "packages/api-log --storage=ddb", storage: "ddb" }];
return [{ cmd: "packages/api-log -- --storage=ddb", storage: "ddb" }];
},

"api-file-manager": () => {
return [
{ cmd: "packages/api-file-manager --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-file-manager -- --storage=ddb", storage: "ddb" },
{
cmd: "packages/api-file-manager --storage=ddb-es,ddb",
cmd: "packages/api-file-manager -- --storage=ddb-es,ddb",
storage: "ddb-es"
},
{
cmd: "packages/api-file-manager --storage=ddb-os,ddb",
cmd: "packages/api-file-manager -- --storage=ddb-os,ddb",
storage: "ddb-os"
}
];
},

"api-file-manager-aco": () => {
return [
{ cmd: "packages/api-file-manager-aco --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-file-manager-aco -- --storage=ddb", storage: "ddb" },
{
cmd: "packages/api-file-manager-aco --storage=ddb-es,ddb",
cmd: "packages/api-file-manager-aco -- --storage=ddb-es,ddb",
storage: "ddb-es"
},
{
cmd: "packages/api-file-manager-aco --storage=ddb-os,ddb",
cmd: "packages/api-file-manager-aco -- --storage=ddb-os,ddb",
storage: "ddb-os"
}
];
},

"api-form-builder": () => {
return [
{ cmd: "packages/api-form-builder --storage=ddb-es,ddb", storage: "ddb-es" },
{ cmd: "packages/api-form-builder --storage=ddb-os,ddb", storage: "ddb-os" },
{ cmd: "packages/api-form-builder --storage=ddb", storage: "ddb" }
];
},

"api-form-builder-so-ddb-es": () => {
return [
{
cmd: "packages/api-form-builder-so-ddb-es --storage=ddb-es,ddb",
storage: "ddb-es"
},
{
cmd: "packages/api-form-builder-so-ddb-es --storage=ddb-os,ddb",
storage: "ddb-os"
}
];
},

"api-page-builder": () => {
return [
...shardPackageTestExecution({
cmd: "packages/api-page-builder --storage=ddb-es,ddb",
storage: "ddb-es"
}),
...shardPackageTestExecution({
cmd: "packages/api-page-builder --storage=ddb-os,ddb",
storage: "ddb-os"
}),
...shardPackageTestExecution({
cmd: "packages/api-page-builder --storage=ddb",
storage: "ddb"
})
];
},
"api-page-builder-so-ddb-es": () => {
return [
{
cmd: "packages/api-page-builder-so-ddb-es --storage=ddb-es,ddb",
storage: "ddb-es"
},
{
cmd: "packages/api-page-builder-so-ddb-es --storage=ddb-os,ddb",
storage: "ddb-os"
}
];
},

"api-page-builder-import-export": () => {
return [
{
cmd: "packages/api-page-builder-import-export --storage=ddb",
storage: "ddb"
}
];
},

"api-prerendering-service": () => {
return [{ cmd: "packages/api-prerendering-service --storage=ddb", storage: "ddb" }];
},

"api-mailer": () => {
return [
{ cmd: "packages/api-mailer --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-mailer --storage=ddb-es,ddb", storage: "ddb-es" },
{ cmd: "packages/api-mailer --storage=ddb-os,ddb", storage: "ddb-os" }
{ cmd: "packages/api-mailer -- --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-mailer -- --storage=ddb-es,ddb", storage: "ddb-es" },
{ cmd: "packages/api-mailer -- --storage=ddb-os,ddb", storage: "ddb-os" }
];
},

"api-headless-cms": () => {
return [
...shardPackageTestExecution({
cmd: "packages/api-headless-cms --storage=ddb",
cmd: "packages/api-headless-cms -- --storage=ddb",
storage: "ddb"
}),
...shardPackageTestExecution({
cmd: "packages/api-headless-cms --storage=ddb-es,ddb",
cmd: "packages/api-headless-cms -- --storage=ddb-es,ddb",
storage: "ddb-es"
}),
...shardPackageTestExecution({
cmd: "packages/api-headless-cms --storage=ddb-os,ddb",
cmd: "packages/api-headless-cms -- --storage=ddb-os,ddb",
storage: "ddb-os"
})
];
},
"api-headless-cms-import-export": () => {
return [
{ cmd: "packages/api-headless-cms-import-export --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-headless-cms-import-export -- --storage=ddb", storage: "ddb" },
{
cmd: "packages/api-headless-cms-import-export --storage=ddb-es,ddb",
cmd: "packages/api-headless-cms-import-export -- --storage=ddb-es,ddb",
storage: "ddb-es"
},
{
cmd: "packages/api-headless-cms-import-export --storage=ddb-os,ddb",
cmd: "packages/api-headless-cms-import-export -- --storage=ddb-os,ddb",
storage: "ddb-os"
}
];
},
"api-headless-cms-ddb-es": () => {
return [
{
cmd: "packages/api-headless-cms-ddb-es --storage=ddb-es,ddb",
cmd: "packages/api-headless-cms-ddb-es -- --storage=ddb-es,ddb",
storage: "ddb-es"
},
{
cmd: "packages/api-headless-cms-ddb-es --storage=ddb-os,ddb",
cmd: "packages/api-headless-cms-ddb-es -- --storage=ddb-os,ddb",
storage: "ddb-os"
}
];
},
"api-headless-cms-aco": () => {
return [
{ cmd: "packages/api-headless-cms-aco --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-headless-cms-aco --storage=ddb-es,ddb", storage: "ddb-es" },
{ cmd: "packages/api-headless-cms-aco --storage=ddb-os,ddb", storage: "ddb-os" }
{ cmd: "packages/api-headless-cms-aco -- --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-headless-cms-aco -- --storage=ddb-es,ddb", storage: "ddb-es" },
{ cmd: "packages/api-headless-cms-aco -- --storage=ddb-os,ddb", storage: "ddb-os" }
];
},
"api-headless-cms-bulk-actions": () => {
return [
{ cmd: "packages/api-headless-cms-bulk-actions --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-headless-cms-bulk-actions -- --storage=ddb", storage: "ddb" },
{
cmd: "packages/api-headless-cms-bulk-actions --storage=ddb-es,ddb",
cmd: "packages/api-headless-cms-bulk-actions -- --storage=ddb-es,ddb",
storage: "ddb-es"
},
{
cmd: "packages/api-headless-cms-bulk-actions --storage=ddb-os,ddb",
cmd: "packages/api-headless-cms-bulk-actions -- --storage=ddb-os,ddb",
storage: "ddb-os"
}
];
},
"api-apw": () => {
return [
{ cmd: "packages/api-apw --storage=ddb", storage: "ddb" }
// TODO: With ddb-es setup, some tests are failing!
// "packages/api-apw --storage=ddb-es,ddb"
];
},
// "api-apw": () => {
// return [
// { cmd: "packages/api-apw -- --storage=ddb", storage: "ddb" }
// // TODO: With ddb-es setup, some tests are failing!
// // "packages/api-apw -- --storage=ddb-es,ddb"
// ];
// },
"api-aco": () => {
return [
{ cmd: "packages/api-aco --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-aco --storage=ddb-es,ddb", storage: "ddb-es" },
{ cmd: "packages/api-aco --storage=ddb-os,ddb", storage: "ddb-os" }
{ cmd: "packages/api-aco -- --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-aco -- --storage=ddb-es,ddb", storage: "ddb-es" },
{ cmd: "packages/api-aco -- --storage=ddb-os,ddb", storage: "ddb-os" }
];
},
"api-audit-logs": () => {
return [
{ cmd: "packages/api-audit-logs --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-audit-logs --storage=ddb-es,ddb", storage: "ddb-es" },
{ cmd: "packages/api-audit-logs --storage=ddb-os,ddb", storage: "ddb-os" }
];
},
"api-page-builder-aco": () => {
return [
{ cmd: "packages/api-page-builder-aco --storage=ddb", storage: "ddb" },
{
cmd: "packages/api-page-builder-aco --storage=ddb-es,ddb",
storage: "ddb-es"
},
{
cmd: "packages/api-page-builder-aco --storage=ddb-os,ddb",
storage: "ddb-os"
}
{ cmd: "packages/api-audit-logs -- --storage=ddb", storage: "ddb" },
{ cmd: "packages/api-audit-logs -- --storage=ddb-es,ddb", storage: "ddb-es" },
{ cmd: "packages/api-audit-logs -- --storage=ddb-os,ddb", storage: "ddb-os" }
];
},
"app-aco": () => {
Expand All @@ -269,81 +193,81 @@ const CUSTOM_HANDLERS: Record<string, () => Array<PackageWithTests>> = {
migrations: () => {
return [
{
cmd: "packages/migrations --storage=ddb-es,ddb",
cmd: "packages/migrations -- --storage=ddb-es,ddb",
storage: ["ddb-es"]
},
{
cmd: "packages/migrations --storage=ddb-os,ddb",
cmd: "packages/migrations -- --storage=ddb-os,ddb",
storage: ["ddb-os"]
}
];
},
"api-elasticsearch": () => {
return [
{
cmd: "packages/api-elasticsearch --storage=ddb-es,ddb",
cmd: "packages/api-elasticsearch -- --storage=ddb-es,ddb",
storage: ["ddb-es"]
},
{
cmd: "packages/api-elasticsearch --storage=ddb-os,ddb",
cmd: "packages/api-elasticsearch -- --storage=ddb-os,ddb",
storage: ["ddb-os"]
}
];
},
"api-dynamodb-to-elasticsearch": () => {
return [
{
cmd: "packages/api-dynamodb-to-elasticsearch --storage=ddb-es,ddb",
cmd: "packages/api-dynamodb-to-elasticsearch -- --storage=ddb-es,ddb",
storage: ["ddb-es"]
},
{
cmd: "packages/api-dynamodb-to-elasticsearch --storage=ddb-os,ddb",
cmd: "packages/api-dynamodb-to-elasticsearch -- --storage=ddb-os,ddb",
storage: ["ddb-os"]
}
];
},
"api-headless-cms-es-tasks": () => {
return [
{
cmd: "packages/api-headless-cms-es-tasks --storage=ddb-es,ddb",
cmd: "packages/api-headless-cms-es-tasks -- --storage=ddb-es,ddb",
storage: ["ddb-es"]
},
{
cmd: "packages/api-headless-cms-es-tasks --storage=ddb-os,ddb",
cmd: "packages/api-headless-cms-es-tasks -- --storage=ddb-os,ddb",
storage: ["ddb-os"]
}
];
},
tasks: () => {
return [
{ cmd: "packages/tasks --storage=ddb", storage: "ddb" },
{ cmd: "packages/tasks -- --storage=ddb", storage: "ddb" },
{
cmd: "packages/tasks --storage=ddb-es,ddb",
cmd: "packages/tasks -- --storage=ddb-es,ddb",
storage: "ddb-es"
},
{
cmd: "packages/tasks --storage=ddb-os,ddb",
cmd: "packages/tasks -- --storage=ddb-os,ddb",
storage: "ddb-os"
}
];
},
"api-elasticsearch-tasks": () => {
return [
{
cmd: "packages/api-elasticsearch-tasks --storage=ddb-es,ddb",
cmd: "packages/api-elasticsearch-tasks -- --storage=ddb-es,ddb",
storage: "ddb-es"
},
{
cmd: "packages/api-elasticsearch-tasks --storage=ddb-os,ddb",
cmd: "packages/api-elasticsearch-tasks -- --storage=ddb-os,ddb",
storage: "ddb-os"
}
];
},
"api-serverless-cms": () => {
return [
{ cmd: "packages/api-serverless-cms --storage=ddb-es,ddb", storage: "ddb-es" },
{ cmd: "packages/api-serverless-cms --storage=ddb-os,ddb", storage: "ddb-os" },
{ cmd: "packages/api-serverless-cms --storage=ddb", storage: "ddb" }
{ cmd: "packages/api-serverless-cms -- --storage=ddb-es,ddb", storage: "ddb-es" },
{ cmd: "packages/api-serverless-cms -- --storage=ddb-os,ddb", storage: "ddb-os" },
{ cmd: "packages/api-serverless-cms -- --storage=ddb", storage: "ddb" }
];
}
};
Expand Down
Loading
Loading