Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix flaky scenarios and improve code

This commit is contained in:
Veljko 2021-02-12 17:43:01 +01:00
parent 1e26d880c1
commit 2b0127f9e3
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-zones.test.js
View File

@ -29,19 +29,12 @@ const runAddNewShippingZoneTest = () => {
it('add shipping zone for San Francisco with free Local pickup', async () => { it('add shipping zone for San Francisco with free Local pickup', async () => {
// Add a new shipping zone for the US with Flat Rate // Add a new shipping zone for the US with Flat Rate
await addShippingZoneAndMethod(shippingZoneNameSF, california, 'local_pickup'); await addShippingZoneAndMethod(shippingZoneNameSF, california, sanFranciscoZIP, 'local_pickup');
// Set San Francisco as a local pickup city
await expect(page).toClick('a.wc-shipping-zone-postcodes-toggle');
await expect(page).toFill('#zone_postcodes', sanFranciscoZIP);
// Save the shipping zone
await expect(page).toClick('button#submit');
}); });
it('add shipping zone for California with Free shipping', async () => { it('add shipping zone for California with Free shipping', async () => {
// Add a new shipping zone for California with Free shipping // Add a new shipping zone for California with Free shipping
await addShippingZoneAndMethod(shippingZoneNameFL, california, 'free_shipping'); await addShippingZoneAndMethod(shippingZoneNameFL, california, ' ', 'free_shipping');
}); });
it('add shipping zone for the US with Flat rate', async () => { it('add shipping zone for the US with Flat rate', async () => {

14
tests/e2e/utils/src/components.js
View File

@ -431,12 +431,14 @@ const createCoupon = async ( couponAmount = '5', discountType = 'Fixed cart disc
* *
* @param zoneName Shipping zone name. * @param zoneName Shipping zone name.
* @param zoneLocation Shiping zone location. Defaults to United States (US). * @param zoneLocation Shiping zone location. Defaults to United States (US).
* @param zipCode TBD
* @param zoneMethod Shipping method type. Defaults to flat_rate (use also: free_shipping or local_pickup) * @param zoneMethod Shipping method type. Defaults to flat_rate (use also: free_shipping or local_pickup)
*/ */
const addShippingZoneAndMethod = async ( zoneName, zoneLocation = 'United States (US)', zoneMethod = 'flat_rate' ) => { const addShippingZoneAndMethod = async ( zoneName, zoneLocation = 'United States (US)', zipCode = ' ', zoneMethod = 'flat_rate' ) => {
await merchant.openNewShipping(); await merchant.openNewShipping();
// Fill shipping zone name // Fill shipping zone name
await page.waitForSelector('input#zone_name');
await expect(page).toFill('input#zone_name', zoneName); await expect(page).toFill('input#zone_name', zoneName);
// Select shipping zone location // Select shipping zone location
@ -445,9 +447,15 @@ const addShippingZoneAndMethod = async ( zoneName, zoneLocation = 'United States
await page.keyboard.press('Tab'); await page.keyboard.press('Tab');
await page.keyboard.press('Enter'); await page.keyboard.press('Enter');
// Fill shipping zone postcode if needed otherwise just put empty space
await expect(page).toClick('a.wc-shipping-zone-postcodes-toggle');
await expect(page).toFill('#zone_postcodes', zipCode);
await expect(page).toClick('button#submit');
// Add shipping zone method // Add shipping zone method
await expect(page).toClick('button.button.wc-shipping-zone-add-method', {text:'Add shipping method'}); await page.waitFor(1000); // avoiding flakiness
await page.waitForSelector('woocommerce_flat_rate_cost'); await expect(page).toClick('button.wc-shipping-zone-add-method', {text:'Add shipping method'});
await page.waitFor(1000); // avoiding flakiness
await expect(page).toSelect('select[name="add_method_id"]', zoneMethod); await expect(page).toSelect('select[name="add_method_id"]', zoneMethod);
await expect(page).toClick('button#btn-ok'); await expect(page).toClick('button#btn-ok');
await page.waitForSelector('#zone_locations'); await page.waitForSelector('#zone_locations');