Separate PHP and JS Unit Tests (woocommerce#40639)

Since some projects might have both kinds of tests we are going to have a `test:php` and a `test:js` script for each.
seanmrice · Oct 6, 2023 · 1c30563 · 1c30563
1 parent e7711f1
commit 1c30563
Show file tree

Hide file tree

Showing 38 changed files with 118 additions and 24 deletions.
diff --git a/packages/js/ai/changelog/update-separate-php-and-js-tests b/packages/js/ai/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/ai/package.json b/packages/js/ai/package.json
@@ -78,7 +78,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name --",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"build:js": "tsc --project tsconfig.json && tsc --project tsconfig-cjs.json",
 		"build:css": "webpack",

diff --git a/packages/js/api/changelog/update-separate-php-and-js-tests b/packages/js/api/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/api/package.json b/packages/js/api/package.json
@@ -32,7 +32,8 @@
 	"scripts": {
 		"turbo:build": "pnpm run clean && npm run compile",
 		"turbo:test": "jest",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"prepare": "composer install",
 		"changelog": "composer exec -- changelogger",
 		"clean": "rm -rf ./dist ./tsconfig.tsbuildinfo",

diff --git a/packages/js/block-templates/changelog/update-separate-php-and-js-tests b/packages/js/block-templates/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/block-templates/package.json b/packages/js/block-templates/package.json
@@ -65,7 +65,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"build:js": "tsc --project tsconfig.json && tsc --project tsconfig-cjs.json",
 		"build:css": "webpack",

diff --git a/packages/js/components/changelog/update-separate-php-and-js-tests b/packages/js/components/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/components/package.json b/packages/js/components/package.json
@@ -153,7 +153,8 @@
 		"prepare": "composer install",
 		"changelog": "composer exec -- changelogger",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json --ext=js,ts,tsx src",
 		"build:js": "tsc --project tsconfig.json && tsc --project tsconfig-cjs.json",
 		"build:css": "webpack",

diff --git a/packages/js/csv-export/changelog/update-separate-php-and-js-tests b/packages/js/csv-export/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/csv-export/package.json b/packages/js/csv-export/package.json
@@ -40,7 +40,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"start": "concurrently \"tsc --project tsconfig.json --watch\" \"tsc --project tsconfig-cjs.json --watch\"",
 		"prepack": "pnpm run clean && pnpm run build",

diff --git a/packages/js/currency/changelog/update-separate-php-and-js-tests b/packages/js/currency/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/currency/package.json b/packages/js/currency/package.json
@@ -43,7 +43,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"start": "concurrently \"tsc --project tsconfig.json --watch\" \"tsc --project tsconfig-cjs.json --watch\"",
 		"prepack": "pnpm run clean && pnpm run build",

diff --git a/packages/js/customer-effort-score/changelog/update-separate-php-and-js-tests b/packages/js/customer-effort-score/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/customer-effort-score/package.json b/packages/js/customer-effort-score/package.json
@@ -79,7 +79,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"build:js": "tsc --project tsconfig.json && tsc --project tsconfig-cjs.json",
 		"build:css": "webpack",

diff --git a/packages/js/data/changelog/update-separate-php-and-js-tests b/packages/js/data/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/data/package.json b/packages/js/data/package.json
@@ -86,7 +86,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"start": "concurrently \"tsc --project tsconfig.json --watch\" \"tsc --project tsconfig-cjs.json --watch\"",
 		"prepack": "pnpm run clean && pnpm run build",

diff --git a/packages/js/date/changelog/update-separate-php-and-js-tests b/packages/js/date/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/date/package.json b/packages/js/date/package.json
@@ -63,7 +63,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"start": "concurrently \"tsc --project tsconfig.json --watch\" \"tsc --project tsconfig-cjs.json --watch\"",
 		"prepack": "pnpm run clean && pnpm run build",

diff --git a/packages/js/experimental/changelog/update-separate-php-and-js-tests b/packages/js/experimental/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/experimental/package.json b/packages/js/experimental/package.json
@@ -89,7 +89,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"build:js": "tsc --project tsconfig.json && tsc --project tsconfig-cjs.json",
 		"build:css": "webpack",

diff --git a/packages/js/explat/changelog/update-separate-php-and-js-tests b/packages/js/explat/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/explat/package.json b/packages/js/explat/package.json
@@ -61,7 +61,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"start": "concurrently \"tsc --project tsconfig.json --watch\" \"tsc --project tsconfig-cjs.json --watch\"",
 		"prepack": "pnpm run clean && pnpm run build",

diff --git a/packages/js/integrate-plugin/changelog/update-separate-php-and-js-tests b/packages/js/integrate-plugin/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/integrate-plugin/package.json b/packages/js/integrate-plugin/package.json
@@ -68,7 +68,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"build:js": "tsc --project tsconfig.json && tsc --project tsconfig-cjs.json",
 		"start": "concurrently \"tsc --project tsconfig.json --watch\" \"tsc --project tsconfig-cjs.json --watch\" \"webpack --watch\"",

diff --git a/packages/js/navigation/changelog/update-separate-php-and-js-tests b/packages/js/navigation/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/navigation/package.json b/packages/js/navigation/package.json
@@ -51,7 +51,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"start": "concurrently \"tsc --project tsconfig.json --watch\" \"tsc --project tsconfig-cjs.json --watch\"",
 		"prepack": "pnpm run clean && pnpm run build",

diff --git a/packages/js/number/changelog/update-separate-php-and-js-tests b/packages/js/number/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/number/package.json b/packages/js/number/package.json
@@ -37,7 +37,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"start": "concurrently \"tsc --project tsconfig.json --watch\" \"tsc --project tsconfig-cjs.json --watch\"",
 		"prepack": "pnpm run clean && pnpm run build",

diff --git a/packages/js/onboarding/changelog/update-separate-php-and-js-tests b/packages/js/onboarding/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/onboarding/package.json b/packages/js/onboarding/package.json
@@ -79,7 +79,8 @@
 		"build:js": "tsc --project tsconfig.json && tsc --project tsconfig-cjs.json",
 		"build:css": "webpack",
 		"start": "concurrently \"tsc --project tsconfig.json --watch\" \"tsc --project tsconfig-cjs.json --watch\" \"webpack --watch\"",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"prepack": "pnpm run clean && pnpm run build",
 		"lint:fix": "eslint src --fix",
 		"test-staged": "jest --bail --config ./jest.config.json --findRelatedTests"

diff --git a/packages/js/product-editor/changelog/update-separate-php-and-js-tests b/packages/js/product-editor/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/packages/js/product-editor/package.json b/packages/js/product-editor/package.json
@@ -122,7 +122,8 @@
 		"changelog": "composer exec -- changelogger",
 		"clean": "pnpm exec rimraf tsconfig.tsbuildinfo build build-*",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "eslint --output-file eslint_report.json --format json src",
 		"build:js": "tsc --project tsconfig.json && tsc --project tsconfig-cjs.json",
 		"build:css": "webpack",

diff --git a/plugins/woocommerce-admin/package.json b/plugins/woocommerce-admin/package.json
@@ -14,7 +14,8 @@
 		"turbo:test": "pnpm run test:client",
 		"analyze": "cross-env NODE_ENV=production ANALYZE=true webpack",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "pnpm run lint:js && pnpm run lint:css",
 		"build:feature-config": "php ../woocommerce/bin/generate-feature-config.php",
 		"clean": "rimraf ../woocommerce/assets/client/admin/*",

diff --git a/plugins/woocommerce-docs/package.json b/plugins/woocommerce-docs/package.json
@@ -7,8 +7,11 @@
 		"build": "wp-scripts build",
 		"start": "wp-scripts start",
 		"postinstall": "composer install",
-		"test:env-setup": "wp-env start && wp-env run cli --env-cwd=wp-content/plugins/woocommerce-docs composer install",
-		"test:unit": "pnpm run test:env-setup && wp-env run tests-cli vendor/bin/phpunit --env-cwd=wp-content/plugins/woocommerce-docs"
+		"test": "pnpm test:php",
+		"test:env:start": "wp-env start && wp-env run cli --env-cwd=wp-content/plugins/woocommerce-docs composer install",
+		"test:php": "wp-env run tests-cli vendor/bin/phpunit --env-cwd=wp-content/plugins/woocommerce-docs",
+		"test:env-setup": "pnpm test:env:start",
+		"test:unit": "pnpm test:env:start && pnpm test:php"
 	},
 	"keywords": [],
 	"author": "",

diff --git a/plugins/woocommerce/changelog/update-separate-php-and-js-tests b/plugins/woocommerce/changelog/update-separate-php-and-js-tests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+Comment: This is just a change to developer commands.
+
diff --git a/plugins/woocommerce/package.json b/plugins/woocommerce/package.json
@@ -19,7 +19,8 @@
 		"postinstall": "composer install",
 		"changelog": "composer exec -- changelogger",
 		"build": "pnpm -w exec turbo run turbo:build --filter=$npm_package_name",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"lint": "pnpm lint:php",
 		"build:feature-config": "php bin/generate-feature-config.php",
 		"build:zip": "./bin/build-zip.sh",
@@ -48,8 +49,11 @@
 		"make:collection": "pnpm exec wc-api-tests make:collection",
 		"e2e:debug": "pnpm exec wc-e2e test:e2e-debug",
 		"e2e:dev": "pnpm exec wc-e2e test:e2e-dev",
-		"test:unit": "./vendor/bin/phpunit -c ./phpunit.xml",
-		"test:unit:env": "wp-env run --env-cwd='wp-content/plugins/woocommerce' tests-cli vendor/bin/phpunit -c phpunit.xml --verbose",
+		"test:env:start": "pnpm env:test",
+		"test:php": "./vendor/bin/phpunit -c ./phpunit.xml",
+		"test:php:env": "wp-env run --env-cwd='wp-content/plugins/woocommerce' tests-cli vendor/bin/phpunit -c phpunit.xml --verbose",
+		"test:unit": "pnpm test:php",
+		"test:unit:env": "pnpm test:php:env",
 		"makepot": "composer run-script makepot",
 		"packages:fix:textdomain": "node ./bin/package-update-textdomain.js"
 	},

diff --git a/tools/code-analyzer/package.json b/tools/code-analyzer/package.json
@@ -32,7 +32,8 @@
 	"scripts": {
 		"lint": "eslint . --ext .ts",
 		"turbo:test": "jest",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name",
 		"analyzer": "node -r ts-node/register ./src/commands/analyzer/index.ts"
 	},
 	"engines": {

diff --git a/tools/monorepo-utils/package.json b/tools/monorepo-utils/package.json
@@ -47,7 +47,8 @@
 		"lint": "eslint . --ext .ts",
 		"postinstall": "pnpm run build",
 		"turbo:test": "jest",
-		"test": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name"
+		"test": "pnpm test:js",
+		"test:js": "pnpm -w exec turbo run turbo:test --filter=$npm_package_name"
 	},
 	"engines": {
 		"node": "^16.14.1",