Filter Products by Price test: wait for submit button to appear befor…

…e saving the post (III)
woocommerce · Mar 31, 2023 · d2fb4f1 · d2fb4f1
1 parent 0666043
commit d2fb4f1
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/tests/e2e/specs/shopper/filter-products-by-attribute.test.ts b/tests/e2e/specs/shopper/filter-products-by-attribute.test.ts
@@ -48,6 +48,8 @@ const block = {
 			classicProductsList: '.products.columns-3 > li',
 			filter: "input[id='128gb']",
 			submitButton: '.wc-block-components-filter-submit-button',
+			XPathSubmitButton:
+				"//*[contains(@class,'wc-block-components-filter-submit-button')]",
 		},
 	},
 	urlSearchParamWhenFilterIsApplied:
@@ -71,8 +73,8 @@ describe( `${ block.name } Block`, () => {
 				title: block.name,
 			} );
 
-			await insertBlockUsingQuickInserter( 'All Products' );
 			await insertBlock( block.name );
+			await insertBlockUsingQuickInserter( 'All Products' );
 			const canvasEl = canvas();
 
 			// It seems that .click doesn't work well with radio input element.
@@ -198,6 +200,9 @@ describe( `${ block.name } Block`, () => {
 				block.selectors.editor.filterButtonToggle
 			);
 			await filterButtonToggle.click();
+
+			await canvas().waitForXPath( selectors.frontend.XPathSubmitButton );
+
 			await saveTemplate();
 			await goToShopPage();
 
@@ -317,6 +322,9 @@ describe( `${ block.name } Block`, () => {
 				block.selectors.editor.filterButtonToggle
 			);
 			await filterButtonToggle.click();
+
+			await canvas().waitForXPath( selectors.frontend.XPathSubmitButton );
+
 			await saveOrPublish();
 			await page.goto( frontedPageUrl );
 

diff --git a/tests/e2e/specs/shopper/filter-products-by-price.test.ts b/tests/e2e/specs/shopper/filter-products-by-price.test.ts
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import {
+	canvas,
 	createNewPost,
 	deleteAllTemplates,
 	insertBlock,
@@ -43,7 +44,7 @@ const block = {
 			classicProductsList: '.products.columns-3 > li',
 			submitButton: '.wc-block-components-filter-submit-button',
 			XPathSubmitButton:
-				"//button[contains(@class,'wc-block-components-filter-submit-button')]",
+				"//*[contains(@class,'wc-block-components-filter-submit-button')]",
 		},
 	},
 	urlSearchParamWhenFilterIsApplied: '?max_price=2',
@@ -77,8 +78,8 @@ describe( `${ block.name } Block`, () => {
 			} );
 
 			await insertBlock( block.name );
-			await insertBlockUsingSlash( 'All Products' );
 			await insertBlock( 'Active Filters' );
+			await insertBlockUsingSlash( 'All Products' );
 			await publishPost();
 
 			const link = await page.evaluate( () =>
@@ -200,7 +201,7 @@ describe( `${ block.name } Block`, () => {
 			);
 			await filterButtonToggle.click();
 
-			await page.waitForXPath( selectors.frontend.XPathSubmitButton );
+			await canvas().waitForXPath( selectors.frontend.XPathSubmitButton );
 
 			await saveTemplate();
 			await goToShopPage();
@@ -249,9 +250,9 @@ describe( `${ block.name } Block`, () => {
 				title: block.name,
 			} );
 
-			await insertBlock( 'Products (Beta)' );
 			await insertBlock( block.name );
 			await insertBlock( 'Active Filters' );
+			await insertBlock( 'Products (Beta)' );
 			await page.waitForNetworkIdle();
 			await publishPost();
 
@@ -314,7 +315,7 @@ describe( `${ block.name } Block`, () => {
 			);
 			await filterButtonToggle.click();
 
-			await page.waitForXPath( selectors.frontend.XPathSubmitButton );
+			await canvas().waitForXPath( selectors.frontend.XPathSubmitButton );
 
 			await saveOrPublish();
 			await page.goto( frontedPageUrl );

diff --git a/tests/e2e/specs/shopper/filter-products-by-rating.test.ts b/tests/e2e/specs/shopper/filter-products-by-rating.test.ts
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import {
+	canvas,
 	createNewPost,
 	deleteAllTemplates,
 	insertBlock,
@@ -45,6 +46,8 @@ const block = {
 			classicProductsList: '.products.columns-3 > li',
 			fiveStarInput: ".wc-block-rating-filter label[for='5'] input",
 			submitButton: '.wc-block-components-filter-submit-button',
+			XPathSubmitButton:
+				"//*[contains(@class,'wc-block-components-filter-submit-button')]",
 		},
 	},
 	urlSearchParamWhenFilterIsApplied: '?rating_filter=5',
@@ -173,6 +176,9 @@ describe( `${ block.name } Block`, () => {
 				selectors.editor.filterButtonToggle
 			);
 			await filterButtonToggle.click();
+
+			await canvas().waitForXPath( selectors.frontend.XPathSubmitButton );
+
 			await saveTemplate();
 			await goToShopPage();
 
@@ -224,8 +230,8 @@ describe( `${ block.name } Block`, () => {
 				title: block.name,
 			} );
 
-			await insertBlock( 'Products (Beta)' );
 			await insertBlock( block.name );
+			await insertBlock( 'Products (Beta)' );
 			await page.waitForNetworkIdle();
 			await publishPost();
 

diff --git a/tests/e2e/specs/shopper/filter-products-by-stock.test.ts b/tests/e2e/specs/shopper/filter-products-by-stock.test.ts
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import {
+	canvas,
 	createNewPost,
 	deleteAllTemplates,
 	insertBlock,
@@ -44,6 +45,8 @@ const block = {
 			classicProductsList: '.products.columns-3 > li',
 			filter: 'input[id=outofstock]',
 			submitButton: '.wc-block-components-filter-submit-button',
+			XPathSubmitButton:
+				"//*[contains(@class,'wc-block-components-filter-submit-button')]",
 			queryProductsList: '.wp-block-post-template > li',
 		},
 	},
@@ -178,6 +181,9 @@ describe( `${ block.name } Block`, () => {
 				selectors.editor.filterButtonToggle
 			);
 			await filterButtonToggle.click();
+
+			await canvas().waitForXPath( selectors.frontend.XPathSubmitButton );
+
 			await saveTemplate();
 			await goToShopPage();
 
@@ -230,8 +236,8 @@ describe( `${ block.name } Block`, () => {
 				title: block.name,
 			} );
 
-			await insertBlock( 'Products (Beta)' );
 			await insertBlock( block.name );
+			await insertBlock( 'Products (Beta)' );
 			await publishPost();
 
 			editorPageUrl = page.url();