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

Merge split UPE tests with main gateway tests #7954

Merged
merged 29 commits into from
Jan 19, 2024
Merged

Conversation

timur27
Copy link
Contributor

@timur27 timur27 commented Dec 29, 2023

Closes #7953

Changes proposed in this Pull Request

This PR merges three unit test suites into one, making test-class-wc-payment-gateway-wcpay.php the only test suite that covers everything. While combining, several improvements were made to the tests. The most significant one is we don't mock the unit under tests now.

Additionally, this PR removes the duplicates from E2E tests. Previously, we had multiple test suites checking e.g. saving cards and each test suite was doing it under different setting e.g. UPE or legacy card. Since we streamlined them now, there's no need to have duplicated tests either.

Tests that, in my view, need further analysis to comprehend their outcomes are accompanied by my comments. These comments detail whether the test was removed, relocated to a file, or modified. If a test doesn't have a comment, this means it was simply moved to the main gateway test suite w/o any big modifications, but of course feel free to raise any questions you might have.

Testing instructions


  • Run npm run changelog to add a changelog file, choose patch to leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.
  • Covered with tests (or have a good reason not to test in description ☝️)
  • Tested on mobile (or does not apply)

Post merge

@timur27 timur27 changed the title merge split UPE tests into main gateway Merge split UPE tests into main gateway Dec 29, 2023
@timur27 timur27 changed the title Merge split UPE tests into main gateway Merge split UPE tests with main gateway tests Dec 29, 2023
@botwoo
Copy link
Collaborator

botwoo commented Dec 29, 2023

Test the build

Option 1. Jetpack Beta

  • Install and activate Jetpack Beta.
  • Use this build by searching for PR number 7954 or branch name merge/upe-non-upe-tests in your-test.site/wp-admin/admin.php?page=jetpack-beta&plugin=woocommerce-payments

Option 2. Jurassic Ninja - available for logged-in A12s

🚀 Launch a JN site with this branch 🚀

ℹ️ Install this Tampermonkey script to get more options.


Build info:

  • Latest commit: fc9efa6
  • Build time: 2024-01-09 13:31:50 UTC

Note: the build is updated when a new commit is pushed to this PR.

Copy link
Contributor

github-actions bot commented Dec 29, 2023

Size Change: 0 B

Total Size: 1.27 MB

ℹ️ View Unchanged
Filename Size
release/woocommerce-payments/assets/css/admin.css 1.06 kB
release/woocommerce-payments/assets/css/success.css 158 B
release/woocommerce-payments/dist/blocks-checkout-rtl.css 1.81 kB
release/woocommerce-payments/dist/blocks-checkout.css 1.81 kB
release/woocommerce-payments/dist/blocks-checkout.js 85.1 kB
release/woocommerce-payments/dist/checkout-rtl.css 318 B
release/woocommerce-payments/dist/checkout.css 319 B
release/woocommerce-payments/dist/checkout.js 37.2 kB
release/woocommerce-payments/dist/index-rtl.css 37 kB
release/woocommerce-payments/dist/index.css 37 kB
release/woocommerce-payments/dist/index.js 289 kB
release/woocommerce-payments/dist/multi-currency-analytics.js 1.05 kB
release/woocommerce-payments/dist/multi-currency-rtl.css 3.4 kB
release/woocommerce-payments/dist/multi-currency-switcher-block.js 60.8 kB
release/woocommerce-payments/dist/multi-currency.css 3.4 kB
release/woocommerce-payments/dist/multi-currency.js 56 kB
release/woocommerce-payments/dist/order-rtl.css 676 B
release/woocommerce-payments/dist/order.css 679 B
release/woocommerce-payments/dist/order.js 42.3 kB
release/woocommerce-payments/dist/payment-gateways-rtl.css 1.31 kB
release/woocommerce-payments/dist/payment-gateways.css 1.31 kB
release/woocommerce-payments/dist/payment-gateways.js 39.6 kB
release/woocommerce-payments/dist/payment-request-rtl.css 153 B
release/woocommerce-payments/dist/payment-request.css 153 B
release/woocommerce-payments/dist/payment-request.js 13.5 kB
release/woocommerce-payments/dist/product-details.js 919 B
release/woocommerce-payments/dist/settings-rtl.css 10.3 kB
release/woocommerce-payments/dist/settings.css 10.3 kB
release/woocommerce-payments/dist/settings.js 234 kB
release/woocommerce-payments/dist/subscription-edit-page.js 669 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal-rtl.css 519 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal.css 519 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal.js 20.5 kB
release/woocommerce-payments/dist/subscription-product-onboarding-toast.js 710 B
release/woocommerce-payments/dist/subscriptions-empty-state-rtl.css 117 B
release/woocommerce-payments/dist/subscriptions-empty-state.css 117 B
release/woocommerce-payments/dist/subscriptions-empty-state.js 19.6 kB
release/woocommerce-payments/dist/tos-rtl.css 230 B
release/woocommerce-payments/dist/tos.css 231 B
release/woocommerce-payments/dist/tos.js 22.1 kB
release/woocommerce-payments/dist/woopay-express-button-rtl.css 153 B
release/woocommerce-payments/dist/woopay-express-button.css 153 B
release/woocommerce-payments/dist/woopay-express-button.js 52.5 kB
release/woocommerce-payments/dist/woopay-rtl.css 4.18 kB
release/woocommerce-payments/dist/woopay.css 4.19 kB
release/woocommerce-payments/dist/woopay.js 72.1 kB
release/woocommerce-payments/includes/subscriptions/assets/css/plugin-page.css 622 B
release/woocommerce-payments/includes/subscriptions/assets/js/plugin-page.js 812 B
release/woocommerce-payments/vendor/automattic/jetpack-assets/build/i18n-loader.js 2.43 kB
release/woocommerce-payments/vendor/automattic/jetpack-assets/src/js/i18n-loader.js 1.01 kB
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/tracks-ajax.js 522 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/tracks-callables.js 581 B
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/babel.config.js 160 B
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/build/index.css 2.37 kB
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/build/index.js 13.5 kB
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/build/index.rtl.css 2.37 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/about.css 1.03 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin-empty-state.css 291 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin-order-statuses.css 403 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin.css 3.6 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/checkout.css 299 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/modal.css 742 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/view-subscription.css 572 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/wcs-upgrade.css 411 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/admin-pointers.js 544 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/admin.js 9.4 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/jstz.js 6.8 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/jstz.min.js 3.83 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/meta-boxes-coupon.js 544 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/meta-boxes-subscription.js 2.52 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/moment.js 22.1 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/moment.min.js 11.6 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/payment-method-restrictions.js 1.29 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/wcs-meta-boxes-order.js 502 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/payment-methods.js 355 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/single-product.js 429 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/view-subscription.js 1.38 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/wcs-cart.js 781 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/modal.js 1.1 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/wcs-upgrade.js 1.27 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/build/index.css 392 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/build/index.js 3.05 kB

