Cullen Whitmore
be19efe729
Bump the version string in the template header to 6.1.0
2021-12-08 10:13:11 -06:00
Ron Rennick
6989bd61f9
merge trunk
2021-12-08 12:12:34 -04:00
Ron Rennick
2ec68e0e69
code cleanup
2021-12-08 11:07:24 -04:00
Tom Castle
23fe784e5a
Fix #31393 to use country from headers only if geolocating current user
2021-12-08 12:53:20 +00:00
Rodel
110266fd9b
Sync with trunk, changelog entry, resolve conflicts
2021-12-08 14:43:02 +08:00
Christopher Allford
c5fccaf088
Merge pull request #31391 from woocommerce/dev/bump-woo-admin-2-9-1
...
Bump woocommerce-admin package to 2.9.1
2021-12-07 20:50:29 -08:00
Adrian Duffell
e4d670e035
Bump woocommerce-admin package to 2.9.1
2021-12-08 12:19:46 +08:00
Peter Fabian
edcffa9912
Merge pull request #31338 from woocommerce/fix/28166-coupon-item-meta-data
...
Consistently Store Coupon Data in Order Item Meta
2021-12-07 18:35:08 +01:00
Barry Hughes
b439bbd612
Merge pull request #31383 from woocommerce/fix/base-address-wording-2
...
Make the setting's name for default customer location more accurately reflect the effect of it.
2021-12-07 09:28:44 -08:00
Barry Hughes
acbe200c79
Merge pull request #31113 from kkmuffme/use-native-wp_doing_ajax
...
Use native wp_doing_ajax() instead of custom is_ajax()
2021-12-07 09:26:40 -08:00
barryhughes
ca37d3ba41
Deprecation will be as of 6.1.0.
2021-12-07 08:59:17 -08:00
Peter Fabian
1003a27b1b
Make the setting's name more accurately reflect the effect of it.
2021-12-07 17:41:04 +01:00
Greg
b82fec4198
Merge pull request #31141 from woocommerce/add/api-tests-shipping-zones-and-methods
...
API tests for shipping zones and methods
2021-12-07 08:49:20 -07:00
Luigi Pulcini
17ef312178
changed requested data check
2021-12-07 11:33:13 +01:00
Luigi Pulcini
2b3aef0711
Merge branch 'woocommerce-trunk' into add/bulk-action-shortcircuit
2021-12-07 11:10:04 +01:00
LuigiPulcini
f845063422
Requested change on data check
2021-12-07 10:03:02 +01:00
Rodel
822abbfbce
Merge branch 'trunk' into add/api-tests-add-complex-order
2021-12-07 15:50:49 +08:00
Rodel
28bbeab9c2
Moved changelog entries to unreleased section
2021-12-07 15:49:18 +08:00
Rodel
6af432f646
Merge branch 'trunk' into add/api-tests-shipping-zones-and-methods
2021-12-07 15:47:30 +08:00
jamelreid
021b61a5f9
Merge branch 'trunk' into add/jest-retry
2021-12-06 17:50:22 -05:00
Greg
abd64e00ed
Merge pull request #31375 from woocommerce/fix/e2e-unhandled-promise-rejection
...
Fix/e2e unhandled promise rejection
2021-12-06 15:41:12 -07:00
jamelreid
cbbe8eeec1
Updated CHANGELOG.md
2021-12-06 16:10:55 -05:00
jamelreid
b7f11e3527
Removed waitForNavigation command
2021-12-06 15:37:30 -05:00
jamelreid
63489fd85f
Added shopper.logout() in afterAll block
2021-12-06 12:57:16 -05:00
jamelreid
76548b872c
Awaited shopper.logout()
2021-12-06 12:56:56 -05:00
Peter Fabian
ba1b98cba8
Update the tooltip to reflect the db update policy.
2021-12-06 14:52:08 +01:00
Peter Fabian
feaf225526
Update db version to match the WC version after running update callbacks.
...
This is the behaviour that normally happens when a user updates version by version, but if the user skips several versions, db version and WC version could diverge.
2021-12-06 14:50:25 +01:00
Cullen Whitmore
a96eb4d583
Merge branch 'trunk' into fix/a11y-improvement-add-to-cart-variable
2021-12-04 22:57:55 -06:00
jamelreid
18283d2b1a
Merge branch 'trunk' into add/jest-retry
2021-12-03 14:25:00 -05:00
Roy Ho
313d40d396
Merge pull request #31352 from woocommerce/fix/failing-ci
...
Update node-sass
2021-12-02 20:14:03 -08:00
roykho
24fd856bc5
Revert change
2021-12-02 19:30:32 -08:00
roykho
f4f2184630
Try networkidle2
2021-12-02 19:11:20 -08:00
roykho
286928bb6d
Ignore package-lock.json
2021-12-02 11:12:27 -08:00
roykho
c03bcc59b4
Prevent the use of npm to install packages
2021-12-02 11:09:46 -08:00
Rodel
ebb4eb3ce2
Corrected endpoint name
2021-12-03 02:41:21 +08:00
Rodel
eee9a56d71
Merge branch 'trunk' into add/api-tests-shipping-zones-and-methods
2021-12-03 01:40:41 +08:00
Rodel
cddf617808
Tests around the default shipping zone
2021-12-03 01:38:16 +08:00
Greg
7891d382c4
Merge pull request #31109 from woocommerce/add/api-t-order-search
...
Added tests for order search
2021-12-02 10:28:34 -07:00
roykho
68fbca56dc
Upgrade node-sass back to latest
2021-12-02 08:23:11 -08:00
roykho
b9c3644a84
Downgrade node-sass version
2021-12-02 08:11:56 -08:00
roykho
edf5512311
Update node-sass
2021-12-02 07:24:30 -08:00
jamelreid
0d2b20b309
Added jest object setup
2021-12-02 09:41:04 -05:00
jamelreid
35286bbbe6
Added jest-object.config.js file
...
This file is intended to be used to configure the jest object in a single place.
The setupJestObject method can be imported from @woocommerce/e2e-environment for easy usage.
2021-12-02 09:40:27 -05:00
Rodel
c40d12fc50
Simplified test data setup
2021-12-02 21:52:25 +08:00
Rodel
d10e40f8fa
Merge branch 'trunk' into add/api-tests-add-complex-order
2021-12-02 21:35:16 +08:00
Rodel
daa43add85
Improved test readability
2021-12-02 21:33:52 +08:00
Rodel
46d60f9b87
Add api group to test, and other minor changes
2021-12-02 14:06:19 +08:00
jamelreid
3a39d7d9fc
Updated check for default category
2021-12-01 15:48:31 -05:00
jamelreid
6fa14b0b6c
Set jest.retryTimes wih the E2E_RETRY_TIME env
2021-12-01 14:35:25 -05:00
jamelreid
920c1a7580
Updated testRunner to be jest-circus
2021-12-01 14:35:06 -05:00