Skip to content
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.

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

Boost: Add e2e tests to concatenate JS/CSS #36668

Merged
merged 21 commits into from
Apr 4, 2024

Conversation

dilirity
Copy link
Member

@dilirity dilirity commented Apr 1, 2024

Part of #33877

Proposed changes:

  • Add helper plugin to enqueue assets used for testing;
  • Add e2e tests for the Concatenate JS/CSS modules:
    • Meta isn't visible while the module is deactivated;
    • Concatenation doesn't happen when module is deactivated;
    • Meta is visible while the module is activated;
    • Concatenation happens when module is activated;
    • jQuery (JS) and admin-bar (CSS) aren't concatenated (since they are ignored by default) while module is activated.
  • Update Boost CLI to support activating/deactivating concatenate JS/CSS;
  • Update docker e2e test matrix to include tests (you can check the GH actions section to see the tests).

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

n/a

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

no

Testing instructions:

  • Run tests to see if everything is working as expected.

@dilirity dilirity self-assigned this Apr 1, 2024
@dilirity dilirity added [Status] In Progress E2E Tests [Plugin] Boost A feature to speed up the site and improve performance. labels Apr 1, 2024
Copy link
Contributor

github-actions bot commented Apr 1, 2024

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 Team Review, ...).
  • ✅ 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 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.


Boost plugin:

  • Next scheduled release: May 7, 2024.
  • Scheduled code freeze: April 29, 2024.

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

@github-actions github-actions bot added Actions GitHub actions used to automate some of the work around releases and repository management Docker labels Apr 1, 2024
@dilirity dilirity marked this pull request as ready for review April 1, 2024 14:58
@dilirity dilirity requested a review from a team April 1, 2024 14:58
haqadn
haqadn previously approved these changes Apr 3, 2024
Copy link
Contributor

@haqadn haqadn left a comment

Choose a reason for hiding this comment

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

This looks good. How much longer will the test be if both are combined? If not different by too much, maybe we can combine both? I think it requires workers to run each separately. But, I could be wrong.

@dilirity dilirity force-pushed the add/boost/e2e-tests-concatenate-js-css branch from 0a78a31 to 3288ed5 Compare April 3, 2024 13:38
@dilirity
Copy link
Member Author

dilirity commented Apr 3, 2024

@haqadn thanks for the suggestion! I didn't check the timing, but it does make sense for the tests to be together.

Updated in d0359b3.

@dilirity dilirity requested a review from haqadn April 3, 2024 13:49
Copy link
Contributor

@haqadn haqadn left a comment

Choose a reason for hiding this comment

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

LGTM

@dilirity dilirity merged commit 676d39d into trunk Apr 4, 2024
59 of 60 checks passed
@dilirity dilirity deleted the add/boost/e2e-tests-concatenate-js-css branch April 4, 2024 10:15
TimBroddin pushed a commit that referenced this pull request Apr 10, 2024
* Add data attributes for testing to concatenate JS

* Allow concatenate_js to be enabled via Boost's CLI

* Add concatenate JS test for meta visibility when inactive

* add changelog

* Add e2e 'concatenate assets' helper plugin

* Add concatenate JS test to make sure concatenation is not happening

* Fix incorrect module name

* Add test to make sure concat meta is visible when module is active

* Add test to verify JS concatenation when module is active

* Add Boost's concatenate JS test configuration to e2e test matrix

* Add test to verify JS concatenation excludes jquery when enabled

* Update concatenate JS tests to rely on custom assets instead

* Add e2e tests for concatenate CSS

* Add Boost's concatenate CSS test configuration to e2e test matrix

* Update selectors in JS/CSS concat tests to allow for greater flexibility

* Combine concatenate tests into one
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Actions GitHub actions used to automate some of the work around releases and repository management Docker E2E Tests [Plugin] Boost A feature to speed up the site and improve performance. [Tests] Includes Tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants