Merge branch 'trunk' into add/plugin-check

woocommerce · Jan 17, 2025 · b4a681b · b4a681b
2 parents 5d12297 + d29932b
commit b4a681b
Show file tree

Hide file tree

Showing 24 changed files with 74 additions and 62 deletions.
diff --git a/includes/Handlers/Products.php b/includes/Handlers/Products.php
@@ -553,6 +553,11 @@ public function set_synced_with_square( $product ) {
 		if ( is_string( $square_synced ) ) {
 			$errors = $this->check_product_sync_errors( $product );
 			if ( 'no' === $square_synced || empty( $errors ) ) {
+				if ( 'yes' === $square_synced && $product->is_type( 'variable' ) && wc_square()->get_settings_handler()->is_inventory_sync_enabled() ) {
+					// if syncing inventory with Square, parent variable products don't manage stock
+					$product->set_manage_stock( false );
+				}
+
 				Product::set_synced_with_square( $product, $square_synced );
 			} elseif ( ! empty( $errors ) ) {
 				foreach ( $errors as $error ) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
   "devDependencies": {
     "@playwright/test": "^1.44.1",
     "@woocommerce/dependency-extraction-webpack-plugin": "^3.0.1",
+    "@woocommerce/e2e-utils-playwright": "^0.2.1",
     "@woocommerce/eslint-plugin": "^2.3.0",
     "@wordpress/env": "^10.0.0",
     "@wordpress/scripts": "^24.6.0",

diff --git a/src/js/frontend/wc-square.js b/src/js/frontend/wc-square.js
@@ -314,6 +314,9 @@ jQuery( document ).ready( ( $ ) => {
 										false,
 										verificationResult
 									);
+								})
+								.catch(error => {
+									this.handle_errors([ error ]);
 								});
 						});
 					} else {
@@ -421,7 +424,10 @@ jQuery( document ).ready( ( $ ) => {
 							false,
 							verificationResult
 						);
-				});
+					})
+					.catch(error => {
+						this.handle_errors([ error ]);
+					});;
 			});
 		}
 

