Merge branch 'trunk' into add/form-responses-v2-endpoint

Automattic · Feb 24, 2023 · 671aded · 671aded
2 parents ba13141 + ba6503a
commit 671aded
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/projects/plugins/jetpack/changelog/fix-test-sync-posts-delete-event-type b/projects/plugins/jetpack/changelog/fix-test-sync-posts-delete-event-type
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Test fix: adapted the Sync test to WordPress Core changes in post deletion mechanics.
diff --git a/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-posts.php b/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-posts.php
@@ -134,7 +134,11 @@ public function test_delete_post_syncs_event() {
 		wp_delete_post( $this->post->ID, true );
 
 		$this->sender->do_sync();
-		$event = $this->server_event_storage->get_most_recent_event();
+
+		// Only getting the deleted_post event types because the latest might be
+		// an option update for post counts.
+		// @see https://core.trac.wordpress.org/changeset/55419/trunk
+		$event = $this->server_event_storage->get_most_recent_event( 'deleted_post' );
 
 		$this->assertEquals( 'deleted_post', $event->action );
 		$this->assertEquals( $this->post->ID, $event->args[0] );