From eabee48a32b694e36d673aca0ea24b24abc58abb Mon Sep 17 00:00:00 2001
From: Veljko <veljano@yahoo.com>
Date: Thu, 18 Feb 2021 12:49:04 +0100
Subject: [PATCH] Remove waits and reorder test

---
 tests/e2e/core-tests/specs/index.js                         | 2 +-
 .../specs/merchant/wp-admin-settings-shipping-zones.test.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/e2e/core-tests/specs/index.js b/tests/e2e/core-tests/specs/index.js
index 03141dc3914..61fe57e7d2f 100644
--- a/tests/e2e/core-tests/specs/index.js
+++ b/tests/e2e/core-tests/specs/index.js
@@ -51,13 +51,13 @@ const runMerchantTests = () => {
 	runAddSimpleProductTest();
 	runAddVariableProductTest();
 	runUpdateGeneralSettingsTest();
+	runAddNewShippingZoneTest();
 	runProductSettingsTest();
 	runTaxSettingsTest();
 	runOrderStatusFiltersTest();
 	runOrderRefundTest();
 	runOrderApplyCouponTest();
 	runMerchantOrdersCustomerPaymentPage();
-	runAddNewShippingZoneTest();
 }
 
 module.exports = {
diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-zones.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-zones.test.js
index db705deefda..d13857b8369 100644
--- a/tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-zones.test.js
+++ b/tests/e2e/core-tests/specs/merchant/wp-admin-settings-shipping-zones.test.js
@@ -68,7 +68,7 @@ const runAddNewShippingZoneTest = () => {
 
 			// Verify shipping costs
 			await page.waitForSelector('.order-total');
-			await expect(page).toMatchElement('.shipping .amount', {text: '$10.00'}, 2000);
+			await expect(page).toMatchElement('.shipping .amount', {text: '$10.00'});
 			await expect(page).toMatchElement('.order-total .amount', {text: '$19.99'});
 
 			await shopper.removeFromCart(simpleProductName);
@@ -91,7 +91,7 @@ const runAddNewShippingZoneTest = () => {
 			// Verify shipping method and cost
 			await page.waitForSelector('.order-total');
 			await expect(page).toMatchElement('.shipping ul#shipping_method > li', {text: 'Free shipping'});
-			await expect(page).toMatchElement('.order-total .amount', {text: '$9.99'}, 2000);
+			await expect(page).toMatchElement('.order-total .amount', {text: '$9.99'});
 			
 			await shopper.removeFromCart(simpleProductName);
 		})
@@ -108,7 +108,7 @@ const runAddNewShippingZoneTest = () => {
 
 			// Verify shipping method and cost
 			await page.waitForSelector('.order-total');
-			await expect(page).toMatchElement('.shipping ul#shipping_method > li', {text: 'Local pickup'}, 2000);
+			await expect(page).toMatchElement('.shipping ul#shipping_method > li', {text: 'Local pickup'});
 			await expect(page).toMatchElement('.order-total .amount', {text: '$9.99'});
 
 			await shopper.removeFromCart(simpleProductName);