diff --git a/tests/e2e/specs/a6.transaction-authorize.spec.js b/tests/e2e/specs/a6.transaction-authorize.spec.js
@@ -1,5 +1,6 @@
 import { chromium } from 'playwright';
 import { test, expect } from '@playwright/test';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 import {
 	createProduct,
 	doesProductExist,
@@ -60,8 +61,7 @@ for ( const isBlock of isBlockCheckout ) {
 	test( title + 'Payment Gateway > Transaction Type > Authorization @general', async ( {
 		page,
 	} ) => {
-		await page.goto( '/product/simple-product' );
-		await page.locator( '.single_add_to_cart_button' ).click();
+		await addOneOrMoreProductToCart( page, 'simple-product' );
 
 		await visitCheckout( page, isBlock );
 		await fillAddressFields( page, isBlock );

diff --git a/tests/e2e/specs/a7.transaction-authorize-virtual-only.spec.js b/tests/e2e/specs/a7.transaction-authorize-virtual-only.spec.js
@@ -1,5 +1,6 @@
 import { chromium } from 'playwright';
 import { test, expect } from '@playwright/test';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 import {
 	createProduct,
 	doesProductExist,
@@ -53,8 +54,7 @@ test.beforeAll( 'Setup', async ( { baseURL } ) => {
 test( 'Payment Gateway > Transaction Type > Authorization + Virtual Only @general', async ( {
 	page,
 } ) => {
-	await page.goto( '/product/virtual-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'virtual-product' );
 
 	await visitCheckout( page, false );
 	await fillAddressFields( page, false );
@@ -93,8 +93,7 @@ test( 'Payment Gateway > Transaction Type > Authorization + Virtual Only but cha
 
 	await savePaymentGatewaySettings( page );
 
-	await page.goto( '/product/virtual-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'virtual-product' );
 
 	await visitCheckout( page, false );
 	await fillAddressFields( page, false );

diff --git a/tests/e2e/specs/a8.transaction-authorize-paid-order.spec.js b/tests/e2e/specs/a8.transaction-authorize-paid-order.spec.js
@@ -1,5 +1,6 @@
 import { chromium } from 'playwright';
 import { test, expect } from '@playwright/test';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 import {
 	createProduct,
 	doesProductExist,
@@ -47,8 +48,7 @@ test.beforeAll( 'Setup', async ( { baseURL } ) => {
 test( 'Payment Gateway > Transaction Type > Authorization + Capture Paid Orders @general', async ( {
 	page,
 } ) => {
-	await page.goto( '/product/simple-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'simple-product' );
 
 	await visitCheckout( page, false );
 	await fillAddressFields( page, false );

diff --git a/tests/e2e/specs/a9.transaction-capture.spec.js b/tests/e2e/specs/a9.transaction-capture.spec.js
@@ -1,5 +1,6 @@
 import { chromium } from 'playwright';
 import { test, expect } from '@playwright/test';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 import {
 	fillAddressFields,
 	fillCreditCardFields,
@@ -31,8 +32,7 @@ test.beforeAll( 'Setup', async ( { baseURL } ) => {
 test( 'Payment Gateway > Transaction Type > Authorization @general', async ( {
 	page,
 } ) => {
-	await page.goto( '/product/simple-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'simple-product' );
 
 	await visitCheckout( page, false );
 	await fillAddressFields( page, false );

diff --git a/tests/e2e/specs/a91.card-logos.spec.js b/tests/e2e/specs/a91.card-logos.spec.js
@@ -1,11 +1,10 @@
 import { test, expect } from '@playwright/test';
-import { chromium } from 'playwright';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 import { savePaymentGatewaySettings } from '../utils/helper';
 
 
 test( 'Payment Gateway - Accepted Card Logos @general', async ( { page } ) => {
-	await page.goto( '/product/simple-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'simple-product' );
 	await page.goto( '/checkout-old' );
 
 	await expect(

diff --git a/tests/e2e/specs/a92.currency-support.spec.js b/tests/e2e/specs/a92.currency-support.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { chromium } from 'playwright';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 
 import {
 	visitCheckout,
@@ -26,8 +27,7 @@ test.beforeAll( 'Setup', async ( { baseURL } ) => {
 test( 'Square credit card should available only for the supported currencies @general', async ( { page } ) => {
 	// Update currency to INR
 	await runWpCliCommand('wp option update woocommerce_currency "INR"');
-	await page.goto( '/product/simple-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'simple-product' );
 	// Confirm that the Credit card is not visible on checkout page.
 	await visitCheckout(page, false);
 	await expect(

diff --git a/tests/e2e/specs/a93.credit-card-form-fields.spec.js b/tests/e2e/specs/a93.credit-card-form-fields.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { chromium } from 'playwright';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 
 import {
 	visitCheckout,
@@ -23,8 +24,7 @@ test.beforeAll( 'Setup', async ( { baseURL } ) => {
 } );
 
 test( 'Verify square credit card form fields @general', async ( { page } ) => {
-	await page.goto( '/product/simple-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'simple-product' );
 	// Confirm that the Credit card is not visible on checkout page.
 	await visitCheckout(page, true);
 

diff --git a/tests/e2e/specs/b1.tokenization.spec.js b/tests/e2e/specs/b1.tokenization.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { chromium } from 'playwright';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 
 import {
 	fillAddressFields,
@@ -45,8 +46,7 @@ for ( const isBlock of isBlockCheckout ) {
 
 	test( title + 'Payment Gateway - Customer Profiles @general', async ( { page } ) => {
 		await deleteAllPaymentMethods( page );
-		await page.goto( '/product/simple-product' );
-		await page.locator( '.single_add_to_cart_button' ).click();
+		await addOneOrMoreProductToCart( page, 'simple-product' );
 		await visitCheckout( page, isBlock );
 
 		await fillAddressFields( page, isBlock );
@@ -79,8 +79,7 @@ for ( const isBlock of isBlockCheckout ) {
 	} );
 
 	test( title + 'Checkout using saved card @general', async ( { page } ) => {
-		await page.goto( '/product/simple-product' );
-		await page.locator( '.single_add_to_cart_button' ).click();
+		await addOneOrMoreProductToCart( page, 'simple-product' );
 		await visitCheckout( page, isBlock );
 
 		if ( isBlock ) {

diff --git a/tests/e2e/specs/b3.gift-card-full-payment.spec.js b/tests/e2e/specs/b3.gift-card-full-payment.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { chromium } from 'playwright';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 
 import {
 	createProduct,
@@ -40,8 +41,7 @@ test.beforeAll( 'Setup', async ( { baseURL } ) => {
 let orderId;
 
 test( 'Gift card - Full payment @giftcard', async ( { page } ) => {
-	await page.goto( '/product/dollar-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'dollar-product' );
 
 	await page.goto( '/checkout-old' );
 	await fillAddressFields( page, false );

diff --git a/tests/e2e/specs/b4.gift-card-partial-payment.spec.js b/tests/e2e/specs/b4.gift-card-partial-payment.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { chromium } from 'playwright';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 
 import {
 	createProduct,
@@ -43,8 +44,7 @@ test.beforeAll( 'Setup', async ( { baseURL } ) => {
 let orderId = 0;
 
 test( 'Gift card - Partial payment @giftcard', async ( { page } ) => {
-	await page.goto( '/product/simple-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'simple-product' );
 
 	await page.goto( '/checkout-old' );
 	await fillAddressFields( page, false );

diff --git a/tests/e2e/specs/b5.gift-card-full-refund.spec.js b/tests/e2e/specs/b5.gift-card-full-refund.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { chromium } from 'playwright';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 
 import {
 	createProduct,
@@ -41,8 +42,7 @@ test.beforeAll( 'Setup', async ( { baseURL } ) => {
 
 test( 'Full Refund Gift card order @giftcard', async ( { page } ) => {
 	page.on('dialog', dialog => dialog.accept());
-	await page.goto( '/product/dollar-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'dollar-product' );
 
 	await page.goto( '/checkout-old' );
 	await fillAddressFields( page, false );

diff --git a/tests/e2e/specs/b6.gift-card-partial-refund.spec.js b/tests/e2e/specs/b6.gift-card-partial-refund.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { chromium } from 'playwright';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 
 import {
 	createProduct,
@@ -41,8 +42,7 @@ test.beforeAll( 'Setup', async ( { baseURL } ) => {
 
 test( 'Partial Refund – Gift card order @giftcard', async ( { page } ) => {
 	page.on('dialog', dialog => dialog.accept());
-	await page.goto( '/product/dollar-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'dollar-product' );
 
 	await page.goto( '/checkout-old' );
 	await fillAddressFields( page, false );

diff --git a/tests/e2e/specs/b7.gift-card-partial-payment-partial-refund.spec.js b/tests/e2e/specs/b7.gift-card-partial-payment-partial-refund.spec.js
@@ -1,5 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { chromium } from 'playwright';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 
 import {
 	createProduct,
@@ -42,8 +43,7 @@ test.beforeAll( 'Setup', async ( { baseURL } ) => {
 
 test( 'Gift card - Partial payment @giftcard', async ( { page } ) => {
 	page.on('dialog', dialog => dialog.accept());
-	await page.goto( '/product/simple-product' );
-	await page.locator( '.single_add_to_cart_button' ).click();
+	await addOneOrMoreProductToCart( page, 'simple-product' );
 
 	await page.goto( '/checkout-old' );
 	await fillAddressFields( page, false );

diff --git a/tests/e2e/specs/d1.cash-app-pay.spec.js b/tests/e2e/specs/d1.cash-app-pay.spec.js
@@ -1,4 +1,5 @@
 import { test, expect, devices, chromium } from '@playwright/test';
+import { addOneOrMoreProductToCart } from '@woocommerce/e2e-utils-playwright';
 import {
 	clearCart,
 	createProduct,
@@ -54,8 +55,7 @@ test.describe('Cash App Pay Tests @cashapp', () => {
 			enabled: false,
 		});
 
-		await page.goto('/product/simple-product');
-		await page.locator('.single_add_to_cart_button').click();
+		await addOneOrMoreProductToCart( page, 'simple-product' );
 
 		// Confirm that the Cash App Pay is not visible on checkout page.
 		await visitCheckout(page, false);
@@ -305,8 +305,7 @@ test.describe('Cash App Pay Tests @cashapp', () => {
 					...iPhone,
 				});
 				const page = await context.newPage();
-				await page.goto('/product/simple-product');
-				await page.locator('.single_add_to_cart_button').click();
+				await addOneOrMoreProductToCart( page, 'simple-product' );
 				await visitCheckout(page, isBlock);
 				await fillAddressFields(page, isBlock);
 				await selectPaymentMethod(page, 'square_cash_app_pay', isBlock);
@@ -332,8 +331,7 @@ test.describe('Cash App Pay Tests @cashapp', () => {
 				...iPhone,
 			});
 			const page = await context.newPage();
-			await page.goto('/product/simple-product');
-			await page.locator('.single_add_to_cart_button').click();
+			await addOneOrMoreProductToCart( page, 'simple-product' );
 			await expect(
 				page.getByRole('link', { name: 'View cart' }).first()
 			).toBeVisible();
@@ -366,9 +364,8 @@ test.describe('Cash App Pay Tests @cashapp', () => {
 		});
 		const page = await context.newPage();
 		await clearCart( page );
-		await page.goto('/product/simple-product');
 		page.on('dialog', dialog => dialog.accept());
-		await page.locator('.single_add_to_cart_button').click();
+		await addOneOrMoreProductToCart( page, 'simple-product' );
 		await visitCheckout(page, isBlock);
 		await fillAddressFields(page, isBlock);
 		await selectPaymentMethod(page, 'square_cash_app_pay', isBlock);
@@ -388,9 +385,8 @@ test.describe('Cash App Pay Tests @cashapp', () => {
 			...iPhone,
 		});
 		const page = await context.newPage();
-		await page.goto('/product/simple-product');
 		page.on('dialog', dialog => dialog.accept());
-		await page.locator('.single_add_to_cart_button').click();
+		await addOneOrMoreProductToCart( page, 'simple-product' );
 		await visitCheckout(page, isBlock);
 		await fillAddressFields(page, isBlock);
 		await selectPaymentMethod(page, 'square_cash_app_pay', isBlock);

diff --git a/tests/e2e/specs/d2.cash-app-pay-inventory-sync.spec.js b/tests/e2e/specs/d2.cash-app-pay-inventory-sync.spec.js
@@ -94,9 +94,8 @@ test.describe('Cash App Pay Inventory Sync Tests', () => {
 			...iPhone,
 		});
 		const mobilePage = await context.newPage();
-		await mobilePage.goto('/product/sample-product-with-inventory/');
 		mobilePage.on('dialog', (dialog) => dialog.accept());
-		await mobilePage.locator('.single_add_to_cart_button').click();
+		await addOneOrMoreProductToCart( mobilePage, 'sample-product-with-inventory' );
 		await visitCheckout(mobilePage, isBlock);
 		await fillAddressFields(mobilePage, isBlock);
 		await selectPaymentMethod(mobilePage, 'square_cash_app_pay', isBlock);