Skip to content

Conversation

@thijsoo
Copy link
Contributor

@thijsoo thijsoo commented Oct 17, 2025

Context

  • Reverts a revert that went into the feature branch. The body of the original PR is copied.
  • In Change helpscout beacon behavior #22612 we switched from checking for activated add-ons to activated licenses.
    We want to perform the licenses check only if the user has at least one add-on active, conversely we assume no active licenses.

Summary

This PR can be summarized in the following changelog entry:

  • Performs the licenses check needed for the HelpScout Beacon only if the user has at least one add-on active.

Relevant technical choices:

  • N/A

Test instructions

Test instructions for the acceptance test before the PR gets merged

This PR can be acceptance tested by following these steps:

  • Make sure you have the Log HTTP Requests plugin installed and activated
  • Make sure you have a valid Premium or WooCommerce SEO subscription plan
  • Install any add-on other than Premium but don't activate it
  • Edit the wp_options table with a MySQL client by removing the lines where option_name is _transient_wpseo_site_information or _transient_wpseo_site_information_quick (if any)
  • Go to Tools -> Log HTTP Requests
    • Click Refresh and Clear Log if any request has been previously logged
  • Go to Yoast SEO -> Support
    • Confirm you get the upsell in the Contact our support team section
  • Go to Tools -> Log HTTP Requests
    • Click Refresh and confirm you have no requests to https://my.yoast.com/api/sites/current
  • Activate the add-on you have installed
  • Go to Yoast SEO -> Support
    • Confirm you don't get the upsell in the Contact our support team section and you can click the Contact our support team button
  • Go to Tools -> Log HTTP Requests
    • Click Refresh and confirm you have at least one request to https://my.yoast.com/api/sites/current

Relevant test scenarios

  • Changes should be tested with the browser console open
  • Changes should be tested on different posts/pages/taxonomies/custom post types/custom taxonomies
  • Changes should be tested on different editors (Default Block/Gutenberg/Classic/Elementor/other)
  • Changes should be tested on different browsers
  • Changes should be tested on multisite

Test instructions for QA when the code is in the RC

  • QA should use the same steps as above.

Impact check

This PR affects the following parts of the plugin, which may require extra testing:

  • Please perform a regression test on the HelpScout Beacon by repeating the test instructions in Change helpscout beacon behavior #22612
    • Take into account that now, if you have no add-ons active we assume you have no valid subscription, thus you will get the Free HelpScout Beacon behavior even if you actually have a valid subscription

Other environments

  • This PR also affects Shopify. I have added a changelog entry starting with [shopify-seo], added test instructions for Shopify and attached the Shopify label to this PR.

Documentation

  • I have written documentation for this change. For example, comments in the Relevant technical choices, comments in the code, documentation on Confluence / shared Google Drive / Yoast developer portal, or other.

Quality assurance

  • I have tested this code to the best of my abilities.
  • During testing, I had activated all plugins that Yoast SEO provides integrations for.
  • I have added unit tests to verify the code works as intended.
  • If any part of the code is behind a feature flag, my test instructions also cover cases where the feature flag is switched off.
  • I have written this PR in accordance with my team's definition of done.
  • I have checked that the base branch is correctly set.

Innovation

  • No innovation project is applicable for this PR.
  • This PR falls under an innovation project. I have attached the innovation label.
  • I have added my hours to the WBSO document.

Fixes #22632

@thijsoo thijsoo added this to the 26.3 milestone Oct 17, 2025
@thijsoo thijsoo added the changelog: non-user-facing Needs to be included in the 'Non-userfacing' category in the changelog label Oct 17, 2025
@coveralls
Copy link

Pull Request Test Coverage Report for Build 2150fb2e5c3d3b92b3bf75a09700a7ecbca15492

Details

  • 2 of 7 (28.57%) changed or added relevant lines in 3 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-3.7%) to 52.79%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/integrations/admin/helpscout-beacon.php 0 2 0.0%
inc/class-addon-manager.php 0 3 0.0%
Totals Coverage Status
Change from base Build 4699ee5f198098b3e75654dbbfb2e57614087c28: -3.7%
Covered Lines: 31465
Relevant Lines: 59767

💛 - Coveralls

@thijsoo thijsoo merged commit c76014e into trunk Oct 17, 2025
27 of 28 checks passed
@thijsoo thijsoo deleted the revert-22655-revert-22634-check-addons-subscription-only-if-any-addon-is-activated branch October 17, 2025 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog: non-user-facing Needs to be included in the 'Non-userfacing' category in the changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Perform licenses checks only if any add-on is activated

3 participants