compressed-size-action

@timur27 timur27 force-pushed the merge/upe-non-upe-tests branch from c31b65d to 4d9bbb6 Compare January 2, 2024 16:55
@timur27 timur27 force-pushed the merge/upe-non-upe-tests branch 6 times, most recently from 93adcd7 to c4e521c Compare January 9, 2024 12:42
@botwoo
Copy link
Collaborator

botwoo commented Jan 9, 2024

Test the build

Option 1. Jetpack Beta

  • Install and activate Jetpack Beta.
  • Use this build by searching for PR number 7954 or branch name merge/upe-non-upe-tests in your-test.site/wp-admin/admin.php?page=jetpack-beta&plugin=woocommerce-payments

Option 2. Jurassic Ninja - available for logged-in A12s

🚀 Launch a JN site with this branch 🚀

ℹ️ Install this Tampermonkey script to get more options.


Build info:

  • Latest commit: d750ad7
  • Build time: 2024-01-19 07:30:28 UTC

Note: the build is updated when a new commit is pushed to this PR.

@timur27 timur27 force-pushed the merge/upe-non-upe-tests branch 3 times, most recently from d74f2ed to 236e05e Compare January 9, 2024 15:45
@timur27 timur27 force-pushed the merge/upe-non-upe-tests branch from 0cd1b8c to 88e61d2 Compare January 10, 2024 12:41
@timur27 timur27 force-pushed the merge/upe-non-upe-tests branch 2 times, most recently from 35dce83 to 8dde4c2 Compare January 10, 2024 13:26
@timur27 timur27 marked this pull request as ready for review January 11, 2024 14:54
@timur27 timur27 requested a review from a team as a code owner January 11, 2024 14:54
@timur27 timur27 requested review from a team and mdmoore and removed request for a team January 11, 2024 14:54
@timur27
Copy link
Contributor Author

timur27 commented Jan 12, 2024

wcpay - shopper fails on develop with the same error.

Copy link
Member

@mdmoore mdmoore left a comment

Choose a reason for hiding this comment

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

This is a massive undertaking but it's really nice to see all of this consolidation! Thanks for working on it.

As we discussed, the E2E tests are failing on develop so it's hard to understand if the changes here are currently passing. But I can see they were passing in previous runs, so I think it's likely that the changes here aren't contributing to the failures on the latest runs. As you mentioned, you don't intend to merge this until the E2E tests are passing on develop.

The unit tests are passing and the changes seem solid from what I can see(there's a lot). I left a couple really small comments/text changes. I'll go ahead and approve as those changes aren't blockers to anything. Really nice work!

@timur27 timur27 added the status: blocked The issue is blocked from progressing, waiting for another piece of work to be done. label Jan 18, 2024
@timur27
Copy link
Contributor Author

timur27 commented Jan 18, 2024

Blocked by failing the e2e test on develop. Once those are fixed, this PR will be merged.

@timur27 timur27 enabled auto-merge January 18, 2024 17:09
@timur27 timur27 disabled auto-merge January 18, 2024 17:09
@timur27 timur27 removed the status: blocked The issue is blocked from progressing, waiting for another piece of work to be done. label Jan 19, 2024
@timur27 timur27 enabled auto-merge January 19, 2024 07:47
@timur27 timur27 disabled auto-merge January 19, 2024 07:48
@timur27 timur27 merged commit 06ccfd5 into develop Jan 19, 2024
24 of 26 checks passed
@timur27 timur27 deleted the merge/upe-non-upe-tests branch January 19, 2024 07:48
Jinksi pushed a commit that referenced this pull request Jan 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge unit and E2E tests for gateways after UPE cleanup
4 participants