Merge pull request #2162 from woocommerce/trunk

Release 2.5.12 - Merge `trunk` to `develop`

changelog.txt

@@ -1,5 +1,12 @@
 *** WooCommerce Google Listings and Ads Changelog ***
 
+= 2.5.12 - 2023-11-22 =
+* Dev - Fix E2E gtag events tests.
+* Dev - Update WordPress CS to 3.0.
+* Dev - Update phpunit polyfills to 1.1 for WP 6.4.
+* Tweak - Add filter to be able to build custom shipping method rate handers.
+* Tweak - Remove rewrite rules flush.
+
 = 2.5.11 - 2023-11-07 =
 * Add - Record tracking events for moving steps on the campaign creation and editing pages.
 * Tweak - Add tracking for campaign count.

google-listings-and-ads.php

@@ -3,7 +3,7 @@
  * 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.5.11
+ * Version: 2.5.12
  * Author: WooCommerce
  * Author URI: https://woo.com/
  * Text Domain: google-listings-and-ads
@@ -30,7 +30,7 @@
 
 defined( 'ABSPATH' ) || exit;
 
-define( 'WC_GLA_VERSION', '2.5.11' ); // WRCS: DEFINED_VERSION.
+define( 'WC_GLA_VERSION', '2.5.12' ); // WRCS: DEFINED_VERSION.
 define( 'WC_GLA_MIN_PHP_VER', '7.4' );
 define( 'WC_GLA_MIN_WC_VER', '6.9' );
 

package.json

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

readme.txt

@@ -5,7 +5,7 @@ Requires at least: 5.9
 Tested up to: 6.4
 Requires PHP: 7.4
 Requires PHP Architecture: 64 Bits
-Stable tag: 2.5.11
+Stable tag: 2.5.12
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -111,6 +111,13 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
 
 == Changelog ==
 
+= 2.5.12 - 2023-11-22 =
+* Dev - Fix E2E gtag events tests.
+* Dev - Update WordPress CS to 3.0.
+* Dev - Update phpunit polyfills to 1.1 for WP 6.4.
+* Tweak - Add filter to be able to build custom shipping method rate handers.
+* Tweak - Remove rewrite rules flush.
+
 = 2.5.11 - 2023-11-07 =
 * Add - Record tracking events for moving steps on the campaign creation and editing pages.
 * Tweak - Add tracking for campaign count.
@@ -122,12 +129,4 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
 * Tweak - Add correct Destinations for Supported Countries in Coupons.
 * Tweak - Declare cart_checkout_blocks feature compatibility.
 
-= 2.5.9 - 2023-10-10 =
-* Dev - E2E - Setup Google Ads Step 2 - Create your paid campaign.
-* Dev - E2E - Setup Google Ads Step 3 - Setup billing data.
-* Dev - E2E tests - Track gtag event on specific page.
-* Dev - Prevent Prefix Vendor to be added twice.
-* Fix - Avoid creating two campaigns after completing the Google Ads onboarding.
-* Fix - The auto-refresh processing of billing status in the Google Ads onboarding flow.
-
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/google-listings-and-ads/trunk/changelog.txt).

tests/e2e/utils/customer.js

@@ -100,9 +100,12 @@ export async function checkout( page ) {
 		await page.locator( '#billing-state input' ).fill( user.statename );
 	}
 
+	//TODO: See if there's an alternative method to click the button without relying on waitForTimeout.
+	await page.waitForTimeout( 3000 );
+
 	await page.locator( 'text=Place order' ).click();
 
 	await expect(
-		page.locator( '.woocommerce-thankyou-order-received' )
+		page.locator( '.wc-block-order-confirmation-status' )
 	).toContainText( 'order has been received' );
 }