Merge branch 'feature/google-api-project' into dev/notifications-e2e-…

…grant-acess

changelog.txt

@@ -1,5 +1,10 @@
 *** WooCommerce Google Listings and Ads Changelog ***
 
+= 2.7.6 - 2024-07-09 =
+* Dev - Update connect server URL in test proxy configuration.
+* Tweak - WC 9.1 compatibility.
+* Tweak - WP 6.6 compatibility.
+
 = 2.7.5 - 2024-06-26 =
 * Add - Add an query parameter `campaign=saved` to the dashboard URL after the campaign was created.
 

google-listings-and-ads.php

@@ -3,17 +3,17 @@
  * Plugin Name: Google Listings and Ads
  * Plugin URL: https://wordpress.org/plugins/google-listings-and-ads/
  * Description: Native integration with Google that allows merchants to easily display their products across Google’s network.
- * Version: 2.7.5
+ * Version: 2.7.6
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
  * Text Domain: google-listings-and-ads
  * Requires at least: 5.9
- * Tested up to: 6.5
+ * Tested up to: 6.6
  * Requires PHP: 7.4
  * Requires PHP Architecture: 64 bits
  * Requires Plugins: woocommerce
  * WC requires at least: 6.9
- * WC tested up to: 9.0
+ * WC tested up to: 9.1
  * Woo:
  *
  * @package WooCommerce\Admin
@@ -30,7 +30,7 @@
 
 defined( 'ABSPATH' ) || exit;
 
-define( 'WC_GLA_VERSION', '2.7.5' ); // WRCS: DEFINED_VERSION.
+define( 'WC_GLA_VERSION', '2.7.6' ); // WRCS: DEFINED_VERSION.
 define( 'WC_GLA_MIN_PHP_VER', '7.4' );
 define( 'WC_GLA_MIN_WC_VER', '6.9' );
 

js/src/components/paid-ads/budget-section/index.js

@@ -58,10 +58,14 @@ const BudgetSection = ( { formProps, disabled = false, children } ) => {
 			<Section
 				disabled={ disabled }
 				title={ __( 'Set your budget', 'google-listings-and-ads' ) }
-				description={ __(
-					'With Performance Max campaigns, you can set your own budget and Google’s Smart Bidding technology will serve the most appropriate ad, with the optimal bid, to maximize campaign performance. You only pay when people click on your ads, and you can start or stop your campaign whenever you want.',
-					'google-listings-and-ads'
-				) }
+				description={
+					<p>
+						{ __(
+							'With Performance Max campaigns, you can set your own budget and Google’s Smart Bidding technology will serve the most appropriate ad, with the optimal bid, to maximize campaign performance. You only pay when people click on your ads, and you can start or stop your campaign whenever you want.',
+							'google-listings-and-ads'
+						) }
+					</p>
+				}
 			>
 				<Section.Card>
 					<Section.Card.Body className="gla-budget-section__card-body">

js/src/components/paid-ads/campaign-preview/campaign-preview-card.js

@@ -36,7 +36,7 @@ export default function CampaignPreviewCard() {
 	return (
 		<Section.Card className="gla-campaign-preview-card">
 			<Section.Card.Body>
-				<Flex align="start" gap={ 9 }>
+				<Flex align="start" gap={ 9 } direction={ [ 'column', 'row' ] }>
 					<FlexBlock>
 						<Section.Card.Title>
 							{ __(

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "google-listings-and-ads",
 	"title": "Google Listings and Ads",
-	"version": "2.7.5",
+	"version": "2.7.6",
 	"description": "google-listings-and-ads",
 	"author": "Automattic",
 	"license": "GPL-3.0-or-later",

readme.txt

@@ -2,10 +2,10 @@
 Contributors: automattic, google, woocommerce
 Tags: woocommerce, google, product feed, ads, listings
 Requires at least: 5.9
-Tested up to: 6.5
+Tested up to: 6.6
 Requires PHP: 7.4
 Requires PHP Architecture: 64 Bits
-Stable tag: 2.7.5
+Stable tag: 2.7.6
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -111,6 +111,11 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
 
 == Changelog ==
 
+= 2.7.6 - 2024-07-09 =
+* Dev - Update connect server URL in test proxy configuration.
+* Tweak - WC 9.1 compatibility.
+* Tweak - WP 6.6 compatibility.
+
 = 2.7.5 - 2024-06-26 =
 * Add - Add an query parameter `campaign=saved` to the dashboard URL after the campaign was created.
 
@@ -119,8 +124,4 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
 * Dev - Add E2E tests for WP Consent API integration.
 * Tweak - Add docs note about WP Consent API integration.
 
-= 2.7.3 - 2024-06-18 =
-* Fix - Fatal error when loading campaign in the marketing overview section.
-* Tweak -  Replace woo.com references with woocommerce.com.
-
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/google-listings-and-ads/trunk/changelog.txt).

tests/e2e/specs/product-editor/block-integration.test.js

@@ -529,7 +529,9 @@ test.describe( 'Product Block Editor integration', () => {
 
 		await input.fill( '-1' );
 
-		await editorUtils.assertUnableSave();
+		await editorUtils.assertUnableSave(
+			'The minimum value of the field is 0'
+		);
 		await expect( help ).toBeVisible();
 		await expect( help ).toHaveText(
 			await editorUtils.evaluateValidationMessage( input )

tests/e2e/utils/mock-requests.js

@@ -46,7 +46,7 @@ export default class MockRequests {
 	 */
 	async fulfillWCDefaultCountry( payload ) {
 		await this.fulfillRequest(
-			/wc-admin\/options\?options=woocommerce_default_country\b/,
+			/wc-admin\/options\?options=.*woocommerce_default_country\b/,
 			payload
 		);
 	}

tests/e2e/utils/product-editor.js

@@ -291,8 +291,8 @@ export function getProductBlockEditorUtils( page ) {
 	const locators = {
 		getTab( tabName ) {
 			return page
-				.getByRole( 'tablist' )
-				.getByRole( 'button', { name: tabName } );
+				.locator( '.woocommerce-product-tabs' )
+				.getByRole( 'tab', { name: tabName } );
 		},
 
 		getPluginTab() {
@@ -507,17 +507,20 @@ export function getProductBlockEditorUtils( page ) {
 	};
 
 	const assertions = {
-		async assertUnableSave() {
+		async assertUnableSave( message = 'Please enter a valid value.' ) {
 			await this.clickSave();
 
 			const failureNotice = page
-				.getByRole( 'button' )
-				.filter( { hasText: 'Failed to save product' } );
+				.locator( '.components-snackbar__content' )
+				.filter( { hasText: new RegExp( message ) } );
+
+			const failureNoticeDismissButton =
+				failureNotice.getByRole( 'button' );
 
 			await expect( failureNotice ).toBeVisible();
 
 			// Dismiss the notice.
-			await failureNotice.click();
+			await failureNoticeDismissButton.click();
 			await expect( failureNotice ).toHaveCount( 0 );
 		},
 	};