Merge pull request #235 from woocommerce/25-01/sync-960-beta-2

9.6.0-beta.2 sync
woocommerce · Jan 8, 2025 · 77fae01 · 77fae01
2 parents d651d39 + 896e3a5
commit 77fae01
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/_tests/managed_tests/tests/QITE2ETestCase.php b/_tests/managed_tests/tests/QITE2ETestCase.php
@@ -217,10 +217,6 @@ public function validate_and_normalize( string $file_path, ?callable $callback =
 			],
 			'debug_log'                       => [
 				'normalize' => function ( $value ) use ( $file_path ) {
-					if ( ! is_array( $value ) ) {
-						return $value;
-					}
-
 					if ( stripos( $file_path, 'woo-e2e/delete_products' ) !== false || stripos( $file_path, 'woo-api/delete_products' ) !== false ) {
 						return [
 							[
@@ -230,6 +226,10 @@ public function validate_and_normalize( string $file_path, ?callable $callback =
 						];
 					}
 
+					if ( ! is_array( $value ) ) {
+						return $value;
+					}
+
 					$normalize_custom_tests_debug_log = function ( $debug_log ) {
 						$normalized = [];
 						foreach ( $debug_log as $fatal_or_not => $logs ) {

diff --git a/...st__test_woo_e2e_delete_products_woorc_php74_wprc_b153920e11128a2003ccfabb5a1c2b66__1.php b/...st__test_woo_e2e_delete_products_woorc_php74_wprc_b153920e11128a2003ccfabb5a1c2b66__1.php
@@ -33,26 +33,23 @@
             "test_results_manager_url": "https:\\/\\/test-results-manager.com",
             "test_results_manager_expiration": 1234567890,
             "test_summary": "Delete_Products Normalized Summary",
+            "debug_log": [
+                {
+                    "count": "0",
+                    "message": "Debug log is ignored for woo-e2e\\/delete_products tests."
+                }
+            ],
             "version": "Undefined",
             "update_complete": true,
             "ai_suggestion_status": "none",
             "malware_whitelist_paths": [],
             "workflow_id": "1234567890",
             "runner": "normalized",
             "test_media": [],
-            "test_result_json_extracted": "{EXTRACTED}",
-            "debug_log_extracted": "{EXTRACTED}"
+            "test_result_json_extracted": "{EXTRACTED}"
         },
         {
             "test_result_json": []
-        },
-        {
-            "debug_log": [
-                {
-                    "count": "0",
-                    "message": "Debug log is ignored for woo-e2e\\/delete_products tests."
-                }
-            ]
         }
     ]
 ]';
diff --git a/...test_woo_e2e_delete_products_woostable_php74_wprc_2a952a960085a76868033dc54aa96159__1.php b/...test_woo_e2e_delete_products_woostable_php74_wprc_2a952a960085a76868033dc54aa96159__1.php
@@ -33,26 +33,23 @@
             "test_results_manager_url": "https:\\/\\/test-results-manager.com",
             "test_results_manager_expiration": 1234567890,
             "test_summary": "Delete_Products Normalized Summary",
+            "debug_log": [
+                {
+                    "count": "0",
+                    "message": "Debug log is ignored for woo-e2e\\/delete_products tests."
+                }
+            ],
             "version": "Undefined",
             "update_complete": true,
             "ai_suggestion_status": "none",
             "malware_whitelist_paths": [],
             "workflow_id": "1234567890",
             "runner": "normalized",
             "test_media": [],
-            "test_result_json_extracted": "{EXTRACTED}",
-            "debug_log_extracted": "{EXTRACTED}"
+            "test_result_json_extracted": "{EXTRACTED}"
         },
         {
             "test_result_json": []
-        },
-        {
-            "debug_log": [
-                {
-                    "count": "0",
-                    "message": "Debug log is ignored for woo-e2e\\/delete_products tests."
-                }
-            ]
         }
     ]
 ]';