Skip to content

phpunit: Clean up tests in preparation for PHPUnit 12 #43215

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

phpunit: Clean up tests in preparation for PHPUnit 12 #43215

wants to merge 2 commits into from

Conversation

anomiex
Copy link
Contributor

@anomiex anomiex commented Apr 23, 2025

Proposed changes:

  • TestCase::__construct() is final, so use set_up() instead.
  • ->getMockBuilder() can no longer create specifically-named classes.
  • Remove a logging statement.
  • Update WP_UnitTestCase_Fix with an annotation parser so WP Core's @expectedDeprecated and @expectedIncorrectUsage can still work.

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

pf4qpu-Fo-p2

Does this pull request change what data or activity we track or use?

No

Testing instructions:

  • CI happy?

@anomiex
phpunit: Clean up tests in preparation for PHPUnit 12
c81b1ea 
* `TestCase::__construct()` is final, so use `set_up()` instead.
* `->getMockBuilder()` can no longer create specifically-named classes.
* Remove a logging statement.
* Update `WP_UnitTestCase_Fix` with an annotation parser so WP Core's
  `@expectedDeprecated` and `@expectedIncorrectUsage` can still work.
@anomiex anomiex requested review from a team April 23, 2025 19:50
@anomiex anomiex self-assigned this Apr 23, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Apr 23, 2025 •
edited
Loading

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WoA dev site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin (Jetpack or WordPress.com Site Helper), and enable the update/cleanup-tests-for-phpunit-12 branch.
  • To test on Simple, run the following command on your sandbox:
bin/jetpack-downloader test jetpack update/cleanup-tests-for-phpunit-12

bin/jetpack-downloader test jetpack-mu-wpcom-plugin update/cleanup-tests-for-phpunit-12

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@github-actions github-actions bot added [Package] Account Protection [Package] Roles [Plugin] CRM Issues about the Jetpack CRM plugin [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Wpcomsh [Tests] Includes Tests labels Apr 23, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Apr 23, 2025 •
edited
Loading

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Review, ...).
  • ✅ Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
  3. You can use GitHub's Reviewers functionality to request a review.
  4. When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

  • WordPress.com Simple releases happen as soon as you deploy your changes after merging this PR (PCYsg-Jjm-p2).
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly:
    • Scheduled release: May 6, 2025
    • Code freeze: May 5, 2025

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Wpcomsh plugin:

  • Next scheduled release: Atomic deploys happen twice daily on weekdays (p9o2xV-2EN-p2)

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

@jp-launch-control JP Launch Control
Copy link

jp-launch-control bot commented Apr 23, 2025 •
edited
Loading

Code Coverage Summary

This PR did not change code coverage!

That could be good or bad, depending on the situation. Everything covered before, and still is? Great! Nothing was covered before? Not so great. 🤷

Full summary · PHP report · JS report

tbradsha
tbradsha approved these changes Apr 23, 2025
View reviewed changes
Copy link
Contributor

@tbradsha tbradsha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work.

projects/packages/account-protection/tests/php/Email_Service_Test.php
@@ -70,8 +70,6 @@ public function test_resend_auth_mail_sends_mail_and_remembers_2fa_token_success

$result = $sut->resend_auth_email( $user->ID, $transient_data, $my_token );

error_log( print_r( $result, true ) );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops!

@anomiex anomiex mentioned this pull request Apr 23, 2025
Open
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tbradsha tbradsha tbradsha approved these changes

Assignees

@anomiex anomiex

Labels
[Package] Account Protection [Package] Roles [Plugin] CRM Issues about the Jetpack CRM plugin [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Wpcomsh [Pri] Normal [Status] Needs Review This PR is ready for review. [Tests] Includes Tests [Type] Janitorial
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@anomiex @tbradsha