Merge pull request #247 from woocommerce/25-02/fix/ignore-more-deprecation-warnings

Adds ignoring to the log parsing for some common deprecation warnings

Author: singerb

src/src/LocalTests/PrepareDebugLog.php

@@ -68,6 +68,25 @@ public function prepare_debug_log( string $debug_log_file, string $new_debug_log
 					continue;
 				}
 
+				// Some compatbility extension set issues.
+
+				// Ignore a deprecation warning from Jetpack about itself.
+				$is_jetpack_geo_deprecation = stripos( $line, 'Class Jetpack_Geo_Location is' ) !== false;
+
+				// Ignore a deprecated core filter for now, since subs and payments both include it in shared code.
+				// Only if we're not testing one of those though.
+				$is_woocommerce_get_price_deprecation = stripos( $line, 'Use woocommerce_product_get_price instead' ) !== false;
+				$is_testing_payments_or_subs = in_array( $sut_slug, [ 'woocommerce-payments', 'woocommerce-subscriptions' ], true );
+
+				if (
+					$is_jetpack_geo_deprecation
+					|| ( $is_woocommerce_get_price_deprecation && ! $is_testing_payments_or_subs )
+				) {
+					continue;
+				}
+
+				// End compatibility extension set issues.
+
 				/*
 				 * If we are running PHP 8+ on WordPress 6.1 or lower, ignore the following notices.
 				 * @link https://core.trac.wordpress.org/ticket/54504

src/tests/PartnerManagementTest.php

@@ -50,7 +50,27 @@ protected function get_snapshot_friendly_cache(): string {
 		 * suitable for snapshot testing.
 		 */
 
-		return preg_replace( '#"expire":\s?\d+,#', '"expire": 1234567890,', $json );
+		$json = preg_replace( '#"expire":\s?\d+,#', '"expire": 1234567890,', $json );
+
+		// Normalize known keys if the value looks like a version.
+		$version_keys = '/"(wordpress_version|woocommerce_version|stable|rc|rc_unsynced|default|playwright_version)":\s?"([^"]+)"/';
+
+		$json = preg_replace_callback( $version_keys, function ( $matches ) {
+			$key   = $matches[1];
+			$value = $matches[2];
+
+			// Simple check: starts with digits, then optionally .digits repeated,
+			// then optionally a dash with alphanumeric parts (beta, rc, etc).
+			$isVersion = preg_match( '/^\d+(?:\.\d+)*(?:-[A-Za-z0-9.\-_]+)?$/', $value );
+
+			if ( $isVersion ) {
+				$value = 'X.X.X';
+			}
+
+			return "\"{$key}\": \"{$value}\"";
+		}, $json );
+
+		return $json;
 	}
 
 	public function test_add_partner() {

src/tests/RunTestsTest.php

@@ -19,43 +19,61 @@ public function setUp(): void {
 		} );
 	}
 
+	protected function get_last_request() {
+		$request = App::getVar( 'mocked_request' );
+
+		if ( ! is_array( $request ) ) {
+			return $request;
+		}
+
+		if ( ! empty( $request['post_body']['wordpress_version'] ) ) {
+			$request['post_body']['wordpress_version'] = 'X.X.X';
+		}
+
+		if ( ! empty( $request['post_body']['woocommerce_version'] ) ) {
+			$request['post_body']['woocommerce_version'] = 'X.X.X';
+		}
+
+		return $request;
+	}
+
 	public function test_run_with_additional_plugins() {
 		App::setVar( sprintf( 'mock_%s', get_manager_url() . '/wp-json/cd/v1/enqueue-woo-e2e' ), json_encode( [
 			'test_run_id'              => 123456,
 			'test_results_manager_url' => ''
 		] ) );
 
 		$this->application_tester->run( [
-			'command'                  => 'run:woo-e2e',
-			'woo_extension'            => 'foo-extension', // Using slug.
+			'command'              => 'run:woo-e2e',
+			'woo_extension'        => 'foo-extension', // Using slug.
 			'--additional_plugins' => '456,789', // Using IDs.
 		], [ 'capture_stderr_separately' => true ] );
 
 		$this->assertCommandIsSuccessful( $this->application_tester );
-		$this->assertMatchesJsonSnapshot( App::getVar( 'mocked_request' ) );
+		$this->assertMatchesJsonSnapshot( $this->get_last_request() );
 
 		$this->application_tester->run( [
-			'command'                  => 'run:woo-e2e',
-			'woo_extension'            => '123', // Using ID.
+			'command'              => 'run:woo-e2e',
+			'woo_extension'        => '123', // Using ID.
 			'--additional_plugins' => 'bar-extension,baz-extension', // Using Slugs.
 		], [ 'capture_stderr_separately' => true ] );
 
 		// If this fails, debug "$this->application_tester->getDisplay()".
 		$this->assertCommandIsSuccessful( $this->application_tester );
-		$this->assertMatchesJsonSnapshot( App::getVar( 'mocked_request' ) );
+		$this->assertMatchesJsonSnapshot( $this->get_last_request() );
 
 		$this->application_tester->run( [
-			'command'                  => 'run:woo-e2e',
-			'woo_extension'            => 'foo-extension', // Using ID.
+			'command'              => 'run:woo-e2e',
+			'woo_extension'        => 'foo-extension', // Using ID.
 			'--additional_plugins' => '456,baz-extension', // Using mixed.
 		], [ 'capture_stderr_separately' => true ] );
 
 		$this->assertCommandIsSuccessful( $this->application_tester );
-		$this->assertMatchesJsonSnapshot( App::getVar( 'mocked_request' ) );
+		$this->assertMatchesJsonSnapshot( $this->get_last_request() );
 
 		$this->application_tester->run( [
-			'command'                  => 'run:woo-e2e',
-			'woo_extension'            => 'foo-extension',
+			'command'              => 'run:woo-e2e',
+			'woo_extension'        => 'foo-extension',
 			'--additional_plugins' => '1234567890', // If the user passes an invalid ID, the Manager should flag that.
 		], [ 'capture_stderr_separately' => true ] );
 
@@ -73,7 +91,7 @@ public function test_run_with_additional_plugins_invalid() {
 				'woo_extension' => 'non-existing-extension',
 			], [ 'capture_stderr_separately' => true ] );
 		} catch ( \Exception $e ) {
-			$this->assertStringContainsString('Could not find Woo Extension with slug non-existing-extension.', $e->getMessage() );
+			$this->assertStringContainsString( 'Could not find Woo Extension with slug non-existing-extension.', $e->getMessage() );
 
 			throw $e;
 		}