diff --git a/.github/actions/tool-setup/action.yml b/.github/actions/tool-setup/action.yml index 39f1f2faf1824..e2d0d453f6887 100644 --- a/.github/actions/tool-setup/action.yml +++ b/.github/actions/tool-setup/action.yml @@ -3,6 +3,9 @@ description: "Setup needed versions of PHP, Node, and Pnpm." inputs: php: description: "Override the PHP version, or set 'false' to skip setting up PHP." + coverage: + description: "Set the PHP coverage driver, e.g. 'none' or 'pcov'." + default: 'none' node: description: "Override the Node version, or set 'false' to skip setting up Node and Pnpm." runs: @@ -62,7 +65,7 @@ runs: ini-values: error_reporting=E_ALL, display_errors=On, zend.assertions=1 tools: composer:${{ steps.versions.outputs.composer-version }} extensions: mysql, imagick - coverage: none + coverage: ${{ inputs.coverage }} - name: Configure composer if: steps.versions.outputs.php-version != 'false' diff --git a/.github/files/generate-ci-matrix.php b/.github/files/generate-ci-matrix.php index 15026f8b28d93..1e5ccd9168914 100755 --- a/.github/files/generate-ci-matrix.php +++ b/.github/files/generate-ci-matrix.php @@ -120,6 +120,14 @@ 'timeout' => 15, // 2021-01-18: Successful runs seem to take ~5 minutes. ); +// Add Coverage tests. +$matrix[] = array( + 'name' => 'Code coverage', + 'script' => 'test-coverage', + 'wp' => 'latest', + 'timeout' => 40, // 2024-10-30: Successful runs seem to take ~30 minutes. We'll need to improve that. +); + // END matrix definitions. // Now, validation. diff --git a/.github/files/process-coverage.sh b/.github/files/process-coverage.sh new file mode 100755 index 0000000000000..a30fcc75cdbab --- /dev/null +++ b/.github/files/process-coverage.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -eo pipefail + +EXIT=0 + +[[ -d coverage ]] && find coverage -type d -empty -delete +if [[ ! -d coverage ]]; then + echo 'No coverage was generated.' + exit $EXIT +fi + +echo '::group::Copy coverage into artifacts' +tar --owner=0 --group=0 --xz -cvvf artifacts/coverage.tar.xz coverage +echo '::endgroup::' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 65015806bd992..5b4b8b44d4789 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,7 +55,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - # codecov.io requires a fetch depth > 1. + # Test coverage checks require a fetch depth > 1. fetch-depth: 2 # For pull requests, list-changed-projects.sh needs the merge base. @@ -70,6 +70,7 @@ jobs: uses: ./.github/actions/tool-setup with: php: ${{ matrix.php }} + coverage: ${{ matrix.script == 'test-coverage' && 'pcov' || 'none' }} node: ${{ matrix.node }} - name: Monorepo install @@ -79,7 +80,7 @@ jobs: echo "::endgroup::" # If we're going to be making WorDBless use WP "nightlies", remove the relevant package from Composer's cache to get the latest version. - if [[ "$WP_BRANCH" == 'trunk' && "$TEST_SCRIPT" == "test-php" ]]; then + if [[ "$WP_BRANCH" == 'trunk' && ( "$TEST_SCRIPT" == "test-php" || "$TEST_SCRIPT" == "test-coverage" ) ]]; then echo "::group::Clear composer cache for roots/wordpress" DIR=$(composer config cache-files-dir) rm -rf "$DIR/roots/wordpress" "$DIR/roots/wordpress-no-content" @@ -119,6 +120,7 @@ jobs: run: | EXIT=0 mkdir artifacts + [[ "$TEST_SCRIPT" == "test-coverage" ]] && mkdir coverage for P in composer.json projects/*/*/composer.json; do if [[ "$P" == "composer.json" ]]; then DIR="." @@ -128,12 +130,7 @@ jobs: SLUG="${DIR#projects/}" fi - if [[ "${SLUG%%/*}" == "plugins" ]]; then - # Plugins run from the WordPress checkout, not the monorepo checkout. - if [[ -d "/tmp/wordpress-$WP_BRANCH/src/wp-content/$SLUG" ]]; then - DIR="/tmp/wordpress-$WP_BRANCH/src/wp-content/$SLUG" - fi - elif [[ "$WP_BRANCH" != 'latest' && "$WP_BRANCH" != 'none' && "$FORCE_PACKAGE_TESTS" != "true" ]]; then + if [[ "${SLUG%%/*}" != "plugins" && "$WP_BRANCH" != 'latest' && "$WP_BRANCH" != 'none' && "$FORCE_PACKAGE_TESTS" != "true" ]]; then echo "Skipping $SLUG, only plugins run for WP_BRANCH = $WP_BRANCH" continue fi @@ -160,7 +157,7 @@ jobs: echo "::group::Running tests for $SLUG" # Composer install, if appropriate. Note setup-wordpress-env.sh did it already for plugins. - if [[ "${SLUG%%/*}" != "plugins" && "$TEST_SCRIPT" == "test-php" ]]; then + if [[ "${SLUG%%/*}" != "plugins" && ( "$TEST_SCRIPT" == "test-php" || "$TEST_SCRIPT" == "test-coverage" ) ]]; then if [[ ! -f "$DIR/composer.lock" ]]; then echo 'No composer.lock, running `composer update`' composer --working-dir="$DIR" update @@ -187,6 +184,10 @@ jobs: mkdir -p "artifacts/$SLUG" export ARTIFACTS_DIR="$GITHUB_WORKSPACE/artifacts/$SLUG" + if [[ "$TEST_SCRIPT" == "test-coverage" ]]; then + mkdir -p "coverage/$SLUG" + export COVERAGE_DIR="$GITHUB_WORKSPACE/coverage/$SLUG" + fi FAIL=false if ! composer run --timeout=0 --working-dir="$DIR" "$TEST_SCRIPT"; then FAIL=true @@ -203,6 +204,12 @@ jobs: done exit $EXIT + - name: Process coverage results + env: + CHANGED: ${{ steps.changed.outputs.projects }} + if: matrix.script == 'test-coverage' + run: .github/files/process-coverage.sh + - name: Check for artifacts id: check-artifacts # Default for `if` is `success()`, we want this to run always. diff --git a/composer.lock b/composer.lock index e3dffd74ad653..dfeb484a476f9 100644 --- a/composer.lock +++ b/composer.lock @@ -13,7 +13,7 @@ "dist": { "type": "path", "url": "projects/packages/ignorefile", - "reference": "3ac0481862de59f65856b3ac2e086d9cdc86a8fd" + "reference": "834a96c1a69edb801392ecdc257a90a7065bac03" }, "require": { "php": ">=7.0" @@ -42,6 +42,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -60,7 +63,7 @@ "dist": { "type": "path", "url": "projects/packages/codesniffer", - "reference": "7545c2efd2ce1a5f8cb85419035b3f1e952be125" + "reference": "da78e5b6b335d3d5034481677ed8f49c6a3d2108" }, "require": { "automattic/vipwpcs": "^3.0", @@ -98,6 +101,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "projects/packages/phan-plugins", - "reference": "d7a0268045b235a3158435f2b83179d7fecada39" + "reference": "6030c0e5428031c3d74ddfae0df1cfc25fc5d655" }, "require": { "phan/phan": "^5.4", @@ -154,6 +160,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -178,7 +187,7 @@ "dist": { "type": "path", "url": "projects/packages/phpcs-filter", - "reference": "8eec63259d8259729921c7ce48393890cb9babdd" + "reference": "0e3de0f35848da2f53206880ea0d2450a1abe918" }, "require": { "automattic/ignorefile": "@dev", @@ -204,6 +213,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -3114,6 +3126,6 @@ "platform": { "ext-json": "*" }, - "platform-dev": {}, + "platform-dev": [], "plugin-api-version": "2.6.0" } diff --git a/docs/examples/bootstrap.php b/docs/examples/bootstrap.php index 84793d2a92051..936ef76a23895 100644 --- a/docs/examples/bootstrap.php +++ b/docs/examples/bootstrap.php @@ -9,9 +9,9 @@ $_plugin_root = dirname( __DIR__, 2 ); // Locate WordPress or wordpress-develop. We look in several places. -if ( false !== getenv( 'WP_DEVELOP_DIR' ) ) { +if ( false !== getenv( 'WORDPRESS_DEVELOP_DIR' ) ) { // Jetpack Monorepo environment variable. - $_tests_dir = getenv( 'WP_DEVELOP_DIR' ); + $_tests_dir = getenv( 'WORDPRESS_DEVELOP_DIR' ); if ( file_exists( "$_tests_dir/tests/phpunit/" ) ) { $_tests_dir .= '/tests/phpunit/'; } @@ -38,7 +38,7 @@ if ( ! isset( $_tests_dir ) || ! file_exists( $_tests_dir . '/includes/bootstrap.php' ) ) { echo 'Failed to automatically locate WordPress or wordpress-develop to run tests.' . PHP_EOL; echo PHP_EOL; - echo 'Set the WP_DEVELOP_DIR environment variable to point to a copy of WordPress' . PHP_EOL; + echo 'Set the WORDPRESS_DEVELOP_DIR environment variable to point to a copy of WordPress' . PHP_EOL; echo 'or wordpress-develop.' . PHP_EOL; exit( 1 ); } diff --git a/docs/monorepo.md b/docs/monorepo.md index 0457d999c8897..8b45fb21572f6 100644 --- a/docs/monorepo.md +++ b/docs/monorepo.md @@ -116,6 +116,8 @@ We use `composer.json` to hold metadata about projects. Much of our generic tool * `.repositories`: If you include a repository entry referencing monorepo packages, it must have `.options.monorepo` set to true. This allows the build tooling to recognize and remove it. * `.scripts.build-development`: If your project has a general build step, this must run the necessary commands. See [Building](#building) for details. * `.scripts.build-production`: If your project requires a production-specific build step, this must run the necessary commands. See [Building](#building) for details. +* `.scripts.test-coverage`: If the package contains any tests, this must run the necessary commands to generate a coverage report. See [Code coverage](#code-coverage) for details. + * `.scripts.skip-test-coverage`: Run before `.scripts.test-coverage` in CI. If it exits with code 3, the test run will be skipped. * `.scripts.test-e2e`: If the package contains any E2E tests, this must run the necessary commands. See [E2E tests](#e2e-tests) for details. * `.scripts.test-js`: If the package contains any JavaScript tests, this must run the necessary commands. See [JavaScript tests](#javascript-tests) for details. * `.scripts.skip-test-js`: Run before `.scripts.test-js` in CI. If it exits with code 3, the test run will be skipped. @@ -183,6 +185,8 @@ The following environment variables are available for all tests: - `ARTIFACTS_DIR`: If your tests generate any artifacts that might be useful for debugging, you may place them in the directory specified by this variable and they will be uploaded to GitHub after the test run. There's no need to be concerned about collisions with other projects' artifacts, a separate directory is used per project. - `MONOREPO_BASE`: Path to the monorepo. Useful if you're using things in `tools/` from plugin tests. +- `WORDPRESS_DIR`: Path to a copy of WordPress. Other than plugin tests, though, you should probably avoid using this. +- `WORDPRESS_DEVELOP_DIR`: Path to a checkout of wordpress-develop. Other than plugin tests, though, you should probably avoid using this. - `NODE_VERSION`: The version of Node in use, as specified in `.github/versions.sh`. - `PHP_VERSION`: The version of PHP in use. Unless otherwise specified below, it will be the same as in `.github/versions.sh`. - `TEST_SCRIPT`: The test script being run. @@ -281,7 +285,7 @@ We currently make use of the following packages in testing; it's encouraged to u #### PHP tests for plugins -WordPress plugins generally want to run within WordPress. All monorepo plugins are copied into place in a WordPress installation and tests are run from there. +WordPress plugins may want to run within WordPress. All monorepo plugins are copied into place in a WordPress installation. Environment variable `WORDPRESS_DIR` points to this installation, and `WORDPRESS_DEVELOP_DIR` points a directory with WordPress's `tests/phpunit/`. Tests will be run against the latest version of WordPress using the variety of supported PHP versions, and against the previous and trunk versions of WordPress using the PHP version in `.github/versions.sh`. The environment variable `WP_BRANCH` will be set to 'latest', 'previous', or 'trunk' accordingly. If you have tests that only need to be run once, run them when `WP_BRANCH` is 'latest'. @@ -299,6 +303,16 @@ JavaScript tests should use `jest`, not `mocha`/`chai`/`sinon`. For React testin If a project contains end-to-end tests, it must define `.scripts.test-e2e` in `composer.json` to run the tests. If a build step is required before running tests, the necessary commands for that should also be included. +### Code coverage + +If a project contains PHP or JavaScript tests, it should also define `.scripts.test-coverage` in `composer.json` to run the tests in a mode that will generate code coverage output. The CI environment will run `pnpm install` and `composer install` beforehand, but if a build step is required before running tests the necessary commands for that should also be included in `.scripts.test-coverage`. + +Output should be written to the path specified via the `COVERAGE_DIR` environment variable. Subdirectories of that path may be used as desired. + +For PHP tests, you'll probably run PHPUnit as `php -dpcov.directory=. "$(command -v phpunit)" --coverage-clover "$COVERAGE_DIR/php/clover.xml"`. + +There's no need to be concerned about collisions with other projects' coverage files, a separate directory is used per project. The coverage files are also automatically copied to `ARTIFACTS_DIR`. + ## Mirror repositories Most projects in the monorepo should have a mirror repository holding a built version of the project, ready for deployment. Follow these steps to create the mirror repo and configure the monorepo tooling to push to it. diff --git a/docs/quick-start.md b/docs/quick-start.md index 4983dfd9db3dd..029c6feaf2907 100644 --- a/docs/quick-start.md +++ b/docs/quick-start.md @@ -112,6 +112,6 @@ jetpack watch ``` ### Running Tests -To run PHP and JS tests, you can use the Jetpack CLI: `jetpack test` and then choose the project and type of test you'd like to run. +To run PHP, JS, and coverage tests, you can use the Jetpack CLI: `jetpack test` and then choose the project and type of test you'd like to run. That's all! diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 65d6616984168..81499ea8b1346 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3262,6 +3262,9 @@ importers: '@wordpress/browserslist-config': specifier: 6.9.0 version: 6.9.0 + '@wordpress/components': + specifier: 28.9.0 + version: 28.9.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) babel-jest: specifier: 29.4.3 version: 29.4.3(@babel/core@7.24.7) diff --git a/projects/github-actions/test-results-to-slack/changelog/restore-jp_test_coverage b/projects/github-actions/test-results-to-slack/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/github-actions/test-results-to-slack/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/github-actions/test-results-to-slack/composer.json b/projects/github-actions/test-results-to-slack/composer.json index 4f7709c1de373..dd239c80021bd 100644 --- a/projects/github-actions/test-results-to-slack/composer.json +++ b/projects/github-actions/test-results-to-slack/composer.json @@ -11,6 +11,7 @@ "build-development": [ "pnpm run build" ], + "test-coverage": "pnpm run test-coverage", "test-js": "pnpm run test" }, "repositories": [ diff --git a/projects/github-actions/test-results-to-slack/package.json b/projects/github-actions/test-results-to-slack/package.json index 5e77258b7827c..cbce6e86e9321 100644 --- a/projects/github-actions/test-results-to-slack/package.json +++ b/projects/github-actions/test-results-to-slack/package.json @@ -27,6 +27,7 @@ }, "scripts": { "build": "ncc build src/index.js -o dist --source-map --license licenses.txt", - "test": "jest --config=tests/jest.config.js --verbose --runInBand" + "test": "jest --config=tests/jest.config.js --verbose --runInBand", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" } } diff --git a/projects/js-packages/ai-client/changelog/restore-jp_test_coverage b/projects/js-packages/ai-client/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/ai-client/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/ai-client/composer.json b/projects/js-packages/ai-client/composer.json index ee5d3bcdf78df..328c58235e9c6 100644 --- a/projects/js-packages/ai-client/composer.json +++ b/projects/js-packages/ai-client/composer.json @@ -24,6 +24,9 @@ "Composer\\Config::disableProcessTimeout", "pnpm run watch" ], + "test-coverage": [ + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ] diff --git a/projects/js-packages/ai-client/package.json b/projects/js-packages/ai-client/package.json index fe6ddd91c1d96..797cdf9d9f93f 100644 --- a/projects/js-packages/ai-client/package.json +++ b/projects/js-packages/ai-client/package.json @@ -19,6 +19,7 @@ "clean": "rm -rf build/", "compile-ts": "tsc --pretty", "test": "NODE_OPTIONS=--experimental-vm-modules jest", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "watch": "tsc --watch --pretty" }, "type": "module", diff --git a/projects/js-packages/analytics/changelog/restore-jp_test_coverage b/projects/js-packages/analytics/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/analytics/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/analytics/composer.json b/projects/js-packages/analytics/composer.json index cf505e001e644..53f6fc990b448 100644 --- a/projects/js-packages/analytics/composer.json +++ b/projects/js-packages/analytics/composer.json @@ -11,6 +11,9 @@ "scripts": { "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/analytics/package.json b/projects/js-packages/analytics/package.json index 2231680663e5a..ba077041675a9 100644 --- a/projects/js-packages/analytics/package.json +++ b/projects/js-packages/analytics/package.json @@ -24,6 +24,7 @@ ".": "./index.jsx" }, "scripts": { - "test": "NODE_OPTIONS=--experimental-vm-modules jest" + "test": "NODE_OPTIONS=--experimental-vm-modules jest", + "test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR/js\" --coverage --coverageReporters=clover" } } diff --git a/projects/js-packages/api/changelog/restore-jp_test_coverage b/projects/js-packages/api/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/api/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/api/composer.json b/projects/js-packages/api/composer.json index 9aa57af77c74c..b73f2c0b89497 100644 --- a/projects/js-packages/api/composer.json +++ b/projects/js-packages/api/composer.json @@ -9,6 +9,9 @@ "scripts": { "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/api/package.json b/projects/js-packages/api/package.json index 6238761e4bf50..4b0a0c7d10721 100644 --- a/projects/js-packages/api/package.json +++ b/projects/js-packages/api/package.json @@ -26,6 +26,7 @@ ".": "./index.jsx" }, "scripts": { - "test": "NODE_OPTIONS=--experimental-vm-modules jest" + "test": "NODE_OPTIONS=--experimental-vm-modules jest", + "test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR/js\" --coverage --coverageReporters=clover" } } diff --git a/projects/js-packages/babel-plugin-replace-textdomain/changelog/restore-jp_test_coverage b/projects/js-packages/babel-plugin-replace-textdomain/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/babel-plugin-replace-textdomain/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/babel-plugin-replace-textdomain/composer.json b/projects/js-packages/babel-plugin-replace-textdomain/composer.json index 73fa611dfd6d0..4c425eed6ee1e 100644 --- a/projects/js-packages/babel-plugin-replace-textdomain/composer.json +++ b/projects/js-packages/babel-plugin-replace-textdomain/composer.json @@ -10,6 +10,9 @@ "scripts": { "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/babel-plugin-replace-textdomain/package.json b/projects/js-packages/babel-plugin-replace-textdomain/package.json index 13ceb793c3fa9..233ea1ec2bd14 100644 --- a/projects/js-packages/babel-plugin-replace-textdomain/package.json +++ b/projects/js-packages/babel-plugin-replace-textdomain/package.json @@ -14,7 +14,8 @@ "license": "GPL-2.0-or-later", "author": "Automattic", "scripts": { - "test": "jest tests" + "test": "jest tests", + "test-coverage": "pnpm run test --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "dependencies": { "debug": "^4.3.2" diff --git a/projects/js-packages/boost-score-api/changelog/restore-jp_test_coverage b/projects/js-packages/boost-score-api/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/boost-score-api/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/boost-score-api/composer.json b/projects/js-packages/boost-score-api/composer.json index b42e4121420e4..57bc08a6ef502 100644 --- a/projects/js-packages/boost-score-api/composer.json +++ b/projects/js-packages/boost-score-api/composer.json @@ -19,6 +19,9 @@ "Composer\\Config::disableProcessTimeout", "pnpm run watch" ], + "test-coverage": [ + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ] diff --git a/projects/js-packages/boost-score-api/package.json b/projects/js-packages/boost-score-api/package.json index fb9287a95aa1b..0bc11a54251e6 100644 --- a/projects/js-packages/boost-score-api/package.json +++ b/projects/js-packages/boost-score-api/package.json @@ -17,7 +17,8 @@ "build": "pnpm run clean && webpack", "clean": "rm -rf build/", "watch": "pnpm run build && pnpm webpack watch", - "test": "jest tests" + "test": "jest tests", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "dependencies": { "@wordpress/i18n": "5.9.0", diff --git a/projects/js-packages/components/changelog/restore-jp_test_coverage b/projects/js-packages/components/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/components/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/components/composer.json b/projects/js-packages/components/composer.json index 3e25abe1f9dae..153cea19fe232 100644 --- a/projects/js-packages/components/composer.json +++ b/projects/js-packages/components/composer.json @@ -15,6 +15,9 @@ ], "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json index 2add1cb76864c..205f07ce03b39 100644 --- a/projects/js-packages/components/package.json +++ b/projects/js-packages/components/package.json @@ -80,6 +80,7 @@ "scripts": { "build": "pnpm run compile-ts", "compile-ts": "tsc --pretty", - "test": "NODE_OPTIONS=--experimental-vm-modules jest" + "test": "NODE_OPTIONS=--experimental-vm-modules jest", + "test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR/js\" --coverage --coverageReporters=clover" } } diff --git a/projects/js-packages/config/changelog/restore-jp_test_coverage b/projects/js-packages/config/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/config/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/config/composer.json b/projects/js-packages/config/composer.json index ffddca72c9dfd..bc4000154002a 100644 --- a/projects/js-packages/config/composer.json +++ b/projects/js-packages/config/composer.json @@ -15,6 +15,9 @@ "scripts": { "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/config/package.json b/projects/js-packages/config/package.json index 2f89385ef4536..b2ce91f6e754f 100644 --- a/projects/js-packages/config/package.json +++ b/projects/js-packages/config/package.json @@ -14,7 +14,8 @@ "license": "GPL-2.0-or-later", "author": "Automattic", "scripts": { - "test": "jest" + "test": "jest", + "test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR/js\" --coverage --coverageReporters=clover" }, "devDependencies": { "jest": "29.7.0", diff --git a/projects/js-packages/connection/changelog/restore-jp_test_coverage b/projects/js-packages/connection/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/connection/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/connection/composer.json b/projects/js-packages/connection/composer.json index 4a5c69b588deb..f11c6354db7e9 100644 --- a/projects/js-packages/connection/composer.json +++ b/projects/js-packages/connection/composer.json @@ -9,6 +9,9 @@ "scripts": { "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/connection/package.json b/projects/js-packages/connection/package.json index 9e750c00c8f2f..7b7b28a5a4002 100644 --- a/projects/js-packages/connection/package.json +++ b/projects/js-packages/connection/package.json @@ -59,6 +59,7 @@ "*.scss" ], "scripts": { - "test": "NODE_OPTIONS=--experimental-vm-modules jest" + "test": "NODE_OPTIONS=--experimental-vm-modules jest", + "test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR/js\" --coverage --coverageReporters=clover" } } diff --git a/projects/js-packages/critical-css-gen/changelog/restore-jp_test_coverage b/projects/js-packages/critical-css-gen/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/critical-css-gen/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/critical-css-gen/composer.json b/projects/js-packages/critical-css-gen/composer.json index f67c0c977ae65..86e35d0984b2b 100644 --- a/projects/js-packages/critical-css-gen/composer.json +++ b/projects/js-packages/critical-css-gen/composer.json @@ -19,8 +19,11 @@ "build-production": [ "NODE_ENV=production pnpm run build" ], + "test-coverage": [ + "pnpm exec playwright install --with-deps chromium && pnpm run test-coverage" + ], "test-js": [ - "pnpm exec playwright install && pnpm run test" + "pnpm exec playwright install --with-deps chromium && pnpm run test" ] }, "repositories": [ diff --git a/projects/js-packages/critical-css-gen/package.json b/projects/js-packages/critical-css-gen/package.json index e167bcf795be2..996a4e1536087 100644 --- a/projects/js-packages/critical-css-gen/package.json +++ b/projects/js-packages/critical-css-gen/package.json @@ -19,7 +19,8 @@ "build:test": "pnpm run clean:test && webpack --config tests/data/webpack.config.cjs", "clean": "rm -rf build/", "clean:test": "rm -rf tests/build/", - "test": "pnpm build && pnpm build:test && NODE_ENV=test NODE_PATH=./node_modules jest --forceExit --config=tests/config/jest.config.js" + "test": "pnpm build && pnpm build:test && NODE_ENV=test NODE_PATH=./node_modules jest --forceExit --config=tests/config/jest.config.js", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "main": "./build/browser.js", "devDependencies": { diff --git a/projects/js-packages/eslint-changed/changelog/restore-jp_test_coverage b/projects/js-packages/eslint-changed/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/eslint-changed/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/eslint-changed/composer.json b/projects/js-packages/eslint-changed/composer.json index c4e9d133eccef..38a7adb1ca91c 100644 --- a/projects/js-packages/eslint-changed/composer.json +++ b/projects/js-packages/eslint-changed/composer.json @@ -7,6 +7,9 @@ "automattic/jetpack-changelogger": "@dev" }, "scripts": { + "test-coverage": [ + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ] diff --git a/projects/js-packages/eslint-changed/package.json b/projects/js-packages/eslint-changed/package.json index 6e82f1a00cd02..afb7db935cdee 100644 --- a/projects/js-packages/eslint-changed/package.json +++ b/projects/js-packages/eslint-changed/package.json @@ -18,7 +18,8 @@ "eslint-changed": "bin/eslint-changed.js" }, "scripts": { - "test": "NODE_OPTIONS=--experimental-vm-modules jest --config=tests/jest.config.cjs" + "test": "NODE_OPTIONS=--experimental-vm-modules jest --config=tests/jest.config.cjs", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "dependencies": { "chalk": "5.0.1", diff --git a/projects/js-packages/eslint-config-target-es/changelog/restore-jp_test_coverage b/projects/js-packages/eslint-config-target-es/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/eslint-config-target-es/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/eslint-config-target-es/composer.json b/projects/js-packages/eslint-config-target-es/composer.json index 338e96dad831d..f82794ffb44e4 100644 --- a/projects/js-packages/eslint-config-target-es/composer.json +++ b/projects/js-packages/eslint-config-target-es/composer.json @@ -9,6 +9,9 @@ "scripts": { "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/eslint-config-target-es/package.json b/projects/js-packages/eslint-config-target-es/package.json index d72c9716cf066..446fd8ef871d7 100644 --- a/projects/js-packages/eslint-config-target-es/package.json +++ b/projects/js-packages/eslint-config-target-es/package.json @@ -14,7 +14,8 @@ "license": "GPL-2.0-or-later", "author": "Automattic", "scripts": { - "test": "jest tests" + "test": "jest tests", + "test-coverage": "pnpm run test --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "dependencies": { "@mdn/browser-compat-data": "5.5.49", diff --git a/projects/js-packages/i18n-check-webpack-plugin/changelog/restore-jp_test_coverage b/projects/js-packages/i18n-check-webpack-plugin/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/i18n-check-webpack-plugin/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/i18n-check-webpack-plugin/composer.json b/projects/js-packages/i18n-check-webpack-plugin/composer.json index a489c758f0532..21315156faaaf 100644 --- a/projects/js-packages/i18n-check-webpack-plugin/composer.json +++ b/projects/js-packages/i18n-check-webpack-plugin/composer.json @@ -10,6 +10,9 @@ "scripts": { "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/i18n-check-webpack-plugin/package.json b/projects/js-packages/i18n-check-webpack-plugin/package.json index 38dc91c594c4a..09da7ea0218ce 100644 --- a/projects/js-packages/i18n-check-webpack-plugin/package.json +++ b/projects/js-packages/i18n-check-webpack-plugin/package.json @@ -14,7 +14,8 @@ "license": "GPL-2.0-or-later", "author": "Automattic", "scripts": { - "test": "jest tests/" + "test": "jest tests/", + "test-coverage": "pnpm run test --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "dependencies": { "debug": "^4.3.2" diff --git a/projects/js-packages/i18n-loader-webpack-plugin/changelog/restore-jp_test_coverage b/projects/js-packages/i18n-loader-webpack-plugin/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/i18n-loader-webpack-plugin/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/i18n-loader-webpack-plugin/composer.json b/projects/js-packages/i18n-loader-webpack-plugin/composer.json index 866bfad39a9bc..8081ad755abcd 100644 --- a/projects/js-packages/i18n-loader-webpack-plugin/composer.json +++ b/projects/js-packages/i18n-loader-webpack-plugin/composer.json @@ -10,6 +10,9 @@ "scripts": { "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/i18n-loader-webpack-plugin/package.json b/projects/js-packages/i18n-loader-webpack-plugin/package.json index 64e294c7a0e8e..a84d3838e4a8d 100644 --- a/projects/js-packages/i18n-loader-webpack-plugin/package.json +++ b/projects/js-packages/i18n-loader-webpack-plugin/package.json @@ -14,7 +14,8 @@ "license": "GPL-2.0-or-later", "author": "Automattic", "scripts": { - "test": "jest tests" + "test": "jest tests", + "test-coverage": "pnpm run test --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "dependencies": { "debug": "^4.3.2" diff --git a/projects/js-packages/image-guide/changelog/restore-jp_test_coverage b/projects/js-packages/image-guide/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/image-guide/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/image-guide/composer.json b/projects/js-packages/image-guide/composer.json index a8736b1eaa47d..41453f1697a97 100644 --- a/projects/js-packages/image-guide/composer.json +++ b/projects/js-packages/image-guide/composer.json @@ -26,6 +26,9 @@ ], "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/image-guide/package.json b/projects/js-packages/image-guide/package.json index 53120824dee13..73b31f5427f18 100644 --- a/projects/js-packages/image-guide/package.json +++ b/projects/js-packages/image-guide/package.json @@ -26,6 +26,7 @@ "reformat-files": "../../../tools/js-tools/node_modules/.bin/prettier --ignore-path .eslintignore --write --plugin-search-dir=. ./**/*.{svelte,js,ts,json}", "lint": "pnpm run reformat-files && echo 'Running eslint...' && pnpm eslint app/assets/src/js tests/e2e --fix && echo '✔ prettier and eslint ran successfully.'", "clear-dist": "rm -rf app/assets/dist/*", + "test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR/js\" --coverage --coverageReporters=clover", "test": "NODE_OPTIONS=--experimental-vm-modules jest" }, "browser": { diff --git a/projects/js-packages/licensing/changelog/restore-jp_test_coverage b/projects/js-packages/licensing/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/licensing/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/licensing/composer.json b/projects/js-packages/licensing/composer.json index 7c4dee7366c82..f3fb3ca272304 100644 --- a/projects/js-packages/licensing/composer.json +++ b/projects/js-packages/licensing/composer.json @@ -11,6 +11,9 @@ "scripts": { "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/licensing/package.json b/projects/js-packages/licensing/package.json index 1dc94d49de484..e5051e19fc004 100644 --- a/projects/js-packages/licensing/package.json +++ b/projects/js-packages/licensing/package.json @@ -16,7 +16,8 @@ "author": "Automattic", "type": "module", "scripts": { - "test": "jest" + "test": "jest", + "test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR/js\" --coverage --coverageReporters=clover" }, "dependencies": { "@automattic/jetpack-analytics": "workspace:*", diff --git a/projects/js-packages/partner-coupon/changelog/restore-jp_test_coverage b/projects/js-packages/partner-coupon/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/partner-coupon/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/partner-coupon/composer.json b/projects/js-packages/partner-coupon/composer.json index 1ba90ae6938d5..d49fbe843db33 100644 --- a/projects/js-packages/partner-coupon/composer.json +++ b/projects/js-packages/partner-coupon/composer.json @@ -11,6 +11,9 @@ "test-js": [ "pnpm run test" ], + "test-coverage": [ + "pnpm run test-coverage" + ], "watch": [ "Composer\\Config::disableProcessTimeout", "pnpm run watch" diff --git a/projects/js-packages/partner-coupon/package.json b/projects/js-packages/partner-coupon/package.json index e940ad6672592..13aa6ff1e9b6d 100644 --- a/projects/js-packages/partner-coupon/package.json +++ b/projects/js-packages/partner-coupon/package.json @@ -16,7 +16,8 @@ "author": "Automattic", "type": "module", "scripts": { - "test": "NODE_OPTIONS=--experimental-vm-modules jest" + "test": "NODE_OPTIONS=--experimental-vm-modules jest", + "test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR/js\" --coverage --coverageReporters=clover" }, "devDependencies": { "@automattic/jetpack-analytics": "workspace:*", diff --git a/projects/js-packages/publicize-components/changelog/restore-jp_test_coverage b/projects/js-packages/publicize-components/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/publicize-components/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/publicize-components/composer.json b/projects/js-packages/publicize-components/composer.json index 3e31ce5907f6e..302951a8e144b 100644 --- a/projects/js-packages/publicize-components/composer.json +++ b/projects/js-packages/publicize-components/composer.json @@ -16,6 +16,9 @@ "scripts": { "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/publicize-components/package.json b/projects/js-packages/publicize-components/package.json index 9ecb4c5633c96..bd96fddc4467d 100644 --- a/projects/js-packages/publicize-components/package.json +++ b/projects/js-packages/publicize-components/package.json @@ -15,7 +15,8 @@ "license": "GPL-2.0-or-later", "author": "Automattic", "scripts": { - "test": "jest" + "test": "jest", + "test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR/js\" --coverage --coverageReporters=clover" }, "dependencies": { "@automattic/jetpack-analytics": "workspace:*", diff --git a/projects/js-packages/react-data-sync-client/changelog/restore-jp_test_coverage b/projects/js-packages/react-data-sync-client/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/react-data-sync-client/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/react-data-sync-client/composer.json b/projects/js-packages/react-data-sync-client/composer.json index 042fd443b4d7e..d697b6a5e8b41 100644 --- a/projects/js-packages/react-data-sync-client/composer.json +++ b/projects/js-packages/react-data-sync-client/composer.json @@ -24,6 +24,9 @@ "Composer\\Config::disableProcessTimeout", "pnpm run watch" ], + "test-coverage": [ + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ] diff --git a/projects/js-packages/react-data-sync-client/package.json b/projects/js-packages/react-data-sync-client/package.json index f3f919242a6a8..38d576f6c0e2f 100644 --- a/projects/js-packages/react-data-sync-client/package.json +++ b/projects/js-packages/react-data-sync-client/package.json @@ -20,7 +20,8 @@ "watch": "pnpm run build && pnpm webpack watch", "reformat-files": "../../../tools/js-tools/node_modules/.bin/prettier --ignore-path .eslintignore --write --plugin-search-dir=. ./src/**/*.ts", "lint": "pnpm run reformat-files && echo 'Running eslint...' && pnpm eslint src --fix && echo '✔ prettier and eslint ran successfully.'", - "test": "NODE_OPTIONS=--experimental-vm-modules jest" + "test": "NODE_OPTIONS=--experimental-vm-modules jest", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "devDependencies": { "@automattic/jetpack-webpack-config": "workspace:*", diff --git a/projects/js-packages/remove-asset-webpack-plugin/changelog/restore-jp_test_coverage b/projects/js-packages/remove-asset-webpack-plugin/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/remove-asset-webpack-plugin/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/remove-asset-webpack-plugin/composer.json b/projects/js-packages/remove-asset-webpack-plugin/composer.json index 0c0464cdf13e3..77b9d27e2cddb 100644 --- a/projects/js-packages/remove-asset-webpack-plugin/composer.json +++ b/projects/js-packages/remove-asset-webpack-plugin/composer.json @@ -10,6 +10,9 @@ "scripts": { "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/remove-asset-webpack-plugin/package.json b/projects/js-packages/remove-asset-webpack-plugin/package.json index 3c71315e9275d..3d23d7297338e 100644 --- a/projects/js-packages/remove-asset-webpack-plugin/package.json +++ b/projects/js-packages/remove-asset-webpack-plugin/package.json @@ -14,7 +14,8 @@ "license": "GPL-2.0-or-later", "author": "Automattic", "scripts": { - "test": "jest tests" + "test": "jest tests", + "test-coverage": "pnpm run test --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "dependencies": { "debug": "^4.3.2" diff --git a/projects/js-packages/scan/changelog/restore-jp_test_coverage b/projects/js-packages/scan/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/scan/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/scan/composer.json b/projects/js-packages/scan/composer.json index ba756697b6ef5..bc7dfa2e8339e 100644 --- a/projects/js-packages/scan/composer.json +++ b/projects/js-packages/scan/composer.json @@ -24,6 +24,7 @@ "Composer\\Config::disableProcessTimeout", "pnpm run watch" ], + "test-coverage": "pnpm run test-coverage", "test-js": [ "pnpm run test" ] diff --git a/projects/js-packages/scan/package.json b/projects/js-packages/scan/package.json index 480b5a2e424e6..c1bc474f5fee4 100644 --- a/projects/js-packages/scan/package.json +++ b/projects/js-packages/scan/package.json @@ -18,7 +18,8 @@ "build": "pnpm run clean && pnpm run compile-ts", "clean": "rm -rf build/", "compile-ts": "tsc --pretty", - "test": "jest" + "test": "jest", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "type": "module", "devDependencies": { diff --git a/projects/js-packages/shared-extension-utils/changelog/restore-jp_test_coverage b/projects/js-packages/shared-extension-utils/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/shared-extension-utils/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/shared-extension-utils/composer.json b/projects/js-packages/shared-extension-utils/composer.json index b5edd782e8f9a..c519d1596e0c7 100644 --- a/projects/js-packages/shared-extension-utils/composer.json +++ b/projects/js-packages/shared-extension-utils/composer.json @@ -9,6 +9,9 @@ "automattic/jetpack-changelogger": "@dev" }, "scripts": { + "test-coverage": [ + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ] diff --git a/projects/js-packages/shared-extension-utils/package.json b/projects/js-packages/shared-extension-utils/package.json index 25a832f9b09fa..ac9c4637db805 100644 --- a/projects/js-packages/shared-extension-utils/package.json +++ b/projects/js-packages/shared-extension-utils/package.json @@ -14,7 +14,8 @@ "license": "GPL-2.0-or-later", "author": "Automattic", "scripts": { - "test": "jest" + "test": "jest", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "dependencies": { "@automattic/jetpack-analytics": "workspace:*", diff --git a/projects/js-packages/svelte-data-sync-client/changelog/restore-jp_test_coverage b/projects/js-packages/svelte-data-sync-client/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/svelte-data-sync-client/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/svelte-data-sync-client/composer.json b/projects/js-packages/svelte-data-sync-client/composer.json index 6f5acc91c2443..f91ab9f434170 100644 --- a/projects/js-packages/svelte-data-sync-client/composer.json +++ b/projects/js-packages/svelte-data-sync-client/composer.json @@ -26,6 +26,9 @@ ], "test-js": [ "pnpm run test" + ], + "test-coverage": [ + "pnpm run test-coverage" ] }, "repositories": [ diff --git a/projects/js-packages/svelte-data-sync-client/package.json b/projects/js-packages/svelte-data-sync-client/package.json index 2f9d27cf28c85..bfd185a8fd3dc 100644 --- a/projects/js-packages/svelte-data-sync-client/package.json +++ b/projects/js-packages/svelte-data-sync-client/package.json @@ -21,6 +21,7 @@ "watch": "pnpm run build && pnpm webpack watch", "reformat-files": "../../../tools/js-tools/node_modules/.bin/prettier --ignore-path .eslintignore --write --plugin-search-dir=. ./src/**/*.ts", "lint": "pnpm run reformat-files && echo 'Running eslint...' && pnpm eslint src --fix && echo '✔ prettier and eslint ran successfully.'", + "test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR/js\" --coverage --coverageReporters=clover", "test": "NODE_OPTIONS=--experimental-vm-modules jest" }, "devDependencies": { diff --git a/projects/js-packages/videopress-core/changelog/restore-jp_test_coverage b/projects/js-packages/videopress-core/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/js-packages/videopress-core/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/js-packages/videopress-core/composer.json b/projects/js-packages/videopress-core/composer.json index 5d6c38e379d32..084d6b72afaf4 100644 --- a/projects/js-packages/videopress-core/composer.json +++ b/projects/js-packages/videopress-core/composer.json @@ -25,6 +25,9 @@ "Composer\\Config::disableProcessTimeout", "pnpm run watch" ], + "test-coverage": [ + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ] diff --git a/projects/js-packages/videopress-core/package.json b/projects/js-packages/videopress-core/package.json index 90aeb4fbdb9a4..f2a3c0abb4624 100644 --- a/projects/js-packages/videopress-core/package.json +++ b/projects/js-packages/videopress-core/package.json @@ -19,7 +19,8 @@ "watch": "pnpm run build && pnpm webpack watch", "reformat-files": "../../../tools/js-tools/node_modules/.bin/prettier --ignore-path .eslintignore --write --plugin-search-dir=. ./src/**/*.ts", "lint": "pnpm run reformat-files && echo 'Running eslint...' && pnpm eslint src --fix && echo '✔ prettier and eslint ran successfully.'", - "test": "NODE_OPTIONS=--experimental-vm-modules jest tests" + "test": "NODE_OPTIONS=--experimental-vm-modules jest tests", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "devDependencies": { "jest": "*", diff --git a/projects/packages/a8c-mc-stats/changelog/restore-jp_test_coverage b/projects/packages/a8c-mc-stats/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/a8c-mc-stats/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/a8c-mc-stats/composer.json b/projects/packages/a8c-mc-stats/composer.json index 254e7e80a8558..f3ba6f7042ee1 100644 --- a/projects/packages/a8c-mc-stats/composer.json +++ b/projects/packages/a8c-mc-stats/composer.json @@ -22,6 +22,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/admin-ui/changelog/restore-jp_test_coverage b/projects/packages/admin-ui/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/admin-ui/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/admin-ui/composer.json b/projects/packages/admin-ui/composer.json index b3eec38c9cea0..06ff415219bab 100644 --- a/projects/packages/admin-ui/composer.json +++ b/projects/packages/admin-ui/composer.json @@ -24,6 +24,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/assets/changelog/restore-jp_test_coverage b/projects/packages/assets/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/assets/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/assets/composer.json b/projects/packages/assets/composer.json index 623e950b35ad2..9eb125747ffab 100644 --- a/projects/packages/assets/composer.json +++ b/projects/packages/assets/composer.json @@ -34,6 +34,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], diff --git a/projects/packages/assets/package.json b/projects/packages/assets/package.json index 12761cde86b09..fbd6a5a380781 100644 --- a/projects/packages/assets/package.json +++ b/projects/packages/assets/package.json @@ -8,6 +8,7 @@ "build-production-js": "NODE_ENV=production BABEL_ENV=production pnpm run build-js", "clean": "rm -rf build", "test": "jest tests", + "test-coverage": "pnpm run test --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "validate": "pnpm exec validate-es build/" }, "dependencies": { diff --git a/projects/packages/autoloader/changelog/restore-jp_test_coverage b/projects/packages/autoloader/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/autoloader/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/autoloader/composer.json b/projects/packages/autoloader/composer.json index 57c3dc61cdfde..ce721da858d46 100644 --- a/projects/packages/autoloader/composer.json +++ b/projects/packages/autoloader/composer.json @@ -32,6 +32,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/autoloader/tests/php/bin/test-coverage.php b/projects/packages/autoloader/tests/php/bin/test-coverage.php new file mode 100644 index 0000000000000..965da40039519 --- /dev/null +++ b/projects/packages/autoloader/tests/php/bin/test-coverage.php @@ -0,0 +1,246 @@ + 0 ) { + return $newlines + 1; + } + + return null; +} + +/** + * Creates a map for converting file paths to src paths. + * + * @param string[] $report_file_paths An array containing all of the paths for the report. + * @return array A map describing how to transform built files into src coverage. + */ +function get_path_transformation_map( $report_file_paths ) { + // We're going to create a map describing how to transform files to src files. + // We're also going to store any metadata needed to perform the merge safetly. + $transformation_map = array(); + + // Scan the src directory so that we can create the map to convert between files. + $raw_src_files = scandir( ROOT_DIR . DIRECTORY_SEPARATOR . 'src' ); + $src_file_map = array(); + foreach ( $raw_src_files as $file ) { + // Only PHP files will be copied. + if ( substr( $file, -4 ) !== '.php' ) { + continue; + } + + $file = ROOT_DIR . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . $file; + if ( ! file_exists( $file ) ) { + continue; + } + + // We need to use the class keyword to address the line offset from injecting the header. + $class_line = count_lines_before_class_keyword( $file ); + if ( null === $class_line ) { + // The autoloader only has class files and so this is fine. + continue; + } + + $src_file_map[ $file ] = array( + 'file' => $file, + 'class_line' => $class_line, + ); + } + + // Create a map describing the file transformations. + foreach ( $report_file_paths as $report_file_path ) { + // We will use the class line from the report file to calculate the offset from the src file to apply to coverage lines. + $class_line = count_lines_before_class_keyword( $report_file_path ); + if ( ! isset( $class_line ) ) { + continue; + } + + // Attempt to find the original file. + // Note: This does not support nested directories! + $src_file_path = null; + foreach ( $src_file_map as $src_file ) { + // We don't need to perform any transformations if the file path is the same. + if ( $src_file['file'] === $report_file_path ) { + continue; + } + + if ( basename( $src_file['file'] ) === basename( $report_file_path ) ) { + $src_file_path = $src_file['file']; + break; + } + } + if ( ! $src_file_path ) { + continue; + } + + // We can finally calculate the line offset since we have the class line for both. + $line_offset = $class_line - $src_file_map[ $src_file_path ]['class_line']; + + // Record the file in the transformation map. + $transformation_map[ $report_file_path ] = array( + 'src' => $src_file_path, + 'line_offset' => $line_offset, + ); + } + + return $transformation_map; +} + +/** + * Processes a v9 CodeCoverage report. + * + * @param SebastianBergmann\CodeCoverage\CodeCoverage $report The report to process. + * @return SebastianBergmann\CodeCoverage\CodeCoverage The processed report. + * + * @phan-suppress PhanAccessMethodInternal -- There's not really a way to avoid this. + */ +function process_coverage_9( $report ) { + $data = $report->getData( true ); + $classname = get_class( $data ); + + // We're going to merge the line coverage from compiled files into the src files. + $line_coverage = $data->lineCoverage(); + $transformations = get_path_transformation_map( array_keys( $line_coverage ) ); + + $removed_files = array(); + foreach ( $line_coverage as $file => $lines ) { + if ( ! isset( $transformations[ $file ] ) ) { + continue; + } + + // Prepare the transformations we are going to make. + $src_file = $transformations[ $file ]['src']; + $line_offset = $transformations[ $file ]['line_offset']; + + // Create a new line coverage mapped to the src file. + $new_coverage = array(); + foreach ( $lines as $line => $coverage ) { + $new_coverage[ $src_file ][ $line - $line_offset ] = $coverage; + } + + // Merge the coverage since multiple compiled files may map to a single src file. + $merge = new $classname(); + $merge->setLineCoverage( $new_coverage ); + $data->merge( $merge ); + + // Mark the file for removal from the original coverage. + $removed_files[] = $file; + } + + // Remove all of the files that we've transformed from the coverage. + $line_coverage = $data->lineCoverage(); + foreach ( $removed_files as $file ) { + // Make sure the uncovered file does not show up in the report. + $report->filter()->excludeFile( $file ); + unset( $line_coverage[ $file ] ); + } + $data->setLineCoverage( $line_coverage ); + + return $report; +} + +/** + * Processes the code coverage report and outputs a clover.xml file. + */ +function process_coverage() { + echo "Aggregating compiled coverage into unified code coverage report\n"; + + // We're going to transform the code coverage object into a Clover XML report. + $output_file = get_output_file(); + + // Since there is no backwards compatibility guarantee in place for the code coverage + // object we need to handle it according to each major version independently. + $coverage_version = get_coverage_version(); + $major_version = substr( $coverage_version, 0, strpos( $coverage_version, '.' ) ); + + $function = 'process_coverage_' . $major_version; + if ( ! function_exists( $function ) ) { + echo "No handler defined for major version $major_version\n"; + die( -1 ); + } + + // We can finally load the report that we're wanting to process. + $report = load_report(); + + // Process the report using the handler. + $report = call_user_func( $function, $report ); + + // Generate the XML file for the report. + $clover = new Clover(); + $clover->process( $report, $output_file ); + echo "Generated code coverage report in Clover format\n"; +} + +// Process the coverage report into the new output. +process_coverage(); diff --git a/projects/packages/backup-helper-script-manager/changelog/restore-jp_test_coverage b/projects/packages/backup-helper-script-manager/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/backup-helper-script-manager/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/backup-helper-script-manager/composer.json b/projects/packages/backup-helper-script-manager/composer.json index d608b1a7651ba..61180ade798c5 100644 --- a/projects/packages/backup-helper-script-manager/composer.json +++ b/projects/packages/backup-helper-script-manager/composer.json @@ -23,6 +23,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/backup/changelog/restore-jp_test_coverage b/projects/packages/backup/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/backup/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/backup/composer.json b/projects/packages/backup/composer.json index 0fdc0b5761151..f0e710e1b426c 100644 --- a/projects/packages/backup/composer.json +++ b/projects/packages/backup/composer.json @@ -36,6 +36,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], diff --git a/projects/packages/backup/package.json b/projects/packages/backup/package.json index f3b324fbe0329..d257c1d6456ee 100644 --- a/projects/packages/backup/package.json +++ b/projects/packages/backup/package.json @@ -19,6 +19,7 @@ "build-production-concurrently": "pnpm run clean && concurrently 'NODE_ENV=production BABEL_ENV=production pnpm run build-client' && pnpm run validate", "clean": "rm -rf build/", "test": "jest --config=tests/jest.config.js", + "test-coverage": "pnpm run test --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "validate": "pnpm exec validate-es build/", "watch": "pnpm run build && webpack watch" }, diff --git a/projects/packages/blaze/changelog/restore-jp_test_coverage b/projects/packages/blaze/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/blaze/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/blaze/composer.json b/projects/packages/blaze/composer.json index 1d697a5efcedb..428242f59e314 100644 --- a/projects/packages/blaze/composer.json +++ b/projects/packages/blaze/composer.json @@ -30,6 +30,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/blocks/changelog/restore-jp_test_coverage b/projects/packages/blocks/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/blocks/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/blocks/composer.json b/projects/packages/blocks/composer.json index f3855aa843aee..64490d8a27081 100644 --- a/projects/packages/blocks/composer.json +++ b/projects/packages/blocks/composer.json @@ -27,6 +27,9 @@ ], "post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy", "post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy", + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/boost-core/changelog/restore-jp_test_coverage b/projects/packages/boost-core/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/boost-core/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/boost-core/composer.json b/projects/packages/boost-core/composer.json index 01e1e32fb174e..923b126f894f4 100644 --- a/projects/packages/boost-core/composer.json +++ b/projects/packages/boost-core/composer.json @@ -21,6 +21,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/boost-speed-score/changelog/restore-jp_test_coverage b/projects/packages/boost-speed-score/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/boost-speed-score/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/boost-speed-score/composer.json b/projects/packages/boost-speed-score/composer.json index a8faac31ad742..751070615c646 100644 --- a/projects/packages/boost-speed-score/composer.json +++ b/projects/packages/boost-speed-score/composer.json @@ -26,6 +26,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/calypsoify/changelog/restore-jp_test_coverage b/projects/packages/calypsoify/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/calypsoify/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/calypsoify/composer.json b/projects/packages/calypsoify/composer.json index 7c9a514cfb6ec..d6888ee310628 100644 --- a/projects/packages/calypsoify/composer.json +++ b/projects/packages/calypsoify/composer.json @@ -27,6 +27,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/changelogger/changelog/restore-jp_test_coverage b/projects/packages/changelogger/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/changelogger/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/changelogger/composer.json b/projects/packages/changelogger/composer.json index 60b48784d76e9..295c19ff8c42e 100644 --- a/projects/packages/changelogger/composer.json +++ b/projects/packages/changelogger/composer.json @@ -37,6 +37,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/chatbot/changelog/restore-jp_test_coverage b/projects/packages/chatbot/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/chatbot/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/chatbot/composer.json b/projects/packages/chatbot/composer.json index 064222eefdb78..c667e8ac3b9de 100644 --- a/projects/packages/chatbot/composer.json +++ b/projects/packages/chatbot/composer.json @@ -20,6 +20,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/classic-theme-helper/changelog/restore-jp_test_coverage b/projects/packages/classic-theme-helper/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/classic-theme-helper/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/classic-theme-helper/composer.json b/projects/packages/classic-theme-helper/composer.json index 7d515774f0437..f2d4cee03d77d 100644 --- a/projects/packages/classic-theme-helper/composer.json +++ b/projects/packages/classic-theme-helper/composer.json @@ -29,6 +29,9 @@ ], "post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy", "post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy", + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/codesniffer/changelog/restore-jp_test_coverage b/projects/packages/codesniffer/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/codesniffer/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/codesniffer/composer.json b/projects/packages/codesniffer/composer.json index 3f29498eb890f..3f2eee4b96a43 100644 --- a/projects/packages/codesniffer/composer.json +++ b/projects/packages/codesniffer/composer.json @@ -36,6 +36,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/composer-plugin/changelog/restore-jp_test_coverage b/projects/packages/composer-plugin/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/composer-plugin/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/composer-plugin/composer.json b/projects/packages/composer-plugin/composer.json index e48691bc35d62..bc503d1cef1b5 100644 --- a/projects/packages/composer-plugin/composer.json +++ b/projects/packages/composer-plugin/composer.json @@ -27,6 +27,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/connection/changelog/restore-jp_test_coverage b/projects/packages/connection/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/connection/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/connection/composer.json b/projects/packages/connection/composer.json index b964a98bf81c6..5367437354d03 100644 --- a/projects/packages/connection/composer.json +++ b/projects/packages/connection/composer.json @@ -47,6 +47,9 @@ ], "post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy", "post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy", + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/constants/changelog/restore-jp_test_coverage b/projects/packages/constants/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/constants/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/constants/composer.json b/projects/packages/constants/composer.json index cbecbea33bf72..5de3201e8f367 100644 --- a/projects/packages/constants/composer.json +++ b/projects/packages/constants/composer.json @@ -23,6 +23,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/device-detection/changelog/restore-jp_test_coverage b/projects/packages/device-detection/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/device-detection/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/device-detection/composer.json b/projects/packages/device-detection/composer.json index 62b748a0af24b..89ce7322fea03 100644 --- a/projects/packages/device-detection/composer.json +++ b/projects/packages/device-detection/composer.json @@ -22,6 +22,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/error/changelog/restore-jp_test_coverage b/projects/packages/error/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/error/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/error/composer.json b/projects/packages/error/composer.json index 289b152af21c0..89510f6118623 100644 --- a/projects/packages/error/composer.json +++ b/projects/packages/error/composer.json @@ -22,6 +22,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/explat/changelog/restore-jp_test_coverage b/projects/packages/explat/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/explat/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/explat/composer.json b/projects/packages/explat/composer.json index eff79eadfba11..002e474eb42ca 100644 --- a/projects/packages/explat/composer.json +++ b/projects/packages/explat/composer.json @@ -20,11 +20,15 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], "test-js": [ - "echo 'Run `pnpm run test` when ready'" + "pnpm run test" ], "test-js-watch": [ "Composer\\Config::disableProcessTimeout", diff --git a/projects/packages/explat/package.json b/projects/packages/explat/package.json index 104d02f4be75f..19a4f3b66d5e3 100644 --- a/projects/packages/explat/package.json +++ b/projects/packages/explat/package.json @@ -18,7 +18,8 @@ "build": "pnpm run clean && pnpm run compile", "compile": "webpack", "clean": "rm -rf build/", - "test": "jest tests/client", + "test": "jest tests/client --passWithNoTests", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "watch": "pnpm run build --watch" }, "devDependencies": { diff --git a/projects/packages/forms/changelog/restore-jp_test_coverage b/projects/packages/forms/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/forms/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/forms/composer.json b/projects/packages/forms/composer.json index f24de1757c8e1..ffc419a68ff56 100644 --- a/projects/packages/forms/composer.json +++ b/projects/packages/forms/composer.json @@ -30,6 +30,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/forms/package.json b/projects/packages/forms/package.json index 2e24fcae891eb..61fa012fb03ed 100644 --- a/projects/packages/forms/package.json +++ b/projects/packages/forms/package.json @@ -21,8 +21,9 @@ "build:contact-form": "webpack --config ./tools/webpack.config.contact-form.js", "build:dashboard": "webpack --config ./tools/webpack.config.dashboard.js", "clean": "rm -rf dist/ .cache/", - "test": "jest", + "test": "jest --config=tests/jest.config.js", "test:contact-form": "jest --testPathPattern=tests/js/contact-form", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "validate": "pnpm exec validate-es --no-error-on-unmatched-pattern dist/", "watch": "concurrently 'pnpm:build:blocks --watch' 'pnpm:build:contact-form --watch' 'pnpm:build:dashboard --watch'" }, diff --git a/projects/packages/forms/tests/jest.config.js b/projects/packages/forms/tests/jest.config.js new file mode 100644 index 0000000000000..7406c6b2bb079 --- /dev/null +++ b/projects/packages/forms/tests/jest.config.js @@ -0,0 +1,8 @@ +const path = require( 'path' ); +const baseConfig = require( 'jetpack-js-tools/jest/config.base.js' ); + +module.exports = { + ...baseConfig, + rootDir: path.join( __dirname, '..' ), + setupFilesAfterEnv: [ ...baseConfig.setupFilesAfterEnv, '/tests/jest.setup.js' ], +}; diff --git a/projects/packages/forms/tests/jest.setup.js b/projects/packages/forms/tests/jest.setup.js new file mode 100644 index 0000000000000..04d70fb00b062 --- /dev/null +++ b/projects/packages/forms/tests/jest.setup.js @@ -0,0 +1,7 @@ +window.JP_CONNECTION_INITIAL_STATE = { + userConnectionData: { + currentUser: { + wpcomUser: { Id: 99999, login: 'bobsacrmaneto', display_name: 'Bob Sacrmaneto' }, + }, + }, +}; diff --git a/projects/packages/google-analytics/changelog/restore-jp_test_coverage b/projects/packages/google-analytics/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/google-analytics/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/google-analytics/composer.json b/projects/packages/google-analytics/composer.json index c66cd4d920a6f..89e32ebdb07e9 100644 --- a/projects/packages/google-analytics/composer.json +++ b/projects/packages/google-analytics/composer.json @@ -23,6 +23,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/ignorefile/changelog/restore-jp_test_coverage b/projects/packages/ignorefile/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/ignorefile/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/ignorefile/composer.json b/projects/packages/ignorefile/composer.json index 4c2679bd44e99..e441ba5058e95 100644 --- a/projects/packages/ignorefile/composer.json +++ b/projects/packages/ignorefile/composer.json @@ -19,6 +19,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/image-cdn/changelog/restore-jp_test_coverage b/projects/packages/image-cdn/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/image-cdn/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/image-cdn/composer.json b/projects/packages/image-cdn/composer.json index 2244c8427e33e..b31ec1dbd46a0 100644 --- a/projects/packages/image-cdn/composer.json +++ b/projects/packages/image-cdn/composer.json @@ -25,6 +25,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/import/changelog/restore-jp_test_coverage b/projects/packages/import/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/import/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/import/composer.json b/projects/packages/import/composer.json index 78114bfb80b81..4e54474c785b6 100644 --- a/projects/packages/import/composer.json +++ b/projects/packages/import/composer.json @@ -25,6 +25,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/ip/changelog/restore-jp_test_coverage b/projects/packages/ip/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/ip/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/ip/composer.json b/projects/packages/ip/composer.json index 13e61cfe47ceb..9d46c8b69e1e1 100644 --- a/projects/packages/ip/composer.json +++ b/projects/packages/ip/composer.json @@ -23,6 +23,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/jetpack-mu-wpcom/changelog/restore-jp_test_coverage b/projects/packages/jetpack-mu-wpcom/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/jetpack-mu-wpcom/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/jetpack-mu-wpcom/composer.json b/projects/packages/jetpack-mu-wpcom/composer.json index 147b27e890193..e7babbe5c3e47 100644 --- a/projects/packages/jetpack-mu-wpcom/composer.json +++ b/projects/packages/jetpack-mu-wpcom/composer.json @@ -36,6 +36,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/jitm/changelog/restore-jp_test_coverage b/projects/packages/jitm/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/jitm/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/jitm/composer.json b/projects/packages/jitm/composer.json index 9930839451dd2..3b981881ffd5e 100644 --- a/projects/packages/jitm/composer.json +++ b/projects/packages/jitm/composer.json @@ -45,6 +45,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/licensing/changelog/restore-jp_test_coverage b/projects/packages/licensing/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/licensing/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/licensing/composer.json b/projects/packages/licensing/composer.json index ca6ff1ed34f50..c95029d571c8a 100644 --- a/projects/packages/licensing/composer.json +++ b/projects/packages/licensing/composer.json @@ -26,6 +26,9 @@ ], "post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy", "post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy", + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/logo/changelog/restore-jp_test_coverage b/projects/packages/logo/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/logo/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/logo/composer.json b/projects/packages/logo/composer.json index e68d8db3227a2..944c5a3663d58 100644 --- a/projects/packages/logo/composer.json +++ b/projects/packages/logo/composer.json @@ -22,6 +22,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/masterbar/changelog/restore-jp_test_coverage b/projects/packages/masterbar/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/masterbar/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/masterbar/composer.json b/projects/packages/masterbar/composer.json index 438afea345ba7..47dbb853804ba 100644 --- a/projects/packages/masterbar/composer.json +++ b/projects/packages/masterbar/composer.json @@ -39,6 +39,10 @@ ], "post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy", "post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy", + "test-coverage": [ + "pnpm run build-production", + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "pnpm run build-production", "@composer phpunit" diff --git a/projects/packages/masterbar/tests/php/test-class-admin-menu.php b/projects/packages/masterbar/tests/php/test-class-admin-menu.php index 72652f0f6ea9b..a4b9049f50dad 100644 --- a/projects/packages/masterbar/tests/php/test-class-admin-menu.php +++ b/projects/packages/masterbar/tests/php/test-class-admin-menu.php @@ -99,7 +99,7 @@ public function tear_down() { /** * Test_Admin_Menu. * - * @covers ::reregister_menu_items + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::reregister_menu_items */ public function test_admin_menu_output() { global $menu, $submenu; @@ -114,7 +114,7 @@ public function test_admin_menu_output() { /** * Tests get_preferred_view * - * @covers ::get_preferred_view + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::get_preferred_view */ public function test_get_preferred_view() { static::$admin_menu->set_preferred_view( 'users.php', 'unknown' ); @@ -126,7 +126,7 @@ public function test_get_preferred_view() { /** * Tests add_my_home_menu * - * @covers ::add_my_home_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_my_home_menu */ public function test_add_my_home_menu() { global $menu, $submenu; @@ -154,7 +154,7 @@ public function test_add_my_home_menu() { /** * Tests add_stats_menu * - * @covers ::add_stats_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_stats_menu */ public function test_add_stats_menu() { global $menu; @@ -173,7 +173,7 @@ public function test_add_stats_menu() { /** * Tests add_upgrades_menu * - * @covers ::add_upgrades_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_upgrades_menu */ public function test_add_upgrades_menu() { global $submenu; @@ -187,7 +187,7 @@ public function test_add_upgrades_menu() { /** * Tests add_posts_menu * - * @covers ::add_posts_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_posts_menu */ public function test_add_posts_menu() { global $submenu; @@ -200,7 +200,7 @@ public function test_add_posts_menu() { /** * Tests add_media_menu * - * @covers ::add_media_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_media_menu */ public function test_add_media_menu() { global $menu, $submenu; @@ -214,7 +214,7 @@ public function test_add_media_menu() { /** * Tests add_page_menu * - * @covers ::add_page_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_page_menu */ public function test_add_page_menu() { global $submenu; @@ -227,7 +227,7 @@ public function test_add_page_menu() { /** * Tests add_custom_post_type_menu * - * @covers ::add_custom_post_type_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_custom_post_type_menu */ public function test_add_custom_post_type_menu() { global $menu, $submenu; @@ -258,7 +258,7 @@ public function test_add_custom_post_type_menu() { /** * Tests add_comments_menu * - * @covers ::add_comments_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_comments_menu */ public function test_add_comments_menu() { global $menu, $submenu; @@ -272,7 +272,7 @@ public function test_add_comments_menu() { /** * Tests add_appearance_menu * - * @covers ::add_appearance_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_appearance_menu */ public function test_add_appearance_menu() { global $submenu; @@ -285,7 +285,7 @@ public function test_add_appearance_menu() { /** * Tests add_plugins_menu * - * @covers ::add_plugins_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_plugins_menu */ public function test_add_plugins_menu() { global $menu, $submenu; @@ -299,7 +299,7 @@ public function test_add_plugins_menu() { /** * Tests add_users_menu * - * @covers ::add_users_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_users_menu */ public function test_add_users_menu() { global $menu, $submenu; @@ -361,7 +361,7 @@ public function test_add_users_menu() { /** * Tests add_tools_menu * - * @covers ::add_tools_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_tools_menu */ public function test_add_tools_menu() { global $submenu; @@ -377,7 +377,7 @@ public function test_add_tools_menu() { /** * Tests add_options_menu * - * @covers ::add_options_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_options_menu */ public function test_add_options_menu() { global $submenu; @@ -391,7 +391,7 @@ public function test_add_options_menu() { * Tests add_jetpack_menu * § * - * @covers ::add_jetpack_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_jetpack_menu */ public function test_add_jetpack_menu() { global $submenu; @@ -515,7 +515,7 @@ public function hide_menu_based_on_submenu_provider() { /** * Tests test_add_woocommerce_installation_menu * - * @covers ::add_woocommerce_installation_menu + * @covers Automattic\Jetpack\Masterbar\Admin_Menu::add_woocommerce_installation_menu */ public function test_add_woocommerce_installation_menu() { global $menu; diff --git a/projects/packages/masterbar/tests/php/test-class-atomic-admin-menu.php b/projects/packages/masterbar/tests/php/test-class-atomic-admin-menu.php index f6f18311cedff..38e99769a1b84 100644 --- a/projects/packages/masterbar/tests/php/test-class-atomic-admin-menu.php +++ b/projects/packages/masterbar/tests/php/test-class-atomic-admin-menu.php @@ -106,7 +106,7 @@ public function tear_down() { /** * Tests add_new_site_link. * - * @covers ::add_new_site_link + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_new_site_link */ public function test_add_new_site_link() { global $menu; @@ -133,7 +133,7 @@ public function test_add_new_site_link() { /** * Tests add_site_card_menu * - * @covers ::add_site_card_menu + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_site_card_menu */ public function test_add_site_card_menu() { global $menu; @@ -161,7 +161,7 @@ public function test_add_site_card_menu() { /** * Tests add_site_card_menu for Private sites * - * @covers ::add_site_card_menu + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_site_card_menu */ public function test_add_site_card_menu_private_site() { global $menu; @@ -192,7 +192,7 @@ public function test_add_site_card_menu_private_site() { /** * Tests set_site_card_menu_class * - * @covers ::set_site_card_menu_class + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::set_site_card_menu_class */ public function test_set_site_card_menu_class() { global $menu; @@ -236,7 +236,7 @@ public function custom_site_icon_url() { /** * Tests get_preferred_view * - * @covers ::get_preferred_view + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::get_preferred_view */ public function test_get_preferred_view() { $this->assertSame( 'classic', static::$admin_menu->get_preferred_view( 'export.php' ) ); @@ -245,7 +245,7 @@ public function test_get_preferred_view() { /** * Tests add_upgrades_menu * - * @covers ::add_upgrades_menu + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_upgrades_menu */ public function test_add_upgrades_menu() { global $submenu; @@ -267,7 +267,7 @@ public function test_add_upgrades_menu() { /** * Tests add_my_mailboxes_menu * - * @covers ::add_my_mailboxes_menu + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_my_mailboxes_menu */ public function test_add_my_mailboxes_menu() { global $menu; @@ -280,7 +280,7 @@ public function test_add_my_mailboxes_menu() { /** * Tests add_options_menu * - * @covers ::add_options_menu + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_options_menu */ public function test_add_options_menu() { global $submenu; @@ -297,7 +297,7 @@ public function test_add_options_menu() { /** * Tests add_users_menu * - * @covers ::add_users_menu + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_users_menu */ public function test_add_users_menu() { global $submenu; @@ -313,7 +313,7 @@ public function test_add_users_menu() { /** * Tests remove_gutenberg_menu * - * @covers ::remove_gutenberg_menu + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::remove_gutenberg_menu */ public function test_remove_gutenberg_menu() { global $menu; @@ -326,7 +326,7 @@ public function test_remove_gutenberg_menu() { /** * Tests add_plugins_menu * - * @covers ::add_plugins_menu + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_plugins_menu */ public function test_add_plugins_menu() { global $submenu; @@ -348,7 +348,7 @@ public function test_add_plugins_menu() { /** * Tests add_tools_menu * - * @covers ::add_tools_menu + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_tools_menu */ public function test_add_site_monitoring_menu() { global $submenu; @@ -362,7 +362,7 @@ public function test_add_site_monitoring_menu() { /** * Tests add_github_deployments_menu * - * @covers ::add_tools_menu + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_tools_menu */ public function test_add_github_deployments_menu() { global $submenu; @@ -376,7 +376,7 @@ public function test_add_github_deployments_menu() { /** * Tests add_jetpack_scan_menu * - * @covers ::add_jetpack_menu + * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_jetpack_menu */ public function test_add_jetpack_scan_submenu() { global $submenu; diff --git a/projects/packages/masterbar/tests/php/test-class-jetpack-admin-menu.php b/projects/packages/masterbar/tests/php/test-class-jetpack-admin-menu.php index 1ae3be3b4abbb..36def0b81ed6d 100644 --- a/projects/packages/masterbar/tests/php/test-class-jetpack-admin-menu.php +++ b/projects/packages/masterbar/tests/php/test-class-jetpack-admin-menu.php @@ -104,7 +104,7 @@ public function tear_down() { /** * Tests add_jetpack_menu * - * @covers ::add_jetpack_menu + * @covers Automattic\Jetpack\Masterbar\Jetpack_Admin_Menu::add_jetpack_menu */ public function test_add_jetpack_menu() { global $submenu; @@ -116,7 +116,7 @@ public function test_add_jetpack_menu() { /** * Tests add_tools_menu * - * @covers ::add_tools_menu + * @covers Automattic\Jetpack\Masterbar\Jetpack_Admin_Menu::add_tools_menu */ public function test_add_tools_menu() { global $submenu; @@ -134,7 +134,7 @@ public function test_add_tools_menu() { /** * Tests add_wp_admin_menu * - * @covers ::add_wp_admin_menu + * @covers Automattic\Jetpack\Masterbar\Jetpack_Admin_Menu::add_wp_admin_menu */ public function test_add_wp_admin_menu() { global $menu; @@ -147,7 +147,7 @@ public function test_add_wp_admin_menu() { /** * Tests add_appearance_menu * - * @covers ::add_appearance_menu + * @covers Automattic\Jetpack\Masterbar\Jetpack_Admin_Menu::add_appearance_menu */ public function test_add_appearance_menu() { global $submenu; @@ -163,7 +163,7 @@ public function test_add_appearance_menu() { /** * Tests add_posts_menu * - * @covers ::add_posts_menu + * @covers Automattic\Jetpack\Masterbar\Jetpack_Admin_Menu::add_posts_menu */ public function test_add_posts_menu() { global $menu; @@ -176,7 +176,7 @@ public function test_add_posts_menu() { /** * Tests add_page_menu * - * @covers ::add_page_menu + * @covers Automattic\Jetpack\Masterbar\Jetpack_Admin_Menu::add_page_menu */ public function test_add_page_menu() { global $menu; @@ -189,7 +189,7 @@ public function test_add_page_menu() { /** * Tests add_users_menu * - * @covers ::add_users_menu + * @covers Automattic\Jetpack\Masterbar\Jetpack_Admin_Menu::add_users_menu */ public function test_add_users_menu() { global $menu; @@ -202,7 +202,7 @@ public function test_add_users_menu() { /** * Tests add_users_menu * - * @covers ::add_feedback_menu + * @covers Automattic\Jetpack\Masterbar\Jetpack_Admin_Menu::add_feedback_menu */ public function add_feedback_menu() { global $menu; @@ -215,7 +215,7 @@ public function add_feedback_menu() { /** * Tests add_plugins_menu * - * @covers ::add_plugins_menu + * @covers Automattic\Jetpack\Masterbar\Jetpack_Admin_Menu::add_plugins_menu */ public function test_add_plugins_menu() { global $menu; diff --git a/projects/packages/my-jetpack/changelog/restore-jp_test_coverage b/projects/packages/my-jetpack/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/my-jetpack/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/my-jetpack/composer.json b/projects/packages/my-jetpack/composer.json index 1cfb7078367ac..8df2e9df32e44 100644 --- a/projects/packages/my-jetpack/composer.json +++ b/projects/packages/my-jetpack/composer.json @@ -40,6 +40,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json index 8b3bf6b272041..39c2799b6782d 100644 --- a/projects/packages/my-jetpack/package.json +++ b/projects/packages/my-jetpack/package.json @@ -19,7 +19,8 @@ "build-client": "pnpm webpack --config webpack.config.js", "clean": "rm -rf build/", "watch": "pnpm run build && pnpm webpack watch", - "test": "jest --config=tests/jest.config.js" + "test": "jest --config=tests/jest.config.js", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" }, "dependencies": { "@automattic/format-currency": "1.0.1", diff --git a/projects/packages/password-checker/changelog/restore-jp_test_coverage b/projects/packages/password-checker/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/password-checker/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/password-checker/composer.json b/projects/packages/password-checker/composer.json index 03e8904e06c37..88218a9a6b30a 100644 --- a/projects/packages/password-checker/composer.json +++ b/projects/packages/password-checker/composer.json @@ -23,6 +23,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/patchwork-redefine-exit/changelog/restore-jp_test_coverage b/projects/packages/patchwork-redefine-exit/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/patchwork-redefine-exit/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/patchwork-redefine-exit/composer.json b/projects/packages/patchwork-redefine-exit/composer.json index 9cec9c4871276..9a287b7234662 100644 --- a/projects/packages/patchwork-redefine-exit/composer.json +++ b/projects/packages/patchwork-redefine-exit/composer.json @@ -27,6 +27,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/phan-plugins/changelog/restore-jp_test_coverage b/projects/packages/phan-plugins/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/phan-plugins/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/phan-plugins/composer.json b/projects/packages/phan-plugins/composer.json index 2d1eee4a9e525..d9233183f66bc 100644 --- a/projects/packages/phan-plugins/composer.json +++ b/projects/packages/phan-plugins/composer.json @@ -26,6 +26,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/phpcs-filter/changelog/restore-jp_test_coverage b/projects/packages/phpcs-filter/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/phpcs-filter/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/phpcs-filter/composer.json b/projects/packages/phpcs-filter/composer.json index 9cf72a26cd8a4..673e171f6316e 100644 --- a/projects/packages/phpcs-filter/composer.json +++ b/projects/packages/phpcs-filter/composer.json @@ -30,6 +30,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/plans/changelog/restore-jp_test_coverage b/projects/packages/plans/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/plans/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/plans/composer.json b/projects/packages/plans/composer.json index 3df7c90a705a0..7aa995de58e99 100644 --- a/projects/packages/plans/composer.json +++ b/projects/packages/plans/composer.json @@ -25,6 +25,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/plugin-deactivation/changelog/restore-jp_test_coverage b/projects/packages/plugin-deactivation/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/plugin-deactivation/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/plugin-deactivation/composer.json b/projects/packages/plugin-deactivation/composer.json index d1b68e3bba6f7..3516af6d6b1ea 100644 --- a/projects/packages/plugin-deactivation/composer.json +++ b/projects/packages/plugin-deactivation/composer.json @@ -23,6 +23,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/plugin-deactivation/package.json b/projects/packages/plugin-deactivation/package.json index c3de854bfd522..cb62568d877a5 100644 --- a/projects/packages/plugin-deactivation/package.json +++ b/projects/packages/plugin-deactivation/package.json @@ -18,8 +18,7 @@ "build": "pnpm run clean && pnpm run build-client", "build-client": "pnpm webpack --config webpack.config.js", "clean": "rm -rf build/", - "watch": "pnpm run build && pnpm webpack watch", - "test": "jest --config=tests/jest.config.js" + "watch": "pnpm run build && pnpm webpack watch" }, "devDependencies": { "@automattic/jetpack-webpack-config": "workspace:*", diff --git a/projects/packages/plugins-installer/changelog/restore-jp_test_coverage b/projects/packages/plugins-installer/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/plugins-installer/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/plugins-installer/composer.json b/projects/packages/plugins-installer/composer.json index c747be7d43526..d24048b431089 100644 --- a/projects/packages/plugins-installer/composer.json +++ b/projects/packages/plugins-installer/composer.json @@ -24,6 +24,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/post-list/changelog/restore-jp_test_coverage b/projects/packages/post-list/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/post-list/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/post-list/composer.json b/projects/packages/post-list/composer.json index 1276f1deec837..0ea68da6c1133 100644 --- a/projects/packages/post-list/composer.json +++ b/projects/packages/post-list/composer.json @@ -33,6 +33,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/protect-models/changelog/restore-jp_test_coverage b/projects/packages/protect-models/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/protect-models/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/protect-models/composer.json b/projects/packages/protect-models/composer.json index ba7db21984049..1c0ccc694be72 100644 --- a/projects/packages/protect-models/composer.json +++ b/projects/packages/protect-models/composer.json @@ -22,6 +22,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/protect-status/changelog/restore-jp_test_coverage b/projects/packages/protect-status/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/protect-status/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/protect-status/composer.json b/projects/packages/protect-status/composer.json index c367cb426ff2b..05a485d5af1e2 100644 --- a/projects/packages/protect-status/composer.json +++ b/projects/packages/protect-status/composer.json @@ -29,6 +29,9 @@ ], "post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy", "post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy", + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/publicize/changelog/restore-jp_test_coverage b/projects/packages/publicize/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/publicize/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/publicize/composer.json b/projects/packages/publicize/composer.json index b3f71236d8419..2d924c29b21dd 100644 --- a/projects/packages/publicize/composer.json +++ b/projects/packages/publicize/composer.json @@ -33,6 +33,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/redirect/changelog/restore-jp_test_coverage b/projects/packages/redirect/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/redirect/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/redirect/composer.json b/projects/packages/redirect/composer.json index 162075083616c..f03bbd620c74f 100644 --- a/projects/packages/redirect/composer.json +++ b/projects/packages/redirect/composer.json @@ -24,6 +24,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/roles/changelog/restore-jp_test_coverage b/projects/packages/roles/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/roles/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/roles/composer.json b/projects/packages/roles/composer.json index bd6a693cddcc7..2abc8c54db0ae 100644 --- a/projects/packages/roles/composer.json +++ b/projects/packages/roles/composer.json @@ -23,6 +23,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/scheduled-updates/changelog/restore-jp_test_coverage b/projects/packages/scheduled-updates/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/scheduled-updates/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/scheduled-updates/composer.json b/projects/packages/scheduled-updates/composer.json index 4b6eb95e5e11c..efd64006f7ef3 100644 --- a/projects/packages/scheduled-updates/composer.json +++ b/projects/packages/scheduled-updates/composer.json @@ -29,6 +29,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/schema/changelog/restore-jp_test_coverage b/projects/packages/schema/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/schema/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/schema/composer.json b/projects/packages/schema/composer.json index 5208e5e1a3b1a..f82358916bf51 100644 --- a/projects/packages/schema/composer.json +++ b/projects/packages/schema/composer.json @@ -22,6 +22,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/search/changelog/restore-jp_test_coverage b/projects/packages/search/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/search/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/search/composer.json b/projects/packages/search/composer.json index b4b6feb6e29b9..0ed819193c4a6 100644 --- a/projects/packages/search/composer.json +++ b/projects/packages/search/composer.json @@ -40,6 +40,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], diff --git a/projects/packages/search/package.json b/projects/packages/search/package.json index 4b5cb545fd0a2..5b2295e1329ae 100644 --- a/projects/packages/search/package.json +++ b/projects/packages/search/package.json @@ -15,6 +15,7 @@ "build-dashboard": "webpack --config ./tools/webpack.dashboard.config.js", "clean": "rm -rf build/ .cache/", "test": "concurrently 'pnpm:test-scripts' 'pnpm:test-size'", + "test-coverage": "pnpm run test-scripts --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "test-scripts": "jest --passWithNoTests", "test-size": "NODE_ENV=production BABEL_ENV=production pnpm run build-instant && size-limit", "validate": "pnpm exec validate-es --no-error-on-unmatched-pattern build/", diff --git a/projects/packages/stats-admin/changelog/restore-jp_test_coverage b/projects/packages/stats-admin/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/stats-admin/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/stats-admin/composer.json b/projects/packages/stats-admin/composer.json index fb2759f3429d4..3963a6bd5dab5 100644 --- a/projects/packages/stats-admin/composer.json +++ b/projects/packages/stats-admin/composer.json @@ -29,6 +29,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/stats/changelog/restore-jp_test_coverage b/projects/packages/stats/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/stats/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/stats/composer.json b/projects/packages/stats/composer.json index 67fc3d472ab36..18e30f44b32b6 100644 --- a/projects/packages/stats/composer.json +++ b/projects/packages/stats/composer.json @@ -26,6 +26,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/status/changelog/restore-jp_test_coverage b/projects/packages/status/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/status/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/status/composer.json b/projects/packages/status/composer.json index e499134960e7e..fa11b1211f613 100644 --- a/projects/packages/status/composer.json +++ b/projects/packages/status/composer.json @@ -27,6 +27,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/stub-generator/changelog/restore-jp_test_coverage b/projects/packages/stub-generator/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/stub-generator/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/stub-generator/composer.json b/projects/packages/stub-generator/composer.json index 2f384bc24947b..b425f74842128 100644 --- a/projects/packages/stub-generator/composer.json +++ b/projects/packages/stub-generator/composer.json @@ -29,6 +29,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/packages/sync/changelog/restore-jp_test_coverage b/projects/packages/sync/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/sync/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/sync/composer.json b/projects/packages/sync/composer.json index 364bd3789a4c5..37f7e6b66e727 100644 --- a/projects/packages/sync/composer.json +++ b/projects/packages/sync/composer.json @@ -31,6 +31,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/transport-helper/changelog/restore-jp_test_coverage b/projects/packages/transport-helper/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/transport-helper/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/transport-helper/composer.json b/projects/packages/transport-helper/composer.json index f116659c6684c..f7c0ed49dd2bf 100644 --- a/projects/packages/transport-helper/composer.json +++ b/projects/packages/transport-helper/composer.json @@ -28,6 +28,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/videopress/changelog/restore-jp_test_coverage b/projects/packages/videopress/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/videopress/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/videopress/composer.json b/projects/packages/videopress/composer.json index e0f685d077ab9..4a9c5b2d0d411 100644 --- a/projects/packages/videopress/composer.json +++ b/projects/packages/videopress/composer.json @@ -29,6 +29,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/videopress/package.json b/projects/packages/videopress/package.json index 690edf053a1e9..70e2ef90747ed 100644 --- a/projects/packages/videopress/package.json +++ b/projects/packages/videopress/package.json @@ -20,7 +20,8 @@ "clean": "rm -rf build/", "validate": "pnpm exec validate-es build/", "watch": "pnpm build && pnpm build-client --watch", - "test": "NODE_OPTIONS=--experimental-vm-modules jest" + "test": "NODE_OPTIONS=--experimental-vm-modules jest", + "test-coverage": "pnpm run test --coverageDirectory=\"$COVERAGE_DIR/js\" --coverage --coverageReporters=clover" }, "devDependencies": { "@automattic/calypso-color-schemes": "3.1.3", diff --git a/projects/packages/waf/changelog/restore-jp_test_coverage b/projects/packages/waf/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/waf/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/waf/composer.json b/projects/packages/waf/composer.json index 5fd7008faf5b7..620bb171e9b1b 100644 --- a/projects/packages/waf/composer.json +++ b/projects/packages/waf/composer.json @@ -34,6 +34,10 @@ ], "post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy", "post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy", + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/integration/clover.xml\" --configuration tests/php/integration/phpunit.xml.dist", + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/unit/clover.xml\" --configuration tests/php/unit/phpunit.xml.dist" + ], "test-coverage-html": [ "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist", "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist" diff --git a/projects/packages/woocommerce-analytics/changelog/restore-jp_test_coverage b/projects/packages/woocommerce-analytics/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/woocommerce-analytics/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/woocommerce-analytics/composer.json b/projects/packages/woocommerce-analytics/composer.json index fa380a5e6f68a..2a19b63e75e7b 100644 --- a/projects/packages/woocommerce-analytics/composer.json +++ b/projects/packages/woocommerce-analytics/composer.json @@ -21,6 +21,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/wordads/changelog/restore-jp_test_coverage b/projects/packages/wordads/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/wordads/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/wordads/composer.json b/projects/packages/wordads/composer.json index c5392941d7296..fd87fe512b151 100644 --- a/projects/packages/wordads/composer.json +++ b/projects/packages/wordads/composer.json @@ -37,6 +37,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], diff --git a/projects/packages/wordads/package.json b/projects/packages/wordads/package.json index 410b3d6c90e4a..e43d88c61e2f9 100644 --- a/projects/packages/wordads/package.json +++ b/projects/packages/wordads/package.json @@ -24,8 +24,8 @@ "build-development": "NODE_ENV=development BABEL_ENV=development pnpm run build", "build-dashboard": "webpack --config ./tools/webpack.dashboard.config.js", "clean": "rm -rf build/ .cache/", - "test": "concurrently 'pnpm:test-scripts'", - "test-scripts": "jest --passWithNoTests", + "test": "jest --passWithNoTests", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "validate": "pnpm exec validate-es --no-error-on-unmatched-pattern build/", "watch": "concurrently 'pnpm:build-dashboard --watch'" }, diff --git a/projects/packages/wp-js-data-sync/changelog/restore-jp_test_coverage b/projects/packages/wp-js-data-sync/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/wp-js-data-sync/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/wp-js-data-sync/composer.json b/projects/packages/wp-js-data-sync/composer.json index 97f6a0932c28d..768377826c619 100644 --- a/projects/packages/wp-js-data-sync/composer.json +++ b/projects/packages/wp-js-data-sync/composer.json @@ -24,6 +24,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/packages/yoast-promo/changelog/restore-jp_test_coverage b/projects/packages/yoast-promo/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/packages/yoast-promo/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/packages/yoast-promo/composer.json b/projects/packages/yoast-promo/composer.json index c2da4298a73bb..60d85ce16ec9c 100644 --- a/projects/packages/yoast-promo/composer.json +++ b/projects/packages/yoast-promo/composer.json @@ -23,6 +23,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/automattic-for-agencies-client/changelog/restore-jp_test_coverage b/projects/plugins/automattic-for-agencies-client/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/automattic-for-agencies-client/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/automattic-for-agencies-client/changelog/restore-jp_test_coverage#2 b/projects/plugins/automattic-for-agencies-client/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/automattic-for-agencies-client/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/automattic-for-agencies-client/composer.json b/projects/plugins/automattic-for-agencies-client/composer.json index 902ead34da426..5cfc348acf9f7 100644 --- a/projects/plugins/automattic-for-agencies-client/composer.json +++ b/projects/plugins/automattic-for-agencies-client/composer.json @@ -28,6 +28,13 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], + "test-js": [ + "pnpm run test" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/automattic-for-agencies-client/composer.lock b/projects/plugins/automattic-for-agencies-client/composer.lock index 660657d92013b..49e93b08b8f6d 100644 --- a/projects/plugins/automattic-for-agencies-client/composer.lock +++ b/projects/plugins/automattic-for-agencies-client/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -228,6 +238,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -254,7 +268,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -287,6 +301,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -383,7 +400,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -454,6 +471,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -472,7 +492,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -505,6 +525,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -523,7 +546,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -560,6 +583,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -578,7 +604,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -612,6 +638,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -636,7 +665,7 @@ "dist": { "type": "path", "url": "../../packages/plugin-deactivation", - "reference": "bc916add364c9661485ad0f397422d594c1c4794" + "reference": "93d30732379c73b5395af636c00c9a74a2503279" }, "require": { "automattic/jetpack-assets": "@dev", @@ -673,6 +702,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -701,7 +733,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -735,6 +767,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -753,7 +788,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -786,6 +821,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -804,7 +842,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -847,6 +885,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -865,7 +906,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -916,6 +957,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -990,7 +1034,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -1034,6 +1078,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/automattic-for-agencies-client/package.json b/projects/plugins/automattic-for-agencies-client/package.json index ea9ffee8a05b4..1b431d53de7b8 100644 --- a/projects/plugins/automattic-for-agencies-client/package.json +++ b/projects/plugins/automattic-for-agencies-client/package.json @@ -18,7 +18,8 @@ "build-concurrently": "pnpm run clean && concurrently 'pnpm:build-client'", "build-production-concurrently": "pnpm run clean && concurrently 'NODE_ENV=production BABEL_ENV=production pnpm run build-client' && pnpm run validate", "clean": "rm -rf build/", - "test": "jest", + "test": "jest --passWithNoTests", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "validate": "pnpm exec validate-es build/", "watch": "pnpm run build && webpack watch" }, @@ -47,6 +48,7 @@ "@testing-library/dom": "10.4.0", "@testing-library/react": "16.0.1", "@wordpress/browserslist-config": "6.9.0", + "@wordpress/components": "28.9.0", "babel-jest": "29.4.3", "concurrently": "7.6.0", "jest": "29.7.0", diff --git a/projects/plugins/automattic-for-agencies-client/src/js/components/admin-page/test/index.test.js b/projects/plugins/automattic-for-agencies-client/src/js/components/admin-page/test/index.test.js deleted file mode 100644 index 97f878b50704a..0000000000000 --- a/projects/plugins/automattic-for-agencies-client/src/js/components/admin-page/test/index.test.js +++ /dev/null @@ -1,31 +0,0 @@ -import { CONNECTION_STORE_ID } from '@automattic/jetpack-connection'; -import { render, renderHook, screen } from '@testing-library/react'; -import { useSelect } from '@wordpress/data'; -import React from 'react'; -import Admin from '../index'; - -describe( 'Admin', () => { - beforeAll( () => { - window.automatticForAgenciesClientInitialState = { - apiNonce: '', - apiRoot: '', - registrationNonce: '', - }; - } ); - - test( 'Renders the component', () => { - let storeSelect; - - renderHook( () => useSelect( select => ( storeSelect = select( CONNECTION_STORE_ID ) ) ) ); - jest - .spyOn( storeSelect, 'getConnectionStatus' ) - .mockReset() - .mockReturnValue( { isRegistered: false, isUserConnected: false } ); - - render( ); - expect( screen.getByLabelText( 'Automattic For Agencies Client' ) ).toBeInTheDocument(); - expect( - screen.getByRole( 'heading', { name: 'Connection screen title' } ) - ).toBeInTheDocument(); - } ); -} ); diff --git a/projects/plugins/backup/changelog/restore-jp_test_coverage b/projects/plugins/backup/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/backup/changelog/restore-jp_test_coverage @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index 619c9f5171b6c..91f025a177926 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -228,6 +238,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -254,7 +268,7 @@ "dist": { "type": "path", "url": "../../packages/backup", - "reference": "952a01e67d1f63be1f900fb8bcb1869b1c53133a" + "reference": "ef240489faeb9ddc3b44acaf44316f05a29c4827" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -304,6 +318,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -341,7 +359,7 @@ "dist": { "type": "path", "url": "../../packages/backup-helper-script-manager", - "reference": "460d4932cc27b84f375cb04f47691faeb57d67ad" + "reference": "6deb369a4b4428f1de5b7ddddc0030d4703c741f" }, "require": { "php": ">=7.0" @@ -374,6 +392,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -398,7 +419,7 @@ "dist": { "type": "path", "url": "../../packages/boost-core", - "reference": "254e450eefc86995a797518cc1cbc041f1509222" + "reference": "0d76871d95374578c913f7b00506a651c1bd444a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -433,6 +454,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -463,7 +487,7 @@ "dist": { "type": "path", "url": "../../packages/boost-speed-score", - "reference": "6d24ca9aca1b0cda4e925bbe6dcaad4bbd3a16be" + "reference": "6441f54b5026dd6520e94e183ab3608f673170b7" }, "require": { "automattic/jetpack-boost-core": "@dev", @@ -506,6 +530,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -536,7 +563,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -569,6 +596,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -665,7 +695,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -736,6 +766,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -754,7 +787,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -787,6 +820,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -805,7 +841,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -837,6 +873,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -855,7 +894,7 @@ "dist": { "type": "path", "url": "../../packages/explat", - "reference": "d53b06a5550c6f8c2f009c183b5ab037e6c648c5" + "reference": "6228d5aa0f7e9bf6e5b330d28f06bacd3a3eed2f" }, "require": { "automattic/jetpack-connection": "@dev", @@ -892,11 +931,15 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], "test-js": [ - "echo 'Run `pnpm run test` when ready'" + "pnpm run test" ], "test-js-watch": [ "Composer\\Config::disableProcessTimeout", @@ -927,7 +970,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -964,6 +1007,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -982,7 +1028,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "695db30039999154283059f6b2fe34fff746cd25" + "reference": "ef00dfdc717329690ecfc727e44fd48fbaabf8db" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1032,6 +1078,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1054,7 +1103,7 @@ "dist": { "type": "path", "url": "../../packages/licensing", - "reference": "2507ac1d1f2bbc7a12e8dddb1cb9fa3f9423d8d7" + "reference": "949c6fbd0e9346d5e91680f9f6da132a24a4a8d5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1095,6 +1144,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1113,7 +1165,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -1145,6 +1197,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1163,7 +1218,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "bd64433575233a1be4480fcbd6a8113bfa29ccc0" + "reference": "f809fc6bc9b1403bb812c92c5fb46eee463862df" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1223,6 +1278,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -1264,7 +1323,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -1298,6 +1357,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1322,7 +1384,7 @@ "dist": { "type": "path", "url": "../../packages/plans", - "reference": "5b2084083304385b29ab96840abf799afd0f79c2" + "reference": "83a76735261947e6d0b3771fc968fdd6da5d78e9" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1357,6 +1419,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1387,7 +1452,7 @@ "dist": { "type": "path", "url": "../../packages/plugins-installer", - "reference": "94f77ef5fa17584be1cf6ff0f3157c78ca888e31" + "reference": "15654227d052d7318b63d25957ba6723477861af" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1422,6 +1487,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1440,7 +1508,7 @@ "dist": { "type": "path", "url": "../../packages/protect-models", - "reference": "3bf84c840bde41d41a4daa6652ccac08916e0c90" + "reference": "48670a4012c8f67e9000683cf65028af8039b446" }, "require": { "php": ">=7.0" @@ -1483,6 +1551,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1507,7 +1578,7 @@ "dist": { "type": "path", "url": "../../packages/protect-status", - "reference": "c0092882367ee3ef1a30326ac0dbb058d0adc5e3" + "reference": "9dabf575a041aaebd50c7a2c4c16cd00668e64c5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1561,6 +1632,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1579,7 +1653,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -1613,6 +1687,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1631,7 +1708,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -1664,6 +1741,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1682,7 +1762,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1725,6 +1805,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1743,7 +1826,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1794,6 +1877,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1820,7 +1906,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -1864,6 +1950,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/beta/changelog/restore-jp_test_coverage b/projects/plugins/beta/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/beta/changelog/restore-jp_test_coverage @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/beta/composer.lock b/projects/plugins/beta/composer.lock index 65c819571e984..46b200ae46f93 100644 --- a/projects/plugins/beta/composer.lock +++ b/projects/plugins/beta/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -50,6 +50,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -74,7 +77,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -112,6 +115,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -271,7 +278,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -315,6 +322,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1111,7 +1121,7 @@ }, "prefer-stable": true, "prefer-lowest": false, - "platform": {}, - "platform-dev": {}, + "platform": [], + "platform-dev": [], "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/boost/changelog/restore-jp_test_coverage b/projects/plugins/boost/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/boost/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/boost/changelog/restore-jp_test_coverage#2 b/projects/plugins/boost/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/boost/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/boost/composer.json b/projects/plugins/boost/composer.json index c07f0a75a493f..7b21c9668d7a0 100644 --- a/projects/plugins/boost/composer.json +++ b/projects/plugins/boost/composer.json @@ -43,6 +43,13 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], + "test-js": [ + "pnpm run test" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock index 3b6fc7a807989..fcd68356aca0c 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -228,6 +238,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -254,7 +268,7 @@ "dist": { "type": "path", "url": "../../packages/boost-core", - "reference": "254e450eefc86995a797518cc1cbc041f1509222" + "reference": "0d76871d95374578c913f7b00506a651c1bd444a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -289,6 +303,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -319,7 +336,7 @@ "dist": { "type": "path", "url": "../../packages/boost-speed-score", - "reference": "6d24ca9aca1b0cda4e925bbe6dcaad4bbd3a16be" + "reference": "6441f54b5026dd6520e94e183ab3608f673170b7" }, "require": { "automattic/jetpack-boost-core": "@dev", @@ -362,6 +379,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -392,7 +412,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -425,6 +445,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -521,7 +544,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -592,6 +615,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -610,7 +636,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -643,6 +669,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -661,7 +690,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -693,6 +722,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -711,7 +743,7 @@ "dist": { "type": "path", "url": "../../packages/explat", - "reference": "d53b06a5550c6f8c2f009c183b5ab037e6c648c5" + "reference": "6228d5aa0f7e9bf6e5b330d28f06bacd3a3eed2f" }, "require": { "automattic/jetpack-connection": "@dev", @@ -748,11 +780,15 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], "test-js": [ - "echo 'Run `pnpm run test` when ready'" + "pnpm run test" ], "test-js-watch": [ "Composer\\Config::disableProcessTimeout", @@ -783,7 +819,7 @@ "dist": { "type": "path", "url": "../../packages/image-cdn", - "reference": "63a179625ebed6c7e5d21ddfb1949983e16dda4d" + "reference": "75c09d8d9d05952fec322b759883c794a1961b72" }, "require": { "automattic/jetpack-assets": "@dev", @@ -822,6 +858,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -846,7 +885,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -883,6 +922,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -901,7 +943,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "695db30039999154283059f6b2fe34fff746cd25" + "reference": "ef00dfdc717329690ecfc727e44fd48fbaabf8db" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -951,6 +993,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -973,7 +1018,7 @@ "dist": { "type": "path", "url": "../../packages/licensing", - "reference": "2507ac1d1f2bbc7a12e8dddb1cb9fa3f9423d8d7" + "reference": "949c6fbd0e9346d5e91680f9f6da132a24a4a8d5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1014,6 +1059,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1032,7 +1080,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -1064,6 +1112,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1082,7 +1133,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "bd64433575233a1be4480fcbd6a8113bfa29ccc0" + "reference": "f809fc6bc9b1403bb812c92c5fb46eee463862df" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1142,6 +1193,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -1183,7 +1238,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -1217,6 +1272,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1241,7 +1299,7 @@ "dist": { "type": "path", "url": "../../packages/plans", - "reference": "5b2084083304385b29ab96840abf799afd0f79c2" + "reference": "83a76735261947e6d0b3771fc968fdd6da5d78e9" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1276,6 +1334,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1306,7 +1367,7 @@ "dist": { "type": "path", "url": "../../packages/plugin-deactivation", - "reference": "bc916add364c9661485ad0f397422d594c1c4794" + "reference": "93d30732379c73b5395af636c00c9a74a2503279" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1343,6 +1404,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1371,7 +1435,7 @@ "dist": { "type": "path", "url": "../../packages/plugins-installer", - "reference": "94f77ef5fa17584be1cf6ff0f3157c78ca888e31" + "reference": "15654227d052d7318b63d25957ba6723477861af" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1406,6 +1470,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1424,7 +1491,7 @@ "dist": { "type": "path", "url": "../../packages/protect-models", - "reference": "3bf84c840bde41d41a4daa6652ccac08916e0c90" + "reference": "48670a4012c8f67e9000683cf65028af8039b446" }, "require": { "php": ">=7.0" @@ -1467,6 +1534,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1491,7 +1561,7 @@ "dist": { "type": "path", "url": "../../packages/protect-status", - "reference": "c0092882367ee3ef1a30326ac0dbb058d0adc5e3" + "reference": "9dabf575a041aaebd50c7a2c4c16cd00668e64c5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1545,6 +1615,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1563,7 +1636,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -1597,6 +1670,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1615,7 +1691,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -1648,6 +1724,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1666,7 +1745,7 @@ "dist": { "type": "path", "url": "../../packages/schema", - "reference": "be04299bd366af85656cead6917aa99a2d61cdd8" + "reference": "3804e15142dce1aa184e0cd83d05884cc160ddbc" }, "require": { "php": ">=7.0" @@ -1709,6 +1788,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1733,7 +1815,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1776,6 +1858,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1794,7 +1879,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1845,6 +1930,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1869,7 +1957,7 @@ "dist": { "type": "path", "url": "../../packages/wp-js-data-sync", - "reference": "47509e3b3baaea36a0ae646e8054b742455361b0" + "reference": "6c958ab9d94ad5d3463053c6e69cb46d9cb1da70" }, "require": { "automattic/jetpack-schema": "@dev", @@ -1907,6 +1995,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -2168,7 +2259,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -2212,6 +2303,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/boost/package.json b/projects/plugins/boost/package.json index df03b2014d9eb..32137fad61d22 100644 --- a/projects/plugins/boost/package.json +++ b/projects/plugins/boost/package.json @@ -66,6 +66,7 @@ "build-production-concurrently": "pnpm run clean && concurrently 'NODE_ENV=production BABEL_ENV=production pnpm run build-client' && pnpm run validate", "clean": "rm -rf app/assets/dist/", "test": "jest app --env=jsdom", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "validate": "pnpm exec validate-es app/assets/dist", "watch": "pnpm run build && webpack watch", "reformat-files": "../../../tools/js-tools/node_modules/.bin/prettier --ignore-path .eslintignore --write --plugin-search-dir=. ./**/*.{js,ts,json}", diff --git a/projects/plugins/classic-theme-helper-plugin/changelog/restore-jp_test_coverage b/projects/plugins/classic-theme-helper-plugin/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/classic-theme-helper-plugin/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/classic-theme-helper-plugin/changelog/restore-jp_test_coverage#2 b/projects/plugins/classic-theme-helper-plugin/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/classic-theme-helper-plugin/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/classic-theme-helper-plugin/composer.json b/projects/plugins/classic-theme-helper-plugin/composer.json index db8b08d664c24..a0c567df12e8e 100644 --- a/projects/plugins/classic-theme-helper-plugin/composer.json +++ b/projects/plugins/classic-theme-helper-plugin/composer.json @@ -26,6 +26,13 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], + "test-js": [ + "pnpm run test" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/classic-theme-helper-plugin/composer.lock b/projects/plugins/classic-theme-helper-plugin/composer.lock index 2712a80baf12e..fd3cef5a75010 100644 --- a/projects/plugins/classic-theme-helper-plugin/composer.lock +++ b/projects/plugins/classic-theme-helper-plugin/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -107,6 +110,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -128,7 +135,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -166,6 +173,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -192,7 +203,7 @@ "dist": { "type": "path", "url": "../../packages/classic-theme-helper", - "reference": "7e41cb31355e36d266e20ce88bf6da892947cda5" + "reference": "c95e743aecbe2e79c24dfd5e2f2169b46f2bc334" }, "require": { "automattic/jetpack-assets": "@dev", @@ -242,6 +253,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -260,7 +274,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -293,6 +307,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -389,7 +406,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -422,6 +439,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -440,7 +460,7 @@ "dist": { "type": "path", "url": "../../packages/plugins-installer", - "reference": "94f77ef5fa17584be1cf6ff0f3157c78ca888e31" + "reference": "15654227d052d7318b63d25957ba6723477861af" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -475,6 +495,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -493,7 +516,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -536,6 +559,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -604,7 +630,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -648,6 +674,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/classic-theme-helper-plugin/package.json b/projects/plugins/classic-theme-helper-plugin/package.json index 7459ad5b6ae57..83c1cb4c89786 100644 --- a/projects/plugins/classic-theme-helper-plugin/package.json +++ b/projects/plugins/classic-theme-helper-plugin/package.json @@ -18,7 +18,8 @@ "build-concurrently": "pnpm run clean && concurrently 'pnpm:build-client'", "build-production-concurrently": "pnpm run clean && concurrently 'NODE_ENV=production BABEL_ENV=production pnpm run build-client' && pnpm run validate", "clean": "rm -rf build/", - "test": "jest", + "test": "jest --passWithNoTests", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "validate": "pnpm exec validate-es build/", "watch": "pnpm run build && webpack watch" }, diff --git a/projects/plugins/classic-theme-helper-plugin/src/js/components/admin-page/test/index.test.js b/projects/plugins/classic-theme-helper-plugin/src/js/components/admin-page/test/index.test.js deleted file mode 100644 index f515468873f61..0000000000000 --- a/projects/plugins/classic-theme-helper-plugin/src/js/components/admin-page/test/index.test.js +++ /dev/null @@ -1,31 +0,0 @@ -import { CONNECTION_STORE_ID } from '@automattic/jetpack-connection'; -import { render, renderHook, screen } from '@testing-library/react'; -import { useSelect } from '@wordpress/data'; -import React from 'react'; -import Admin from '../index'; - -describe( 'Admin', () => { - beforeAll( () => { - window.jetpackClassicThemeHelperPluginInitialState = { - apiNonce: '', - apiRoot: '', - registrationNonce: '', - }; - } ); - - test( 'Renders the component', () => { - let storeSelect; - - renderHook( () => useSelect( select => ( storeSelect = select( CONNECTION_STORE_ID ) ) ) ); - jest - .spyOn( storeSelect, 'getConnectionStatus' ) - .mockReset() - .mockReturnValue( { isRegistered: false, isUserConnected: false } ); - - render( ); - expect( screen.getByLabelText( 'Jetpack Classic Theme Helper Plugin' ) ).toBeInTheDocument(); - expect( - screen.getByRole( 'heading', { name: 'Connection screen title' } ) - ).toBeInTheDocument(); - } ); -} ); diff --git a/projects/plugins/crm/changelog/restore-jp_test_coverage b/projects/plugins/crm/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/crm/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/crm/changelog/restore-jp_test_coverage#2 b/projects/plugins/crm/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/crm/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/crm/composer.json b/projects/plugins/crm/composer.json index 353644f8509a1..4ae11f9321445 100644 --- a/projects/plugins/crm/composer.json +++ b/projects/plugins/crm/composer.json @@ -19,6 +19,9 @@ "build-production": [ "pnpm run build-production" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "tests": "vendor/bin/codecept run acceptance --fail-fast", "tests-debug": "vendor/bin/codecept run acceptance --fail-fast --debug", "create-test": "vendor/bin/codecept generate:cest acceptance $1", diff --git a/projects/plugins/crm/composer.lock b/projects/plugins/crm/composer.lock index 95608027a8782..23a362b1259ef 100644 --- a/projects/plugins/crm/composer.lock +++ b/projects/plugins/crm/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -57,6 +57,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -78,7 +82,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -116,6 +120,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -142,7 +150,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -175,6 +183,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -199,7 +210,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -232,6 +243,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -589,7 +603,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -633,6 +647,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/crm/tests/php/bootstrap.php b/projects/plugins/crm/tests/php/bootstrap.php index 11faf2c1daf38..34eb2b1006bd9 100644 --- a/projects/plugins/crm/tests/php/bootstrap.php +++ b/projects/plugins/crm/tests/php/bootstrap.php @@ -19,13 +19,13 @@ * Locate WordPress or wordpress-develop. We look in several places. */ if ( defined( 'WP_DEV_LOCATION' ) ) { - $test_root = WP_DEVELOP_DIR; + $test_root = WORDPRESS_DEVELOP_DIR; if ( file_exists( "$test_root/tests/phpunit/" ) ) { $test_root .= '/tests/phpunit/'; } -} elseif ( false !== getenv( 'WP_DEVELOP_DIR' ) ) { +} elseif ( false !== getenv( 'WORDPRESS_DEVELOP_DIR' ) ) { // Jetpack Monorepo environment variable defined on command line. - $test_root = getenv( 'WP_DEVELOP_DIR' ); + $test_root = getenv( 'WORDPRESS_DEVELOP_DIR' ); if ( file_exists( "$test_root/tests/phpunit/" ) ) { $test_root .= '/tests/phpunit/'; } @@ -52,7 +52,7 @@ <<<'EOF' Failed to automatically locate WordPress or wordpress-develop to run tests. -Set the WP_DEVELOP_DIR environment variable to point to a copy of WordPress +Set the WORDPRESS_DEVELOP_DIR environment variable to point to a copy of WordPress or wordpress-develop. EOF diff --git a/projects/plugins/debug-helper/changelog/restore-jp_test_coverage b/projects/plugins/debug-helper/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/debug-helper/changelog/restore-jp_test_coverage @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/debug-helper/composer.lock b/projects/plugins/debug-helper/composer.lock index 456af7d2233ad..2fc5052a16d54 100644 --- a/projects/plugins/debug-helper/composer.lock +++ b/projects/plugins/debug-helper/composer.lock @@ -13,7 +13,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -57,6 +57,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -851,7 +854,7 @@ }, "prefer-stable": true, "prefer-lowest": false, - "platform": {}, - "platform-dev": {}, + "platform": [], + "platform-dev": [], "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/inspect/changelog/restore-jp_test_coverage b/projects/plugins/inspect/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/inspect/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/inspect/changelog/restore-jp_test_coverage#2 b/projects/plugins/inspect/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/inspect/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/inspect/composer.json b/projects/plugins/inspect/composer.json index 39ef0813fe4aa..d9d7b61da8fda 100644 --- a/projects/plugins/inspect/composer.json +++ b/projects/plugins/inspect/composer.json @@ -38,6 +38,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/inspect/composer.lock b/projects/plugins/inspect/composer.lock index 97bd9880bb999..6d8593c8e3320 100644 --- a/projects/plugins/inspect/composer.lock +++ b/projects/plugins/inspect/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -228,6 +238,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -254,7 +268,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -287,6 +301,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -383,7 +400,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -454,6 +471,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -472,7 +492,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -505,6 +525,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -523,7 +546,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -557,6 +580,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -575,7 +601,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -608,6 +634,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -626,7 +655,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -669,6 +698,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -689,7 +721,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -733,6 +765,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/jetpack/changelog/restore-jp_test_coverage b/projects/plugins/jetpack/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..dfe2b099535f3 --- /dev/null +++ b/projects/plugins/jetpack/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: other + +Enable test coverage. diff --git a/projects/plugins/jetpack/changelog/restore-jp_test_coverage#2 b/projects/plugins/jetpack/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..a1c1831fa1ef7 --- /dev/null +++ b/projects/plugins/jetpack/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Updated composer.lock. + + diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json index f29ee3bc67532..d0036075884b4 100644 --- a/projects/plugins/jetpack/composer.json +++ b/projects/plugins/jetpack/composer.json @@ -69,6 +69,10 @@ "phpunit": [ "tests/action-phpunit.sh" ], + "test-coverage": [ + "@php tools/build-module-headings-translations.php", + "tests/action-test-coverage.sh" + ], "test-js": [ "pnpm concurrently 'pnpm:compile-ts' 'pnpm:test-adminpage' 'pnpm:test-extensions'" ], diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index 6d59b8cc740a6..ffef9f61034cc 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -228,6 +238,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -254,7 +268,7 @@ "dist": { "type": "path", "url": "../../packages/backup", - "reference": "952a01e67d1f63be1f900fb8bcb1869b1c53133a" + "reference": "ef240489faeb9ddc3b44acaf44316f05a29c4827" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -304,6 +318,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -341,7 +359,7 @@ "dist": { "type": "path", "url": "../../packages/backup-helper-script-manager", - "reference": "460d4932cc27b84f375cb04f47691faeb57d67ad" + "reference": "6deb369a4b4428f1de5b7ddddc0030d4703c741f" }, "require": { "php": ">=7.0" @@ -374,6 +392,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -398,7 +419,7 @@ "dist": { "type": "path", "url": "../../packages/blaze", - "reference": "57fb7e43c9c75b2dc852691be9ffa36f7884edbf" + "reference": "71b04e583722804cbeaf08a6d917b5cafa308ddd" }, "require": { "automattic/jetpack-assets": "@dev", @@ -442,6 +463,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -476,7 +500,7 @@ "dist": { "type": "path", "url": "../../packages/blocks", - "reference": "2d1b34d2e22edcee8f156d75a0d5782e4c29d9a2" + "reference": "e2907b37eb662b6c2c9b436991ea7170105c15f5" }, "require": { "automattic/jetpack-constants": "@dev", @@ -517,6 +541,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -535,7 +562,7 @@ "dist": { "type": "path", "url": "../../packages/boost-core", - "reference": "254e450eefc86995a797518cc1cbc041f1509222" + "reference": "0d76871d95374578c913f7b00506a651c1bd444a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -570,6 +597,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -600,7 +630,7 @@ "dist": { "type": "path", "url": "../../packages/boost-speed-score", - "reference": "6d24ca9aca1b0cda4e925bbe6dcaad4bbd3a16be" + "reference": "6441f54b5026dd6520e94e183ab3608f673170b7" }, "require": { "automattic/jetpack-boost-core": "@dev", @@ -643,6 +673,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -673,7 +706,7 @@ "dist": { "type": "path", "url": "../../packages/classic-theme-helper", - "reference": "7e41cb31355e36d266e20ce88bf6da892947cda5" + "reference": "c95e743aecbe2e79c24dfd5e2f2169b46f2bc334" }, "require": { "automattic/jetpack-assets": "@dev", @@ -723,6 +756,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -778,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -811,6 +847,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -907,7 +946,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -978,6 +1017,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -996,7 +1038,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -1029,6 +1071,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1047,7 +1092,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -1079,6 +1124,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1097,7 +1145,7 @@ "dist": { "type": "path", "url": "../../packages/error", - "reference": "6fa9bb23ca4fe24284149ca750e6148621139517" + "reference": "26ce4c58c188ea9994e767b7d5dfa445aa6aa7d8" }, "require": { "php": ">=7.0" @@ -1129,6 +1177,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1147,7 +1198,7 @@ "dist": { "type": "path", "url": "../../packages/explat", - "reference": "d53b06a5550c6f8c2f009c183b5ab037e6c648c5" + "reference": "6228d5aa0f7e9bf6e5b330d28f06bacd3a3eed2f" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1184,11 +1235,15 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], "test-js": [ - "echo 'Run `pnpm run test` when ready'" + "pnpm run test" ], "test-js-watch": [ "Composer\\Config::disableProcessTimeout", @@ -1219,7 +1274,7 @@ "dist": { "type": "path", "url": "../../packages/forms", - "reference": "63b9e5f845df2ee57e412f02312703a532e0b7c0" + "reference": "1760f0585d21ea45513ee9a757295096c345f70b" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1263,6 +1318,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -1300,7 +1359,7 @@ "dist": { "type": "path", "url": "../../packages/image-cdn", - "reference": "63a179625ebed6c7e5d21ddfb1949983e16dda4d" + "reference": "75c09d8d9d05952fec322b759883c794a1961b72" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1339,6 +1398,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1363,7 +1425,7 @@ "dist": { "type": "path", "url": "../../packages/import", - "reference": "5b2ce5d8cf7f355b792b2bfd8fa2e0cd4ec9a83d" + "reference": "cfedef52df8d76d3757db8b09a4f8e15f4fe0c50" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1402,6 +1464,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1432,7 +1497,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -1469,6 +1534,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1487,7 +1555,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "695db30039999154283059f6b2fe34fff746cd25" + "reference": "ef00dfdc717329690ecfc727e44fd48fbaabf8db" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1537,6 +1605,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1559,7 +1630,7 @@ "dist": { "type": "path", "url": "../../packages/licensing", - "reference": "2507ac1d1f2bbc7a12e8dddb1cb9fa3f9423d8d7" + "reference": "949c6fbd0e9346d5e91680f9f6da132a24a4a8d5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1600,6 +1671,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1618,7 +1692,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -1650,6 +1724,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1668,7 +1745,7 @@ "dist": { "type": "path", "url": "../../packages/masterbar", - "reference": "ddf74ee40ebf515961a93be34f48fb966f70b454" + "reference": "59a0011b2fb19ab9e3edddf629299be8c5a69891" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1728,6 +1805,10 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "pnpm run build-production", + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "pnpm run build-production", "@composer phpunit" @@ -1747,7 +1828,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "bd64433575233a1be4480fcbd6a8113bfa29ccc0" + "reference": "f809fc6bc9b1403bb812c92c5fb46eee463862df" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1807,6 +1888,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -1848,7 +1933,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -1882,6 +1967,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1906,7 +1994,7 @@ "dist": { "type": "path", "url": "../../packages/plans", - "reference": "5b2084083304385b29ab96840abf799afd0f79c2" + "reference": "83a76735261947e6d0b3771fc968fdd6da5d78e9" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1941,6 +2029,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1971,7 +2062,7 @@ "dist": { "type": "path", "url": "../../packages/plugins-installer", - "reference": "94f77ef5fa17584be1cf6ff0f3157c78ca888e31" + "reference": "15654227d052d7318b63d25957ba6723477861af" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -2006,6 +2097,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -2024,7 +2118,7 @@ "dist": { "type": "path", "url": "../../packages/post-list", - "reference": "31b15eb96fcb892ced260b76d1b861a0d23165e7" + "reference": "2208c2b164c53717777a4f58c25dceb7c0e2c7de" }, "require": { "automattic/jetpack-assets": "@dev", @@ -2062,6 +2156,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -2086,7 +2183,7 @@ "dist": { "type": "path", "url": "../../packages/protect-models", - "reference": "3bf84c840bde41d41a4daa6652ccac08916e0c90" + "reference": "48670a4012c8f67e9000683cf65028af8039b446" }, "require": { "php": ">=7.0" @@ -2129,6 +2226,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -2153,7 +2253,7 @@ "dist": { "type": "path", "url": "../../packages/protect-status", - "reference": "c0092882367ee3ef1a30326ac0dbb058d0adc5e3" + "reference": "9dabf575a041aaebd50c7a2c4c16cd00668e64c5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -2207,6 +2307,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -2225,7 +2328,7 @@ "dist": { "type": "path", "url": "../../packages/publicize", - "reference": "1fc54eab768a14c867ab64b3a5b169c662bb6b77" + "reference": "32b07ce610ff0680e1fdcc2f3cc741f34584a4bb" }, "require": { "automattic/jetpack-assets": "@dev", @@ -2269,6 +2372,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -2303,7 +2409,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -2337,6 +2443,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -2355,7 +2464,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -2388,6 +2497,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -2406,7 +2518,7 @@ "dist": { "type": "path", "url": "../../packages/search", - "reference": "4a9b9673c10487fd58880b66e58c0be16170a4f5" + "reference": "cb9e5dc02cfacaa70c067d86b2489f2c09fdbbe1" }, "require": { "automattic/jetpack-assets": "@dev", @@ -2460,6 +2572,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -2491,7 +2607,7 @@ "dist": { "type": "path", "url": "../../packages/stats", - "reference": "d532b2e0e9034ea1bedf2be0f16b2eb69d776713" + "reference": "8da042cf8fa4f8f17915bfd72f5b21b6380c2887" }, "require": { "automattic/jetpack-connection": "@dev", @@ -2531,6 +2647,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -2555,7 +2674,7 @@ "dist": { "type": "path", "url": "../../packages/stats-admin", - "reference": "630e6fb00f151665ac79b3431ebecb7886a5f1be" + "reference": "b4e16709a3c7b8a04719eb779bdd3b9bcd76bedd" }, "require": { "automattic/jetpack-connection": "@dev", @@ -2595,6 +2714,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -2625,7 +2747,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -2668,6 +2790,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -2686,7 +2811,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -2737,6 +2862,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -2761,7 +2889,7 @@ "dist": { "type": "path", "url": "../../packages/videopress", - "reference": "d1d13e7078cf764ebd17b136992f2f575930df33" + "reference": "2312499aaf6108bcc14c37e7da5c131fa1345e12" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -2804,6 +2932,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -2841,7 +2973,7 @@ "dist": { "type": "path", "url": "../../packages/waf", - "reference": "44068e3c71aa5634458967a6191535ba25c51639" + "reference": "385276493d3372f67b88052ff5ad830153c2bac0" }, "require": { "automattic/jetpack-connection": "@dev", @@ -2890,6 +3022,10 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/integration/clover.xml\" --configuration tests/php/integration/phpunit.xml.dist", + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/unit/clover.xml\" --configuration tests/php/unit/phpunit.xml.dist" + ], "test-coverage-html": [ "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist", "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist" @@ -2912,7 +3048,7 @@ "dist": { "type": "path", "url": "../../packages/wordads", - "reference": "d401d5dee453857997f670c11352a6c85e62ee3d" + "reference": "6b5b4342be64f2aae319e851b7d65c285c79e03c" }, "require": { "automattic/jetpack-assets": "@dev", @@ -2963,6 +3099,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -2988,7 +3128,7 @@ "dist": { "type": "path", "url": "../../packages/woocommerce-analytics", - "reference": "595f8f553e413545332fc516dfe8503f2fc6fb97" + "reference": "7b74b9579da94f220322f0f3233b0ff23ba8ca2f" }, "require": { "automattic/jetpack-connection": "@dev", @@ -3026,6 +3166,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -3231,7 +3374,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -3275,6 +3418,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -3305,7 +3451,7 @@ "dist": { "type": "path", "url": "../../packages/patchwork-redefine-exit", - "reference": "8746e7b07685991b1b6e8dbc37c8a6f7f13e013d" + "reference": "c7ba969eedd1ab11ce44750502f6ff970d6e3764" }, "require": { "antecedent/patchwork": "^2.1", @@ -3335,6 +3481,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/plugins/jetpack/tests/action-test-coverage.sh b/projects/plugins/jetpack/tests/action-test-coverage.sh new file mode 100755 index 0000000000000..c0e842a8b1ad4 --- /dev/null +++ b/projects/plugins/jetpack/tests/action-test-coverage.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +set -eo pipefail + +echo "::group::Jetpack Admimnpage coverage" +pnpm run test-client --coverage --collectCoverageFrom='_inc/client/state/**/*.js' --coverageDirectory="$COVERAGE_DIR/client" --coverageReporters=clover +pnpm run test-gui --coverage --collectCoverageFrom='_inc/client/**/*.js' --coverageDirectory="$COVERAGE_DIR/gui" --coverageReporters=clover +echo "::endgroup::" + +echo "::group::Jetpack Extensions coverage" +pnpm run test-extensions --coverage --collectCoverageFrom='extensions/**/*.js' --coverageDirectory="$COVERAGE_DIR/extensions" --coverageReporters=clover +echo "::endgroup::" + +echo "::group::Jetpack Backend coverage" +php -dpcov.directory=. "$(command -v phpunit)" --coverage-clover "$COVERAGE_DIR/backend/clover.xml" +echo "::endgroup::" + +echo "::group::Jetpack Legacy full sync coverage" +LEGACY_FULL_SYNC=1 php -dpcov.directory=. "$(command -v phpunit)" --group=legacy-full-sync --coverage-clover "$COVERAGE_DIR/legacy-sync/clover.xml" +echo "::endgroup::" + +echo "::group::Jetpack Multisite coverage" +WP_MULTISITE=1 php -dpcov.directory=. "$(command -v phpunit)" -c tests/php.multisite.xml --coverage-clover "$COVERAGE_DIR/multisite/clover.xml" +echo "::endgroup::" diff --git a/projects/plugins/jetpack/tests/jest.config.client.js b/projects/plugins/jetpack/tests/jest.config.client.js index 8edc562d3967b..d898bd8095aa1 100644 --- a/projects/plugins/jetpack/tests/jest.config.client.js +++ b/projects/plugins/jetpack/tests/jest.config.client.js @@ -4,4 +4,5 @@ module.exports = { ...baseConfig, roots: [ '/_inc/client/state/', '/_inc/client/lib/', '/modules/' ], setupFilesAfterEnv: [ ...baseConfig.setupFilesAfterEnv, '/tests/jest-globals.gui.js' ], + coverageDirectory: 'coverage/client', }; diff --git a/projects/plugins/jetpack/tests/jest.config.extensions.js b/projects/plugins/jetpack/tests/jest.config.extensions.js index 8fc400e7fe9bd..678f8c1416207 100644 --- a/projects/plugins/jetpack/tests/jest.config.extensions.js +++ b/projects/plugins/jetpack/tests/jest.config.extensions.js @@ -3,6 +3,7 @@ const baseConfig = require( './jest.config.base.js' ); module.exports = { ...baseConfig, roots: [ '/extensions/' ], + coverageDirectory: 'coverage/extensions', setupFiles: [ ...baseConfig.setupFiles, '/tests/jest-globals.extensions.js' ], testPathIgnorePatterns: [ ...baseConfig.testPathIgnorePatterns, diff --git a/projects/plugins/jetpack/tests/jest.config.gui.js b/projects/plugins/jetpack/tests/jest.config.gui.js index bd29dbe3accc8..b5febd664dead 100644 --- a/projects/plugins/jetpack/tests/jest.config.gui.js +++ b/projects/plugins/jetpack/tests/jest.config.gui.js @@ -6,4 +6,5 @@ module.exports = { testMatch: [ '/_inc/client/test/main.js', '/_inc/client/**/test/component.js' ], setupFilesAfterEnv: [ ...baseConfig.setupFilesAfterEnv, '/tests/jest-globals.gui.js' ], transformIgnorePatterns: [ '/node_modules/(?!(.pnpm|@automattic)/)' ], + coverageDirectory: 'coverage/gui', }; diff --git a/projects/plugins/jetpack/tests/php.multisite.xml b/projects/plugins/jetpack/tests/php.multisite.xml index b704db45eb7ad..817548ff19e4c 100644 --- a/projects/plugins/jetpack/tests/php.multisite.xml +++ b/projects/plugins/jetpack/tests/php.multisite.xml @@ -71,15 +71,14 @@ - ../ - - php - ../tests - ../views - ../tools - ../node_modules - ../vendor - + ../*.php + ../3rd-party + ../extensions + ../_inc + ../json-endpoints + ../modules + ../sal + ../src diff --git a/projects/plugins/jetpack/tests/php/bootstrap.php b/projects/plugins/jetpack/tests/php/bootstrap.php index e684daa65fa90..d96e0367f5e5b 100644 --- a/projects/plugins/jetpack/tests/php/bootstrap.php +++ b/projects/plugins/jetpack/tests/php/bootstrap.php @@ -24,12 +24,12 @@ define( 'TESTING_IN_JETPACK', true ); // Support for: -// 1. `WP_DEVELOP_DIR` environment variable. +// 1. `WORDPRESS_DEVELOP_DIR` environment variable. // 2. Plugin installed inside of WordPress.org developer checkout. // 3. Tests checked out to /tmp. -if ( false !== getenv( 'WP_DEVELOP_DIR' ) ) { +if ( false !== getenv( 'WORDPRESS_DEVELOP_DIR' ) ) { // Defined on command line. - $test_root = getenv( 'WP_DEVELOP_DIR' ); + $test_root = getenv( 'WORDPRESS_DEVELOP_DIR' ); if ( file_exists( "$test_root/tests/phpunit/" ) ) { $test_root .= '/tests/phpunit/'; } @@ -56,7 +56,7 @@ <<<'EOF' Failed to automatically locate WordPress or wordpress-develop to run tests. -Set the WP_DEVELOP_DIR environment variable to point to a copy of WordPress +Set the WORDPRESS_DEVELOP_DIR environment variable to point to a copy of WordPress or wordpress-develop. EOF ); @@ -94,6 +94,8 @@ if ( '1' !== getenv( 'JETPACK_TEST_WOOCOMMERCE' ) ) { echo 'To run Jetpack woocommerce tests, prefix phpunit with JETPACK_TEST_WOOCOMMERCE=1' . PHP_EOL; +} elseif ( getenv( 'WORDPRESS_DIR' ) !== false ) { + define( 'JETPACK_WOOCOMMERCE_INSTALL_DIR', getenv( 'WORDPRESS_DIR' ) . '/wp-content/plugins/woocommerce' ); } else { define( 'JETPACK_WOOCOMMERCE_INSTALL_DIR', __DIR__ . '/../../../woocommerce' ); } @@ -130,15 +132,13 @@ function _manually_install_woocommerce() { * Loading required mu-wpcom plugin files to be able to test with all required code. */ function _manually_load_muplugin() { - if ( getenv( 'GITHUB_ACTIONS' ) ) { - - // Using plugin code installed by .github/files/setup-wordpress-env.sh. - require_once __DIR__ . '/../../../../mu-plugins/wpcomsh/wpcomsh.php'; - require_once __DIR__ . '/../../../../mu-plugins/wpcomsh/vendor/autoload.php'; + if ( getenv( 'WORDPRESS_DIR' ) !== false ) { + define( 'JETPACK_WPCOMSH_INSTALL_DIR', getenv( 'WORDPRESS_DIR' ) . '/wp-content/mu-plugins/wpcomsh' ); } else { - require_once __DIR__ . '/../../../wpcomsh/wpcomsh.php'; - require_once __DIR__ . '/../../../wpcomsh/vendor/autoload.php'; + define( 'JETPACK_WPCOMSH_INSTALL_DIR', __DIR__ . '/../../../wpcomsh' ); } + + require_once JETPACK_WPCOMSH_INSTALL_DIR . '/wpcomsh.php'; \Automattic\Jetpack\Jetpack_Mu_Wpcom::init(); defined( 'WPCOMSH_PREMIUM_THEMES_PATH' ) || define( 'WPCOMSH_PREMIUM_THEMES_PATH', sys_get_temp_dir() . '/premium' ); diff --git a/projects/plugins/migration/changelog/restore-jp_test_coverage b/projects/plugins/migration/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/migration/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/migration/changelog/restore-jp_test_coverage#2 b/projects/plugins/migration/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/migration/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/migration/composer.json b/projects/plugins/migration/composer.json index 4d5c7160597ae..45d3add2283a7 100644 --- a/projects/plugins/migration/composer.json +++ b/projects/plugins/migration/composer.json @@ -28,6 +28,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock index 4d91ae45d60e6..a490ada8004fd 100644 --- a/projects/plugins/migration/composer.lock +++ b/projects/plugins/migration/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -228,6 +238,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -254,7 +268,7 @@ "dist": { "type": "path", "url": "../../packages/backup", - "reference": "952a01e67d1f63be1f900fb8bcb1869b1c53133a" + "reference": "ef240489faeb9ddc3b44acaf44316f05a29c4827" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -304,6 +318,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -341,7 +359,7 @@ "dist": { "type": "path", "url": "../../packages/backup-helper-script-manager", - "reference": "460d4932cc27b84f375cb04f47691faeb57d67ad" + "reference": "6deb369a4b4428f1de5b7ddddc0030d4703c741f" }, "require": { "php": ">=7.0" @@ -374,6 +392,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -398,7 +419,7 @@ "dist": { "type": "path", "url": "../../packages/boost-core", - "reference": "254e450eefc86995a797518cc1cbc041f1509222" + "reference": "0d76871d95374578c913f7b00506a651c1bd444a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -433,6 +454,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -463,7 +487,7 @@ "dist": { "type": "path", "url": "../../packages/boost-speed-score", - "reference": "6d24ca9aca1b0cda4e925bbe6dcaad4bbd3a16be" + "reference": "6441f54b5026dd6520e94e183ab3608f673170b7" }, "require": { "automattic/jetpack-boost-core": "@dev", @@ -506,6 +530,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -536,7 +563,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -569,6 +596,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -665,7 +695,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -736,6 +766,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -754,7 +787,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -787,6 +820,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -805,7 +841,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -837,6 +873,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -855,7 +894,7 @@ "dist": { "type": "path", "url": "../../packages/explat", - "reference": "d53b06a5550c6f8c2f009c183b5ab037e6c648c5" + "reference": "6228d5aa0f7e9bf6e5b330d28f06bacd3a3eed2f" }, "require": { "automattic/jetpack-connection": "@dev", @@ -892,11 +931,15 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], "test-js": [ - "echo 'Run `pnpm run test` when ready'" + "pnpm run test" ], "test-js-watch": [ "Composer\\Config::disableProcessTimeout", @@ -927,7 +970,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -964,6 +1007,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -982,7 +1028,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "695db30039999154283059f6b2fe34fff746cd25" + "reference": "ef00dfdc717329690ecfc727e44fd48fbaabf8db" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1032,6 +1078,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1054,7 +1103,7 @@ "dist": { "type": "path", "url": "../../packages/licensing", - "reference": "2507ac1d1f2bbc7a12e8dddb1cb9fa3f9423d8d7" + "reference": "949c6fbd0e9346d5e91680f9f6da132a24a4a8d5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1095,6 +1144,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1113,7 +1165,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -1145,6 +1197,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1163,7 +1218,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "bd64433575233a1be4480fcbd6a8113bfa29ccc0" + "reference": "f809fc6bc9b1403bb812c92c5fb46eee463862df" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1223,6 +1278,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -1264,7 +1323,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -1298,6 +1357,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1322,7 +1384,7 @@ "dist": { "type": "path", "url": "../../packages/plans", - "reference": "5b2084083304385b29ab96840abf799afd0f79c2" + "reference": "83a76735261947e6d0b3771fc968fdd6da5d78e9" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1357,6 +1419,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1387,7 +1452,7 @@ "dist": { "type": "path", "url": "../../packages/plugins-installer", - "reference": "94f77ef5fa17584be1cf6ff0f3157c78ca888e31" + "reference": "15654227d052d7318b63d25957ba6723477861af" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1422,6 +1487,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1440,7 +1508,7 @@ "dist": { "type": "path", "url": "../../packages/protect-models", - "reference": "3bf84c840bde41d41a4daa6652ccac08916e0c90" + "reference": "48670a4012c8f67e9000683cf65028af8039b446" }, "require": { "php": ">=7.0" @@ -1483,6 +1551,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1507,7 +1578,7 @@ "dist": { "type": "path", "url": "../../packages/protect-status", - "reference": "c0092882367ee3ef1a30326ac0dbb058d0adc5e3" + "reference": "9dabf575a041aaebd50c7a2c4c16cd00668e64c5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1561,6 +1632,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1579,7 +1653,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -1613,6 +1687,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1631,7 +1708,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -1664,6 +1741,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1682,7 +1762,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1725,6 +1805,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1743,7 +1826,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1794,6 +1877,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1820,7 +1906,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -1864,6 +1950,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/mu-wpcom-plugin/changelog/restore-jp_test_coverage b/projects/plugins/mu-wpcom-plugin/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/mu-wpcom-plugin/changelog/restore-jp_test_coverage#2 b/projects/plugins/mu-wpcom-plugin/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json index f184ad9c61269..fc5f8857a8c0a 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.json +++ b/projects/plugins/mu-wpcom-plugin/composer.json @@ -19,6 +19,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index 505cc88d5c96c..a7bb2c7cdb741 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/blaze", - "reference": "57fb7e43c9c75b2dc852691be9ffa36f7884edbf" + "reference": "71b04e583722804cbeaf08a6d917b5cafa308ddd" }, "require": { "automattic/jetpack-assets": "@dev", @@ -234,6 +244,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -268,7 +281,7 @@ "dist": { "type": "path", "url": "../../packages/blocks", - "reference": "2d1b34d2e22edcee8f156d75a0d5782e4c29d9a2" + "reference": "e2907b37eb662b6c2c9b436991ea7170105c15f5" }, "require": { "automattic/jetpack-constants": "@dev", @@ -309,6 +322,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -327,7 +343,7 @@ "dist": { "type": "path", "url": "../../packages/calypsoify", - "reference": "bf4224d3bace32c6c3d2dc46f577ce3a797ddccf" + "reference": "cc5f347ee962e7e58563f9f2ef27b3b589b9819a" }, "require": { "automattic/jetpack-assets": "@dev", @@ -371,6 +387,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -389,7 +408,7 @@ "dist": { "type": "path", "url": "../../packages/classic-theme-helper", - "reference": "7e41cb31355e36d266e20ce88bf6da892947cda5" + "reference": "c95e743aecbe2e79c24dfd5e2f2169b46f2bc334" }, "require": { "automattic/jetpack-assets": "@dev", @@ -439,6 +458,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -494,7 +516,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -565,6 +587,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -583,7 +608,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -616,6 +641,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -634,7 +662,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -666,6 +694,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -684,7 +715,7 @@ "dist": { "type": "path", "url": "../../packages/google-analytics", - "reference": "5bc4388024109352223bf9fa592afab0334c41b9" + "reference": "b6044445bdc95baa339ef0187432d6265028e790" }, "require": { "automattic/jetpack-status": "@dev", @@ -728,6 +759,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -752,7 +786,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -789,6 +823,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -807,7 +844,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "695db30039999154283059f6b2fe34fff746cd25" + "reference": "ef00dfdc717329690ecfc727e44fd48fbaabf8db" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -857,6 +894,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -879,7 +919,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -911,6 +951,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -929,7 +972,7 @@ "dist": { "type": "path", "url": "../../packages/masterbar", - "reference": "ddf74ee40ebf515961a93be34f48fb966f70b454" + "reference": "59a0011b2fb19ab9e3edddf629299be8c5a69891" }, "require": { "automattic/jetpack-assets": "@dev", @@ -989,6 +1032,10 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "pnpm run build-production", + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "pnpm run build-production", "@composer phpunit" @@ -1008,7 +1055,7 @@ "dist": { "type": "path", "url": "../../packages/jetpack-mu-wpcom", - "reference": "15cf4437fdb21df3bf5840f6f0a0811f1b5b36ed" + "reference": "aaab7731004712dd489b3dc32cce6ccbdbf780ff" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1058,6 +1105,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1088,7 +1138,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -1122,6 +1172,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1146,7 +1199,7 @@ "dist": { "type": "path", "url": "../../packages/plans", - "reference": "5b2084083304385b29ab96840abf799afd0f79c2" + "reference": "83a76735261947e6d0b3771fc968fdd6da5d78e9" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1181,6 +1234,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1211,7 +1267,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -1245,6 +1301,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1263,7 +1322,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -1296,6 +1355,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1314,7 +1376,7 @@ "dist": { "type": "path", "url": "../../packages/stats", - "reference": "d532b2e0e9034ea1bedf2be0f16b2eb69d776713" + "reference": "8da042cf8fa4f8f17915bfd72f5b21b6380c2887" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1354,6 +1416,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1378,7 +1443,7 @@ "dist": { "type": "path", "url": "../../packages/stats-admin", - "reference": "630e6fb00f151665ac79b3431ebecb7886a5f1be" + "reference": "b4e16709a3c7b8a04719eb779bdd3b9bcd76bedd" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1418,6 +1483,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1448,7 +1516,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1491,6 +1559,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1509,7 +1580,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1560,6 +1631,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1584,7 +1658,7 @@ "dist": { "type": "path", "url": "../../packages/scheduled-updates", - "reference": "e813d248b535b3d4cbe9f4cf1640ad48f8910ef3" + "reference": "d249199e4fb600c2af55267e6733d6ea531ec2df" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1627,6 +1701,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1733,7 +1810,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -1777,6 +1854,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/protect/changelog/restore-jp_test_coverage b/projects/plugins/protect/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/protect/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/protect/changelog/restore-jp_test_coverage#2 b/projects/plugins/protect/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/protect/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/protect/composer.json b/projects/plugins/protect/composer.json index f596dd2a423e3..8b56a9d06ff17 100644 --- a/projects/plugins/protect/composer.json +++ b/projects/plugins/protect/composer.json @@ -33,6 +33,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock index b78911016670e..1ac9ebb02bada 100644 --- a/projects/plugins/protect/composer.lock +++ b/projects/plugins/protect/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -228,6 +238,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -254,7 +268,7 @@ "dist": { "type": "path", "url": "../../packages/backup-helper-script-manager", - "reference": "460d4932cc27b84f375cb04f47691faeb57d67ad" + "reference": "6deb369a4b4428f1de5b7ddddc0030d4703c741f" }, "require": { "php": ">=7.0" @@ -287,6 +301,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -311,7 +328,7 @@ "dist": { "type": "path", "url": "../../packages/boost-core", - "reference": "254e450eefc86995a797518cc1cbc041f1509222" + "reference": "0d76871d95374578c913f7b00506a651c1bd444a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -346,6 +363,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -376,7 +396,7 @@ "dist": { "type": "path", "url": "../../packages/boost-speed-score", - "reference": "6d24ca9aca1b0cda4e925bbe6dcaad4bbd3a16be" + "reference": "6441f54b5026dd6520e94e183ab3608f673170b7" }, "require": { "automattic/jetpack-boost-core": "@dev", @@ -419,6 +439,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -449,7 +472,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -482,6 +505,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -578,7 +604,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -649,6 +675,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -667,7 +696,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -700,6 +729,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -718,7 +750,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -750,6 +782,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -768,7 +803,7 @@ "dist": { "type": "path", "url": "../../packages/explat", - "reference": "d53b06a5550c6f8c2f009c183b5ab037e6c648c5" + "reference": "6228d5aa0f7e9bf6e5b330d28f06bacd3a3eed2f" }, "require": { "automattic/jetpack-connection": "@dev", @@ -805,11 +840,15 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], "test-js": [ - "echo 'Run `pnpm run test` when ready'" + "pnpm run test" ], "test-js-watch": [ "Composer\\Config::disableProcessTimeout", @@ -840,7 +879,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -877,6 +916,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -895,7 +937,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "695db30039999154283059f6b2fe34fff746cd25" + "reference": "ef00dfdc717329690ecfc727e44fd48fbaabf8db" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -945,6 +987,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -967,7 +1012,7 @@ "dist": { "type": "path", "url": "../../packages/licensing", - "reference": "2507ac1d1f2bbc7a12e8dddb1cb9fa3f9423d8d7" + "reference": "949c6fbd0e9346d5e91680f9f6da132a24a4a8d5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1008,6 +1053,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1026,7 +1074,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -1058,6 +1106,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1076,7 +1127,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "bd64433575233a1be4480fcbd6a8113bfa29ccc0" + "reference": "f809fc6bc9b1403bb812c92c5fb46eee463862df" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1136,6 +1187,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -1177,7 +1232,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -1211,6 +1266,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1235,7 +1293,7 @@ "dist": { "type": "path", "url": "../../packages/plans", - "reference": "5b2084083304385b29ab96840abf799afd0f79c2" + "reference": "83a76735261947e6d0b3771fc968fdd6da5d78e9" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1270,6 +1328,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1300,7 +1361,7 @@ "dist": { "type": "path", "url": "../../packages/plugins-installer", - "reference": "94f77ef5fa17584be1cf6ff0f3157c78ca888e31" + "reference": "15654227d052d7318b63d25957ba6723477861af" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1335,6 +1396,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1353,7 +1417,7 @@ "dist": { "type": "path", "url": "../../packages/protect-models", - "reference": "3bf84c840bde41d41a4daa6652ccac08916e0c90" + "reference": "48670a4012c8f67e9000683cf65028af8039b446" }, "require": { "php": ">=7.0" @@ -1396,6 +1460,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1420,7 +1487,7 @@ "dist": { "type": "path", "url": "../../packages/protect-status", - "reference": "c0092882367ee3ef1a30326ac0dbb058d0adc5e3" + "reference": "9dabf575a041aaebd50c7a2c4c16cd00668e64c5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1474,6 +1541,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1492,7 +1562,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -1526,6 +1596,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1544,7 +1617,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -1577,6 +1650,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1595,7 +1671,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1638,6 +1714,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1656,7 +1735,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1707,6 +1786,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1731,7 +1813,7 @@ "dist": { "type": "path", "url": "../../packages/transport-helper", - "reference": "b05407d43a7387af9d657bc8b462012c5458cf39" + "reference": "34a35cef694bce33f1e343c4770537f42d4b07e4" }, "require": { "automattic/jetpack-backup-helper-script-manager": "@dev", @@ -1773,6 +1855,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1803,7 +1888,7 @@ "dist": { "type": "path", "url": "../../packages/waf", - "reference": "44068e3c71aa5634458967a6191535ba25c51639" + "reference": "385276493d3372f67b88052ff5ad830153c2bac0" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1852,6 +1937,10 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/integration/clover.xml\" --configuration tests/php/integration/phpunit.xml.dist", + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/unit/clover.xml\" --configuration tests/php/unit/phpunit.xml.dist" + ], "test-coverage-html": [ "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/integration/phpunit.xml.dist", "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-html ./coverage --configuration tests/php/unit/phpunit.xml.dist" @@ -1927,7 +2016,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -1971,6 +2060,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/search/changelog/restore-jp_test_coverage b/projects/plugins/search/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/search/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/search/changelog/restore-jp_test_coverage#2 b/projects/plugins/search/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/search/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/search/composer.json b/projects/plugins/search/composer.json index 12137eea440cc..9660e9af4abba 100644 --- a/projects/plugins/search/composer.json +++ b/projects/plugins/search/composer.json @@ -27,6 +27,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock index 4418c15278842..6ca1683f43538 100644 --- a/projects/plugins/search/composer.lock +++ b/projects/plugins/search/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -228,6 +238,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -254,7 +268,7 @@ "dist": { "type": "path", "url": "../../packages/boost-core", - "reference": "254e450eefc86995a797518cc1cbc041f1509222" + "reference": "0d76871d95374578c913f7b00506a651c1bd444a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -289,6 +303,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -319,7 +336,7 @@ "dist": { "type": "path", "url": "../../packages/boost-speed-score", - "reference": "6d24ca9aca1b0cda4e925bbe6dcaad4bbd3a16be" + "reference": "6441f54b5026dd6520e94e183ab3608f673170b7" }, "require": { "automattic/jetpack-boost-core": "@dev", @@ -362,6 +379,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -392,7 +412,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -425,6 +445,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -521,7 +544,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -592,6 +615,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -610,7 +636,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -643,6 +669,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -661,7 +690,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -693,6 +722,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -711,7 +743,7 @@ "dist": { "type": "path", "url": "../../packages/explat", - "reference": "d53b06a5550c6f8c2f009c183b5ab037e6c648c5" + "reference": "6228d5aa0f7e9bf6e5b330d28f06bacd3a3eed2f" }, "require": { "automattic/jetpack-connection": "@dev", @@ -748,11 +780,15 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], "test-js": [ - "echo 'Run `pnpm run test` when ready'" + "pnpm run test" ], "test-js-watch": [ "Composer\\Config::disableProcessTimeout", @@ -783,7 +819,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -820,6 +856,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -838,7 +877,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "695db30039999154283059f6b2fe34fff746cd25" + "reference": "ef00dfdc717329690ecfc727e44fd48fbaabf8db" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -888,6 +927,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -910,7 +952,7 @@ "dist": { "type": "path", "url": "../../packages/licensing", - "reference": "2507ac1d1f2bbc7a12e8dddb1cb9fa3f9423d8d7" + "reference": "949c6fbd0e9346d5e91680f9f6da132a24a4a8d5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -951,6 +993,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -969,7 +1014,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -1001,6 +1046,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1019,7 +1067,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "bd64433575233a1be4480fcbd6a8113bfa29ccc0" + "reference": "f809fc6bc9b1403bb812c92c5fb46eee463862df" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1079,6 +1127,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -1120,7 +1172,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -1154,6 +1206,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1178,7 +1233,7 @@ "dist": { "type": "path", "url": "../../packages/plans", - "reference": "5b2084083304385b29ab96840abf799afd0f79c2" + "reference": "83a76735261947e6d0b3771fc968fdd6da5d78e9" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1213,6 +1268,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1243,7 +1301,7 @@ "dist": { "type": "path", "url": "../../packages/plugins-installer", - "reference": "94f77ef5fa17584be1cf6ff0f3157c78ca888e31" + "reference": "15654227d052d7318b63d25957ba6723477861af" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1278,6 +1336,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1296,7 +1357,7 @@ "dist": { "type": "path", "url": "../../packages/protect-models", - "reference": "3bf84c840bde41d41a4daa6652ccac08916e0c90" + "reference": "48670a4012c8f67e9000683cf65028af8039b446" }, "require": { "php": ">=7.0" @@ -1339,6 +1400,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1363,7 +1427,7 @@ "dist": { "type": "path", "url": "../../packages/protect-status", - "reference": "c0092882367ee3ef1a30326ac0dbb058d0adc5e3" + "reference": "9dabf575a041aaebd50c7a2c4c16cd00668e64c5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1417,6 +1481,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1435,7 +1502,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -1469,6 +1536,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1487,7 +1557,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -1520,6 +1590,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1538,7 +1611,7 @@ "dist": { "type": "path", "url": "../../packages/search", - "reference": "4a9b9673c10487fd58880b66e58c0be16170a4f5" + "reference": "cb9e5dc02cfacaa70c067d86b2489f2c09fdbbe1" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1592,6 +1665,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -1623,7 +1700,7 @@ "dist": { "type": "path", "url": "../../packages/stats", - "reference": "d532b2e0e9034ea1bedf2be0f16b2eb69d776713" + "reference": "8da042cf8fa4f8f17915bfd72f5b21b6380c2887" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1663,6 +1740,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1687,7 +1767,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1730,6 +1810,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1748,7 +1831,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1799,6 +1882,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1825,7 +1911,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -1869,6 +1955,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/social/changelog/restore-jp_test_coverage b/projects/plugins/social/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/social/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/social/changelog/restore-jp_test_coverage#2 b/projects/plugins/social/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/social/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/social/composer.json b/projects/plugins/social/composer.json index 34b31857e7265..92f43a838d60f 100644 --- a/projects/plugins/social/composer.json +++ b/projects/plugins/social/composer.json @@ -35,6 +35,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock index 71abf37eef397..f13f65d53797a 100644 --- a/projects/plugins/social/composer.lock +++ b/projects/plugins/social/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -228,6 +238,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -254,7 +268,7 @@ "dist": { "type": "path", "url": "../../packages/boost-core", - "reference": "254e450eefc86995a797518cc1cbc041f1509222" + "reference": "0d76871d95374578c913f7b00506a651c1bd444a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -289,6 +303,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -319,7 +336,7 @@ "dist": { "type": "path", "url": "../../packages/boost-speed-score", - "reference": "6d24ca9aca1b0cda4e925bbe6dcaad4bbd3a16be" + "reference": "6441f54b5026dd6520e94e183ab3608f673170b7" }, "require": { "automattic/jetpack-boost-core": "@dev", @@ -362,6 +379,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -392,7 +412,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -425,6 +445,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -521,7 +544,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -592,6 +615,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -610,7 +636,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -643,6 +669,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -661,7 +690,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -693,6 +722,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -711,7 +743,7 @@ "dist": { "type": "path", "url": "../../packages/explat", - "reference": "d53b06a5550c6f8c2f009c183b5ab037e6c648c5" + "reference": "6228d5aa0f7e9bf6e5b330d28f06bacd3a3eed2f" }, "require": { "automattic/jetpack-connection": "@dev", @@ -748,11 +780,15 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], "test-js": [ - "echo 'Run `pnpm run test` when ready'" + "pnpm run test" ], "test-js-watch": [ "Composer\\Config::disableProcessTimeout", @@ -783,7 +819,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -820,6 +856,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -838,7 +877,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "695db30039999154283059f6b2fe34fff746cd25" + "reference": "ef00dfdc717329690ecfc727e44fd48fbaabf8db" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -888,6 +927,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -910,7 +952,7 @@ "dist": { "type": "path", "url": "../../packages/licensing", - "reference": "2507ac1d1f2bbc7a12e8dddb1cb9fa3f9423d8d7" + "reference": "949c6fbd0e9346d5e91680f9f6da132a24a4a8d5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -951,6 +993,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -969,7 +1014,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -1001,6 +1046,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1019,7 +1067,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "bd64433575233a1be4480fcbd6a8113bfa29ccc0" + "reference": "f809fc6bc9b1403bb812c92c5fb46eee463862df" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1079,6 +1127,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -1120,7 +1172,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -1154,6 +1206,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1178,7 +1233,7 @@ "dist": { "type": "path", "url": "../../packages/plans", - "reference": "5b2084083304385b29ab96840abf799afd0f79c2" + "reference": "83a76735261947e6d0b3771fc968fdd6da5d78e9" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1213,6 +1268,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1243,7 +1301,7 @@ "dist": { "type": "path", "url": "../../packages/plugins-installer", - "reference": "94f77ef5fa17584be1cf6ff0f3157c78ca888e31" + "reference": "15654227d052d7318b63d25957ba6723477861af" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1278,6 +1336,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1296,7 +1357,7 @@ "dist": { "type": "path", "url": "../../packages/post-list", - "reference": "31b15eb96fcb892ced260b76d1b861a0d23165e7" + "reference": "2208c2b164c53717777a4f58c25dceb7c0e2c7de" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1334,6 +1395,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1358,7 +1422,7 @@ "dist": { "type": "path", "url": "../../packages/protect-models", - "reference": "3bf84c840bde41d41a4daa6652ccac08916e0c90" + "reference": "48670a4012c8f67e9000683cf65028af8039b446" }, "require": { "php": ">=7.0" @@ -1401,6 +1465,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1425,7 +1492,7 @@ "dist": { "type": "path", "url": "../../packages/protect-status", - "reference": "c0092882367ee3ef1a30326ac0dbb058d0adc5e3" + "reference": "9dabf575a041aaebd50c7a2c4c16cd00668e64c5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1479,6 +1546,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1497,7 +1567,7 @@ "dist": { "type": "path", "url": "../../packages/publicize", - "reference": "1fc54eab768a14c867ab64b3a5b169c662bb6b77" + "reference": "32b07ce610ff0680e1fdcc2f3cc741f34584a4bb" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1541,6 +1611,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1575,7 +1648,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -1609,6 +1682,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1627,7 +1703,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -1660,6 +1736,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1678,7 +1757,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1721,6 +1800,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1739,7 +1821,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1790,6 +1872,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1864,7 +1949,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -1908,6 +1993,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/social/package.json b/projects/plugins/social/package.json index a7acc1313b8ef..d3340eb401015 100644 --- a/projects/plugins/social/package.json +++ b/projects/plugins/social/package.json @@ -19,6 +19,7 @@ "build-production-concurrently": "pnpm run clean && concurrently 'NODE_ENV=production BABEL_ENV=production pnpm run build-client' && pnpm run validate", "clean": "rm -rf build/", "test": "jest --passWithNoTests", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "validate": "pnpm exec validate-es build/", "watch": "pnpm run build && webpack watch" }, diff --git a/projects/plugins/starter-plugin/changelog/restore-jp_test_coverage b/projects/plugins/starter-plugin/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/starter-plugin/changelog/restore-jp_test_coverage#2 b/projects/plugins/starter-plugin/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/starter-plugin/composer.json b/projects/plugins/starter-plugin/composer.json index 4812124ae1d53..c540da80988a5 100644 --- a/projects/plugins/starter-plugin/composer.json +++ b/projects/plugins/starter-plugin/composer.json @@ -29,6 +29,13 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], + "test-js": [ + "pnpm run test" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock index aab86dd6d0a4a..7c133c4451b8e 100644 --- a/projects/plugins/starter-plugin/composer.lock +++ b/projects/plugins/starter-plugin/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -228,6 +238,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -254,7 +268,7 @@ "dist": { "type": "path", "url": "../../packages/boost-core", - "reference": "254e450eefc86995a797518cc1cbc041f1509222" + "reference": "0d76871d95374578c913f7b00506a651c1bd444a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -289,6 +303,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -319,7 +336,7 @@ "dist": { "type": "path", "url": "../../packages/boost-speed-score", - "reference": "6d24ca9aca1b0cda4e925bbe6dcaad4bbd3a16be" + "reference": "6441f54b5026dd6520e94e183ab3608f673170b7" }, "require": { "automattic/jetpack-boost-core": "@dev", @@ -362,6 +379,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -392,7 +412,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -425,6 +445,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -521,7 +544,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -592,6 +615,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -610,7 +636,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -643,6 +669,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -661,7 +690,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -693,6 +722,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -711,7 +743,7 @@ "dist": { "type": "path", "url": "../../packages/explat", - "reference": "d53b06a5550c6f8c2f009c183b5ab037e6c648c5" + "reference": "6228d5aa0f7e9bf6e5b330d28f06bacd3a3eed2f" }, "require": { "automattic/jetpack-connection": "@dev", @@ -748,11 +780,15 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], "test-js": [ - "echo 'Run `pnpm run test` when ready'" + "pnpm run test" ], "test-js-watch": [ "Composer\\Config::disableProcessTimeout", @@ -783,7 +819,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -820,6 +856,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -838,7 +877,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "695db30039999154283059f6b2fe34fff746cd25" + "reference": "ef00dfdc717329690ecfc727e44fd48fbaabf8db" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -888,6 +927,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -910,7 +952,7 @@ "dist": { "type": "path", "url": "../../packages/licensing", - "reference": "2507ac1d1f2bbc7a12e8dddb1cb9fa3f9423d8d7" + "reference": "949c6fbd0e9346d5e91680f9f6da132a24a4a8d5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -951,6 +993,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -969,7 +1014,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -1001,6 +1046,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1019,7 +1067,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "bd64433575233a1be4480fcbd6a8113bfa29ccc0" + "reference": "f809fc6bc9b1403bb812c92c5fb46eee463862df" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1079,6 +1127,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -1120,7 +1172,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -1154,6 +1206,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1178,7 +1233,7 @@ "dist": { "type": "path", "url": "../../packages/plans", - "reference": "5b2084083304385b29ab96840abf799afd0f79c2" + "reference": "83a76735261947e6d0b3771fc968fdd6da5d78e9" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1213,6 +1268,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1243,7 +1301,7 @@ "dist": { "type": "path", "url": "../../packages/plugins-installer", - "reference": "94f77ef5fa17584be1cf6ff0f3157c78ca888e31" + "reference": "15654227d052d7318b63d25957ba6723477861af" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1278,6 +1336,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1296,7 +1357,7 @@ "dist": { "type": "path", "url": "../../packages/protect-models", - "reference": "3bf84c840bde41d41a4daa6652ccac08916e0c90" + "reference": "48670a4012c8f67e9000683cf65028af8039b446" }, "require": { "php": ">=7.0" @@ -1339,6 +1400,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1363,7 +1427,7 @@ "dist": { "type": "path", "url": "../../packages/protect-status", - "reference": "c0092882367ee3ef1a30326ac0dbb058d0adc5e3" + "reference": "9dabf575a041aaebd50c7a2c4c16cd00668e64c5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1417,6 +1481,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1435,7 +1502,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -1469,6 +1536,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1487,7 +1557,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -1520,6 +1590,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1538,7 +1611,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1581,6 +1654,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1599,7 +1675,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1650,6 +1726,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1724,7 +1803,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -1768,6 +1847,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/starter-plugin/package.json b/projects/plugins/starter-plugin/package.json index 7b7dad7788731..413c36f4e252d 100644 --- a/projects/plugins/starter-plugin/package.json +++ b/projects/plugins/starter-plugin/package.json @@ -19,6 +19,7 @@ "build-production-concurrently": "pnpm run clean && concurrently 'NODE_ENV=production BABEL_ENV=production pnpm run build-client' && pnpm run validate", "clean": "rm -rf build/", "test": "jest", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover", "validate": "pnpm exec validate-es build/", "watch": "pnpm run build && webpack watch" }, diff --git a/projects/plugins/starter-plugin/src/js/components/admin-page/test/index.test.js b/projects/plugins/starter-plugin/src/js/components/admin-page/test/index.test.js index 269e4e3243727..8183b0c7a52e4 100644 --- a/projects/plugins/starter-plugin/src/js/components/admin-page/test/index.test.js +++ b/projects/plugins/starter-plugin/src/js/components/admin-page/test/index.test.js @@ -23,7 +23,8 @@ describe( 'Admin', () => { .mockReturnValue( { isRegistered: false, isUserConnected: false } ); render( ); - expect( screen.getByLabelText( 'Jetpack Starter Plugin' ) ).toBeInTheDocument(); + // Look for the link in the footer. + expect( screen.getByRole( 'link', { name: 'Jetpack Starter Plugin' } ) ).toBeInTheDocument(); expect( screen.getByRole( 'heading', { name: 'Connection screen title' } ) ).toBeInTheDocument(); diff --git a/projects/plugins/super-cache/changelog/restore-jp_test_coverage b/projects/plugins/super-cache/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/super-cache/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/super-cache/changelog/restore-jp_test_coverage#2 b/projects/plugins/super-cache/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/super-cache/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/super-cache/composer.json b/projects/plugins/super-cache/composer.json index a69e52912ffc2..df663b116ed75 100644 --- a/projects/plugins/super-cache/composer.json +++ b/projects/plugins/super-cache/composer.json @@ -19,6 +19,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/super-cache/composer.lock b/projects/plugins/super-cache/composer.lock index 830bf732ba14b..0ab04e540e032 100644 --- a/projects/plugins/super-cache/composer.lock +++ b/projects/plugins/super-cache/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -64,7 +67,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -108,6 +111,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/vaultpress/changelog/restore-jp_test_coverage b/projects/plugins/vaultpress/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/vaultpress/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/vaultpress/changelog/restore-jp_test_coverage#2 b/projects/plugins/vaultpress/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/vaultpress/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/vaultpress/composer.json b/projects/plugins/vaultpress/composer.json index 5f84bcea52e7c..8cf3546347716 100644 --- a/projects/plugins/vaultpress/composer.json +++ b/projects/plugins/vaultpress/composer.json @@ -19,6 +19,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] diff --git a/projects/plugins/vaultpress/composer.lock b/projects/plugins/vaultpress/composer.lock index 37deff2dc842d..b6ecbeead5c06 100644 --- a/projects/plugins/vaultpress/composer.lock +++ b/projects/plugins/vaultpress/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -50,6 +50,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -76,7 +80,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -108,6 +112,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -128,7 +135,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -172,6 +179,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/videopress/changelog/restore-jp_test_coverage b/projects/plugins/videopress/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/videopress/changelog/restore-jp_test_coverage @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock index 8e27b71ad5e28..7eaa5175e48fc 100644 --- a/projects/plugins/videopress/composer.lock +++ b/projects/plugins/videopress/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -44,6 +44,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -62,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -100,6 +103,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -124,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -169,6 +175,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -190,7 +200,7 @@ "dist": { "type": "path", "url": "../../packages/autoloader", - "reference": "0f56ec98bb673d1b6fe8129b1bbdc0ab7eb30879" + "reference": "b1c5d97a3530a17cbfda5364bddfd5643e133a63" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", @@ -228,6 +238,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"./tests/php/tmp/coverage-report.php\"", + "php ./tests/php/bin/test-coverage.php \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -254,7 +268,7 @@ "dist": { "type": "path", "url": "../../packages/boost-core", - "reference": "254e450eefc86995a797518cc1cbc041f1509222" + "reference": "0d76871d95374578c913f7b00506a651c1bd444a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -289,6 +303,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -319,7 +336,7 @@ "dist": { "type": "path", "url": "../../packages/boost-speed-score", - "reference": "6d24ca9aca1b0cda4e925bbe6dcaad4bbd3a16be" + "reference": "6441f54b5026dd6520e94e183ab3608f673170b7" }, "require": { "automattic/jetpack-boost-core": "@dev", @@ -362,6 +379,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -392,7 +412,7 @@ "dist": { "type": "path", "url": "../../packages/composer-plugin", - "reference": "b6fe2427cac6dd3bbef0a7e915c16bef55ad7c9b" + "reference": "8e349dba030809b6d0fe0640578c44b9131b26cb" }, "require": { "composer-plugin-api": "^2.1.0", @@ -425,6 +445,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -521,7 +544,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -592,6 +615,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -610,7 +636,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -643,6 +669,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -661,7 +690,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -693,6 +722,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -711,7 +743,7 @@ "dist": { "type": "path", "url": "../../packages/explat", - "reference": "d53b06a5550c6f8c2f009c183b5ab037e6c648c5" + "reference": "6228d5aa0f7e9bf6e5b330d28f06bacd3a3eed2f" }, "require": { "automattic/jetpack-connection": "@dev", @@ -748,11 +780,15 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], "test-js": [ - "echo 'Run `pnpm run test` when ready'" + "pnpm run test" ], "test-js-watch": [ "Composer\\Config::disableProcessTimeout", @@ -783,7 +819,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -820,6 +856,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -838,7 +877,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "695db30039999154283059f6b2fe34fff746cd25" + "reference": "ef00dfdc717329690ecfc727e44fd48fbaabf8db" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -888,6 +927,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -910,7 +952,7 @@ "dist": { "type": "path", "url": "../../packages/licensing", - "reference": "2507ac1d1f2bbc7a12e8dddb1cb9fa3f9423d8d7" + "reference": "949c6fbd0e9346d5e91680f9f6da132a24a4a8d5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -951,6 +993,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -969,7 +1014,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -1001,6 +1046,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1019,7 +1067,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "bd64433575233a1be4480fcbd6a8113bfa29ccc0" + "reference": "f809fc6bc9b1403bb812c92c5fb46eee463862df" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1079,6 +1127,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -1120,7 +1172,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -1154,6 +1206,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1178,7 +1233,7 @@ "dist": { "type": "path", "url": "../../packages/plans", - "reference": "5b2084083304385b29ab96840abf799afd0f79c2" + "reference": "83a76735261947e6d0b3771fc968fdd6da5d78e9" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1213,6 +1268,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1243,7 +1301,7 @@ "dist": { "type": "path", "url": "../../packages/plugins-installer", - "reference": "94f77ef5fa17584be1cf6ff0f3157c78ca888e31" + "reference": "15654227d052d7318b63d25957ba6723477861af" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1278,6 +1336,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1296,7 +1357,7 @@ "dist": { "type": "path", "url": "../../packages/protect-models", - "reference": "3bf84c840bde41d41a4daa6652ccac08916e0c90" + "reference": "48670a4012c8f67e9000683cf65028af8039b446" }, "require": { "php": ">=7.0" @@ -1339,6 +1400,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1363,7 +1427,7 @@ "dist": { "type": "path", "url": "../../packages/protect-status", - "reference": "c0092882367ee3ef1a30326ac0dbb058d0adc5e3" + "reference": "9dabf575a041aaebd50c7a2c4c16cd00668e64c5" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1417,6 +1481,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1435,7 +1502,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -1469,6 +1536,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1487,7 +1557,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -1520,6 +1590,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1538,7 +1611,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1581,6 +1654,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1599,7 +1675,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1650,6 +1726,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1674,7 +1753,7 @@ "dist": { "type": "path", "url": "../../packages/videopress", - "reference": "d1d13e7078cf764ebd17b136992f2f575930df33" + "reference": "2312499aaf6108bcc14c37e7da5c131fa1345e12" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1717,6 +1796,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-php": [ "@composer phpunit" ], @@ -1756,7 +1839,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -1800,6 +1883,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/wpcomsh/changelog/restore-jp_test_coverage b/projects/plugins/wpcomsh/changelog/restore-jp_test_coverage new file mode 100644 index 0000000000000..7bb19dc79dd19 --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/restore-jp_test_coverage @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Enable test coverage. diff --git a/projects/plugins/wpcomsh/changelog/restore-jp_test_coverage#2 b/projects/plugins/wpcomsh/changelog/restore-jp_test_coverage#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/restore-jp_test_coverage#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json index 9b8776f99ee99..2fe4795427ec0 100644 --- a/projects/plugins/wpcomsh/composer.json +++ b/projects/plugins/wpcomsh/composer.json @@ -55,6 +55,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock index 1c35a2cc1715c..9fbe495fbff6d 100644 --- a/projects/plugins/wpcomsh/composer.lock +++ b/projects/plugins/wpcomsh/composer.lock @@ -77,7 +77,7 @@ "dist": { "type": "path", "url": "../../packages/a8c-mc-stats", - "reference": "1608695e54d44f088960b6a7bfa0c5779c372ee6" + "reference": "8ea22df0973c8eafa467e95038cc02719269af3a" }, "require": { "php": ">=7.0" @@ -109,6 +109,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -127,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/admin-ui", - "reference": "7330d0d7b9011e4b516c62a87c10d64f1a168eb7" + "reference": "14e0557c0a32cf9a34872b9540be3a1299e9f5ce" }, "require": { "php": ">=7.0" @@ -165,6 +168,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -189,7 +195,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "58de4ea5a64ffa0899cd5903840499c76d253f4b" + "reference": "03ee0fb0731ded8c7d6b9d229e4adc711a45fba1" }, "require": { "automattic/jetpack-constants": "@dev", @@ -234,6 +240,10 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"", + "pnpm run test-coverage" + ], "test-js": [ "pnpm run test" ], @@ -255,7 +265,7 @@ "dist": { "type": "path", "url": "../../packages/blaze", - "reference": "57fb7e43c9c75b2dc852691be9ffa36f7884edbf" + "reference": "71b04e583722804cbeaf08a6d917b5cafa308ddd" }, "require": { "automattic/jetpack-assets": "@dev", @@ -299,6 +309,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -333,7 +346,7 @@ "dist": { "type": "path", "url": "../../packages/blocks", - "reference": "2d1b34d2e22edcee8f156d75a0d5782e4c29d9a2" + "reference": "e2907b37eb662b6c2c9b436991ea7170105c15f5" }, "require": { "automattic/jetpack-constants": "@dev", @@ -374,6 +387,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -392,7 +408,7 @@ "dist": { "type": "path", "url": "../../packages/calypsoify", - "reference": "bf4224d3bace32c6c3d2dc46f577ce3a797ddccf" + "reference": "cc5f347ee962e7e58563f9f2ef27b3b589b9819a" }, "require": { "automattic/jetpack-assets": "@dev", @@ -436,6 +452,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -454,7 +473,7 @@ "dist": { "type": "path", "url": "../../packages/classic-theme-helper", - "reference": "7e41cb31355e36d266e20ce88bf6da892947cda5" + "reference": "c95e743aecbe2e79c24dfd5e2f2169b46f2bc334" }, "require": { "automattic/jetpack-assets": "@dev", @@ -504,6 +523,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -631,7 +653,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "7a548420dc6a883bc3d49b17b110a04caa97713b" + "reference": "becfff0fa6d8a4ecd2d92f8fd701706d4a7c0ece" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -702,6 +724,9 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -720,7 +745,7 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "e58ffa801a8e816c562f15bdc4731824f8f9c64a" + "reference": "b83d8dead652347125900ca87c991819a0a1264a" }, "require": { "php": ">=7.0" @@ -753,6 +778,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -771,7 +799,7 @@ "dist": { "type": "path", "url": "../../packages/device-detection", - "reference": "d97d4ed63b8e702834bb60496f02e99d30197619" + "reference": "5bcf7097be2f52ae49d2fe7a2b2768da2bdbb18c" }, "require": { "php": ">=7.0" @@ -803,6 +831,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -821,7 +852,7 @@ "dist": { "type": "path", "url": "../../packages/google-analytics", - "reference": "5bc4388024109352223bf9fa592afab0334c41b9" + "reference": "b6044445bdc95baa339ef0187432d6265028e790" }, "require": { "automattic/jetpack-status": "@dev", @@ -865,6 +896,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -889,7 +923,7 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "69723619a7d0b3c2eb897e68745e08f346312471" + "reference": "14a64fa02d5439f73cab780bd0d52a9982a8883c" }, "require": { "php": ">=7.0" @@ -926,6 +960,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -944,7 +981,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "695db30039999154283059f6b2fe34fff746cd25" + "reference": "ef00dfdc717329690ecfc727e44fd48fbaabf8db" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -994,6 +1031,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1016,7 +1056,7 @@ "dist": { "type": "path", "url": "../../packages/logo", - "reference": "0cbca46f49b19ea8f252cba7a7c67cf2b222824f" + "reference": "ac2ac7cac40f441d7f724dc5753de00a0cc631ad" }, "require": { "php": ">=7.0" @@ -1048,6 +1088,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1066,7 +1109,7 @@ "dist": { "type": "path", "url": "../../packages/masterbar", - "reference": "ddf74ee40ebf515961a93be34f48fb966f70b454" + "reference": "59a0011b2fb19ab9e3edddf629299be8c5a69891" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1126,6 +1169,10 @@ "post-update-cmd": [ "WorDBless\\Composer\\InstallDropin::copy" ], + "test-coverage": [ + "pnpm run build-production", + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "pnpm run build-production", "@composer phpunit" @@ -1145,7 +1192,7 @@ "dist": { "type": "path", "url": "../../packages/jetpack-mu-wpcom", - "reference": "15cf4437fdb21df3bf5840f6f0a0811f1b5b36ed" + "reference": "aaab7731004712dd489b3dc32cce6ccbdbf780ff" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1195,6 +1242,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1225,7 +1275,7 @@ "dist": { "type": "path", "url": "../../packages/password-checker", - "reference": "b10057021f5d77cc3617afaa2672044e1e8ce1d5" + "reference": "9254c3fb8a0b9cc8a9898087c6272282bfd62604" }, "require": { "php": ">=7.0" @@ -1259,6 +1309,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1283,7 +1336,7 @@ "dist": { "type": "path", "url": "../../packages/plans", - "reference": "5b2084083304385b29ab96840abf799afd0f79c2" + "reference": "83a76735261947e6d0b3771fc968fdd6da5d78e9" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1318,6 +1371,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1348,7 +1404,7 @@ "dist": { "type": "path", "url": "../../packages/post-list", - "reference": "31b15eb96fcb892ced260b76d1b861a0d23165e7" + "reference": "2208c2b164c53717777a4f58c25dceb7c0e2c7de" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1386,6 +1442,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1410,7 +1469,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "3a861643edfc325a9150008bbde9a13d3aa77bb6" + "reference": "b6fa5f90e9229230aa7391a5cb8ddc17a91b3c2d" }, "require": { "automattic/jetpack-status": "@dev", @@ -1444,6 +1503,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1462,7 +1524,7 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "f89c7b97f2a26162f238096d290765510b387458" + "reference": "ded2ead2e70febdba2127670bc0f20061c6f909e" }, "require": { "php": ">=7.0" @@ -1495,6 +1557,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1513,7 +1578,7 @@ "dist": { "type": "path", "url": "../../packages/stats", - "reference": "d532b2e0e9034ea1bedf2be0f16b2eb69d776713" + "reference": "8da042cf8fa4f8f17915bfd72f5b21b6380c2887" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1553,6 +1618,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1577,7 +1645,7 @@ "dist": { "type": "path", "url": "../../packages/stats-admin", - "reference": "630e6fb00f151665ac79b3431ebecb7886a5f1be" + "reference": "b4e16709a3c7b8a04719eb779bdd3b9bcd76bedd" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1617,6 +1685,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1647,7 +1718,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "fb9d7919368d5fcea47f659fa2a7532ada3477a0" + "reference": "70d0f4cff6499640c176bead9c3b87cbfbf4d9c3" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1690,6 +1761,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ] @@ -1708,7 +1782,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ac7496c921263d9ce7eaa77cac67d945c4f30fea" + "reference": "ca3153e904bdb8cf013272d65f2d999819902d45" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1759,6 +1833,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -1783,7 +1860,7 @@ "dist": { "type": "path", "url": "../../packages/scheduled-updates", - "reference": "e813d248b535b3d4cbe9f4cf1640ad48f8910ef3" + "reference": "d249199e4fb600c2af55267e6733d6ea531ec2df" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1826,6 +1903,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], @@ -2078,7 +2158,7 @@ "dist": { "type": "path", "url": "../../packages/changelogger", - "reference": "8489a82ca328626854da99e29f3cb0f017529cb5" + "reference": "18abbbaaac05c85ddf1a95c73dbf46e3a04029bb" }, "require": { "php": ">=7.0", @@ -2122,6 +2202,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ], diff --git a/projects/plugins/wpcomsh/package.json b/projects/plugins/wpcomsh/package.json index 03b799c033107..d0a607741bb4e 100644 --- a/projects/plugins/wpcomsh/package.json +++ b/projects/plugins/wpcomsh/package.json @@ -29,6 +29,7 @@ "build-production-js": "echo 'Not implemented.'", "clean": "true", "test": "jest --bail --ci --verbose", - "test:watch": "jest --verbose --watchAll" + "test:watch": "jest --verbose --watchAll", + "test-coverage": "pnpm run test --coverage --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover" } } diff --git a/projects/plugins/wpcomsh/tests/imports/test-playground-db-importer.php b/projects/plugins/wpcomsh/tests/imports/test-playground-db-importer.php index ece44fcf4bfaf..67d737d9d8675 100644 --- a/projects/plugins/wpcomsh/tests/imports/test-playground-db-importer.php +++ b/projects/plugins/wpcomsh/tests/imports/test-playground-db-importer.php @@ -18,7 +18,7 @@ class PlaygroundDBImporterTest extends WP_UnitTestCase { * * @var string */ - private $tmp_db_path; + private $tmp_db_path = ''; /** * Playground DB Importer instance. diff --git a/tools/cli/commands/dependencies.js b/tools/cli/commands/dependencies.js index 06c9424b6e10c..751526a9f7def 100644 --- a/tools/cli/commands/dependencies.js +++ b/tools/cli/commands/dependencies.js @@ -20,6 +20,7 @@ infrastructureFileSets.base = new Set( [ infrastructureFileSets.test = new Set( [ ...infrastructureFileSets.base, '.github/files/generate-ci-matrix.php', + '.github/files/process-coverage.sh', '.github/files/setup-wordpress-env.sh', '.github/workflows/tests.yml', ] ); diff --git a/tools/cli/commands/generate.js b/tools/cli/commands/generate.js index 8a6f54a01d777..6975fd3026c23 100644 --- a/tools/cli/commands/generate.js +++ b/tools/cli/commands/generate.js @@ -639,6 +639,8 @@ function createPackageJson( packageJson, answers ) { }; packageJson.scripts = { test: 'jest tests', + 'test-coverage': + 'jest tests --coverage --collectCoverageFrom=\'src/**/*.js\' --coverageDirectory="$COVERAGE_DIR/js" --coverageReporters=clover', }; packageJson.devDependencies.jest = findVersionFromPnpmLock( 'jest' ); @@ -759,6 +761,7 @@ async function createComposerJson( composerJson, answers ) { delete composerJson[ 'require-dev' ][ 'yoast/phpunit-polyfills' ]; composerJson.scripts = { 'test-js': [ 'pnpm run test' ], + 'test-coverage': [ 'pnpm run test-coverage' ], }; if ( ! answers.typescript.endsWith( '-src' ) ) { composerJson.scripts = { diff --git a/tools/cli/skeletons/common/composer.json b/tools/cli/skeletons/common/composer.json index df21f8cdeec8a..223a76d6972e2 100644 --- a/tools/cli/skeletons/common/composer.json +++ b/tools/cli/skeletons/common/composer.json @@ -17,6 +17,9 @@ "phpunit": [ "./vendor/phpunit/phpunit/phpunit --colors=always" ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"" + ], "test-php": [ "@composer phpunit" ]