Skip to content

Merge feature/bf-2025 into trunk#22532

Merged
pls78 merged 63 commits intotrunkfrom
feature/bf-2025
Aug 26, 2025
Merged

Merge feature/bf-2025 into trunk#22532
pls78 merged 63 commits intotrunkfrom
feature/bf-2025

Conversation

@pls78
Copy link
Copy Markdown
Member

@pls78 pls78 commented Aug 26, 2025

Context

  • We want to prepare the 25.9 release by merging the feature branch feature/bf-2025 to trunk.

Summary

This PR can be summarized in the following changelog entry:

  • Updates the Black Friday ads.

Relevant technical choices:

Test instructions

Test instructions for the acceptance test before the PR gets merged

This PR can be acceptance tested by following these steps:

  • Smoke-test the editors:
    • With and without the BF promotion active
      • When the BF promotion is active, test with and without WooCommerce active

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:

  • N/A

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 #

thijsoo and others added 30 commits August 13, 2025 10:18
…n-sidebar-footer

Update styling for the black friday ads.
…make alternating through introductions easier
… future and create the new BF one as prioritized
…s-page

751 black friday ads 2025   plans page
@pls78 pls78 added this to the 25.9 milestone Aug 26, 2025
@pls78 pls78 added changelog: non-user-facing Needs to be included in the 'Non-userfacing' category in the changelog changelog: other Needs to be included in the 'Other' category in the changelog and removed changelog: non-user-facing Needs to be included in the 'Non-userfacing' category in the changelog labels Aug 26, 2025
@coveralls
Copy link
Copy Markdown

coveralls commented Aug 26, 2025

Pull Request Test Coverage Report for Build ee13b2bae78d01d3082dce167d12a68548834213

Details

  • 13 of 139 (9.35%) changed or added relevant lines in 35 files are covered.
  • 178 unchanged lines in 9 files lost coverage.
  • Overall coverage decreased (-0.08%) to 53.195%

Changes Missing Coverage Covered Lines Changed/Added Lines %
packages/js/src/components/UpsellBox.js 0 1 0.0%
packages/js/src/components/contentAnalysis/Results.js 0 1 0.0%
packages/js/src/components/modals/InternalLinkingSuggestionsUpsell.js 0 1 0.0%
packages/js/src/hooks/use-first-eligible-notification.js 0 1 0.0%
packages/js/src/plans/components/cards/premium-card.js 0 1 0.0%
packages/js/src/plans/components/cards/woo-card.js 0 1 0.0%
src/integrations/settings-integration.php 0 1 0.0%
packages/js/src/components/modals/MultiKeyphraseUpsellModal.js 0 2 0.0%
packages/js/src/helpers/shouldShowWebinarPromotionNotification.js 0 2 0.0%
src/promotions/domain/black-friday-promotion.php 0 2 0.0%
Files with Coverage Reduction New Missed Lines %
src/promotions/domain/black-friday-promotion.php 1 0.0%
packages/js/src/shared-admin/components/premium-upsell-list.js 1 11.11%
packages/js/src/components/modals/InternalLinkingSuggestionsUpsell.js 1 0.0%
packages/js/src/initializers/block-editor-integration.js 7 0.0%
src/plans/user-interface/upgrade-sidebar-menu-integration.php 18 0.0%
admin/class-premium-upsell-admin-block.php 27 0.0%
inc/class-addon-manager.php 30 54.37%
src/presenters/admin/sidebar-presenter.php 33 0.0%
inc/class-wpseo-admin-bar-menu.php 60 8.78%
Totals Coverage Status
Change from base Build 73eb360e7bcdad4d7b1de9ea18a1145232468059: -0.08%
Covered Lines: 31621
Relevant Lines: 59914

💛 - Coveralls

@pls78 pls78 merged commit 6cc9aad into trunk Aug 26, 2025
53 checks passed
@pls78 pls78 deleted the feature/bf-2025 branch August 26, 2025 14:22
@enricobattocchi enricobattocchi added changelog: non-user-facing Needs to be included in the 'Non-userfacing' category in the changelog and removed changelog: other Needs to be included in the 'Other' category in the changelog labels Aug 26, 2025
@enricobattocchi enricobattocchi restored the feature/bf-2025 branch August 27, 2025 13:44
@enricobattocchi enricobattocchi deleted the feature/bf-2025 branch August 27, 2025 20:13
@enricobattocchi enricobattocchi added this to the 25.9 milestone Aug 28, 2025
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.

6 participants