Skip to content

Commit

Permalink
Monorepo: Restore and add test coverage config (#39961)
Browse files Browse the repository at this point in the history
* Enable and normalize test coverage commands

* Revert "Code Coverage: remove automation (#28542)"

This reverts commit da5e78803f56ea0fe54f29720c05be037093b97a.

* Revert "Remove remnants of automated code coverage support (#28982)"

This reverts commit 8cc32461b2d3b7e3a4a391c033163e5ebc3822fa.

* Fix starter plugin test broken by #31417

* Plugin tests are now run in the monorepo rather than wp-content/plugins.

* Removed undocumented WP_DEVELOP_DIR variable, documented WORDPRESS_DEVELOP_DIR and WORDPRESS_DIR

* Fixed JS tests in some packages where .scripts.test-js had never been added to composer.json.

---------

Co-authored-by: Brad Jorsch <[email protected]>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11610578911

Upstream-Ref: Automattic/jetpack@7fadf4a
  • Loading branch information
tbradsha authored and matticbot committed Oct 31, 2024
1 parent 3f84e1c commit 619dc71
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 13 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.23.3-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

### Added
- Enable test coverage.

## [0.23.2] - 2024-10-21
### Changed
- Update dependencies. [#39781]
Expand Down Expand Up @@ -470,6 +477,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Updated package dependencies. [#27906]

[0.23.3-alpha]: https://github.com/automattic/jetpack-blaze/compare/v0.23.2...v0.23.3-alpha
[0.23.2]: https://github.com/automattic/jetpack-blaze/compare/v0.23.1...v0.23.2
[0.23.1]: https://github.com/automattic/jetpack-blaze/compare/v0.23.0...v0.23.1
[0.23.0]: https://github.com/automattic/jetpack-blaze/compare/v0.22.12...v0.23.0
Expand Down
19 changes: 11 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-assets": "^2.3.12",
"automattic/jetpack-connection": "^5.1.5",
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-plans": "^0.4.12",
"automattic/jetpack-redirect": "^2.0.4",
"automattic/jetpack-status": "^4.0.2",
"automattic/jetpack-sync": "^3.14.3"
"automattic/jetpack-assets": "^2.3.13-alpha",
"automattic/jetpack-connection": "^5.1.6-alpha",
"automattic/jetpack-constants": "^2.0.5-alpha",
"automattic/jetpack-plans": "^0.4.13-alpha",
"automattic/jetpack-redirect": "^2.0.5-alpha",
"automattic/jetpack-status": "^4.0.3-alpha",
"automattic/jetpack-sync": "^3.14.4-alpha"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^4.2.7",
"automattic/jetpack-changelogger": "^4.2.8-alpha",
"automattic/wordbless": "@dev"
},
"suggest": {
Expand All @@ -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"
],
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-blaze",
"version": "0.23.2",
"version": "0.23.3-alpha",
"description": "Attract high-quality traffic to your site using Blaze. Using this service, you can advertise a post or page on some of the millions of pages across WordPress.com and Tumblr from just $5 per day.",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/blaze/#readme",
"bugs": {
Expand All @@ -22,9 +22,9 @@
"watch": "pnpm run build && pnpm webpack watch"
},
"dependencies": {
"@automattic/jetpack-analytics": "^0.1.31",
"@automattic/jetpack-components": "^0.58.0",
"@automattic/jetpack-shared-extension-utils": "^0.15.14",
"@automattic/jetpack-analytics": "^0.1.32-alpha",
"@automattic/jetpack-components": "^0.58.1-alpha",
"@automattic/jetpack-shared-extension-utils": "^0.15.15-alpha",
"@wordpress/block-editor": "14.4.0",
"@wordpress/components": "28.9.0",
"@wordpress/compose": "7.9.0",
Expand Down
2 changes: 1 addition & 1 deletion src/class-dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Dashboard {
*
* @var string
*/
const PACKAGE_VERSION = '0.23.2';
const PACKAGE_VERSION = '0.23.3-alpha';

/**
* List of dependencies needed to render the dashboard in wp-admin.
Expand Down

0 comments on commit 619dc71

Please sign in to comment.