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.

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

Merge split UPE tests with main gateway tests #7954

Merged
merged 29 commits into from
Jan 19, 2024
Merged

Merge split UPE tests with main gateway tests #7954

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
374b219
merge split UPE tests into main gateway
Dec 29, 2023
4d9bbb6
merge split UPE tests into main gateway - II
Jan 2, 2024
678059d
Merge branch 'develop' into merge/upe-non-upe-tests
Jan 3, 2024
5012f8e
isolate tested gateway within its test to avoid dependencies that lea…
Jan 3, 2024
b69676d
merge UPE tests into main gateway - III
Jan 3, 2024
fccc591
add changelog entry
Jan 3, 2024
6b0c3c4
merge UPE tests into main gateway - IV
Jan 3, 2024
dc61bf2
remove non-relevant test which was based on not existing anymore wc_p…
Jan 3, 2024
d9db944
remove redundant helper function
Jan 3, 2024
ad83788
merge UPE tests into main gateway - V
Jan 4, 2024
88e61d2
cleanup e2e tests - part I
Jan 8, 2024
8ccd202
cleanup e2e tests - part II
Jan 10, 2024
715f64f
Merge branch 'develop' into tmpp
Jan 11, 2024
8f0cd40
add temporary fix to make unrelated tests pass
Jan 11, 2024
5a1bf17
re-organize and cleanup the code
Jan 11, 2024
138cbaf
add default pm setting test to the proper space
Jan 11, 2024
0f4f0a5
Revert "add temporary fix to make unrelated tests pass"
Jan 11, 2024
da79df1
Merge branch 'develop' into merge/upe-non-upe-tests
timur27 Jan 12, 2024
cde09db
Merge branch 'develop' into merge/upe-non-upe-tests
timur27 Jan 12, 2024
944279e
Merge branch 'develop' into merge/upe-non-upe-tests
timur27 Jan 15, 2024
7ee602b
Merge branch 'develop' into merge/upe-non-upe-tests
timur27 Jan 15, 2024
a0bdb59
Merge branch 'develop' of github.com:Automattic/woocommerce-payments …
Jan 16, 2024
5e23ce9
Merge branch 'develop' into merge/upe-non-upe-tests
timur27 Jan 17, 2024
809d05d
chore: align class names and update helper functions description
Jan 17, 2024
92dfd09
Merge branch 'develop' of github.com:Automattic/woocommerce-payments …
Jan 18, 2024
c4a16ca
fix test post-merge
Jan 18, 2024
21a7079
Merge branch 'develop' of github.com:Automattic/woocommerce-payments …
Jan 18, 2024
c8838f2
Merge branch 'develop' into merge/upe-non-upe-tests
timur27 Jan 18, 2024
d750ad7
Merge branch 'develop' into merge/upe-non-upe-tests
timur27 Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/workflows/e2e-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,8 @@ jobs:
strategy:
fail-fast: false
matrix:
test_groups: [ 'wcpay', 'subscriptions', 'upe', 'upeSplit' ] # [TODO] Unskip blocks tests after investigating constant failures.
test_groups: [ 'wcpay', 'subscriptions' ] # [TODO] Unskip blocks tests after investigating constant failures.
test_branches: [ 'merchant', 'shopper' ]
exclude:
- test_groups: 'upe'
test_branches: 'merchant'
- test_groups: 'upeSplit'
test_branches: 'merchant'
Comment on lines -50 to -56
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've merged the upe/bnpl tests into wcpay/shopper because I don't see the need of distinguishing between those groups anymore. One downside of this is that wcpay - shopper now runs a bit longer. Looking forward to hearing the opinions of others.

Same for .github/workflows/e2e-tests-atomic.yml changes below.

Copy link
Contributor

Choose a reason for hiding this comment

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

@timur27 I agree that we don't need to have too many sub groups for E2E tests. Moving UPE tests to shopper makes sense as long as it doesn't add too much time addition to the test runtime.

What is the time difference you've noticed after moving the tests to shopper?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@achyuthajoy thanks, I think it's not more than 110 seconds but it's hard to confirm as of today because tests are failing on develop. I will get back if after fixing develop this branch will be extended by more than ~2mins but in the meantime let's assume this is the change.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sound good to me.


name: WC - latest | ${{ matrix.test_groups }} - ${{ matrix.test_branches }}

Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/e2e-tests-atomic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,12 @@ jobs:
fail-fast: false
max-parallel: 1
matrix:
test_groups: [ 'wcpay', 'subscriptions', 'upe', 'upeSplit' ]
test_groups: [ 'wcpay', 'subscriptions' ]
test_branches: [ 'merchant', 'shopper' ]
exclude:
- test_groups: 'subscriptions'
- test_groups: 'wcpay'
test_branches: 'merchant'
- test_groups: 'upe'
test_branches: 'merchant'
- test_groups: 'upeSplit'
test_branches: 'merchant'

env:
E2E_GROUP: ${{ matrix.test_groups }}
Expand Down
4 changes: 4 additions & 0 deletions changelog/merge-upe-non-upe-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: dev

Merge UPE tests into the single and main gateway test file for unit and E2E tests.
2 changes: 0 additions & 2 deletions tests/e2e/config/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ const e2ePaths = {
wcpay: path.resolve( __dirname, '../specs/wcpay' ),
subscriptions: path.resolve( __dirname, '../specs/subscriptions' ),
blocks: path.resolve( __dirname, '../specs/blocks' ),
upe: path.resolve( __dirname, '../specs/upe' ),
upeSplit: path.resolve( __dirname, '../specs/upe-split' ),
};

// Allow E2E tests to run specific tests - wcpay, subscriptions, blocks, all (default).
Expand Down
117 changes: 0 additions & 117 deletions tests/e2e/specs/upe-split/shopper/shopper-upe-enabled-all-flows.spec.js
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This test suite consist of duplicates similarly to tests/e2e/specs/upe-split/shopper/shopper-deferred-intent-creation-upe-enabled.spec.js.

This file was deleted.

112 changes: 0 additions & 112 deletions tests/e2e/specs/upe/shopper/shopper-upe-enabled-all-flows.spec.js
View file
Open in desktop

This file was deleted.

0 ...it/shopper/shopper-bnpls-checkout.spec.js → ...ay/shopper/shopper-bnpls-checkout.spec.js
View file
Open in desktop
File renamed without changes.
Loading
Loading