Sync

Fixes #14752
Use a consistent table id when syncing terms.

Author: roccotripaldi

packages/sync/src/modules/class-terms.php

@@ -34,7 +34,7 @@ public function name() {
 	 * @return string
 	 */
 	public function id_field() {
-		return 'term_id';
+		return 'term_taxonomy_id';
 	}
 
 	/**

tests/php/sync/test_class.jetpack-sync-terms.php

@@ -45,7 +45,7 @@ public function tearDown() {
 	public function test_insert_term_is_synced() {
 		$terms        = $this->get_terms();
 		$server_terms = $this->server_replica_storage->get_terms( $this->taxonomy );
-		$this->assertEqualsObject( $terms, $server_terms );
+		$this->assertEqualsObject( $terms, $server_terms, 'Synced terms do not match local terms.' );
 
 		$event_data = $this->server_event_storage->get_most_recent_event( 'jetpack_sync_add_term' );
 		$this->assertTrue( (bool) $event_data );
@@ -61,7 +61,7 @@ public function test_update_term_is_synced() {
 
 		$terms        = $this->get_terms();
 		$server_terms = $this->server_replica_storage->get_terms( $this->taxonomy );
-		$this->assertEqualsObject( $terms, $server_terms );
+		$this->assertEqualsObject( $terms, $server_terms, 'Synced terms do not match local terms.' );
 	}
 
 	public function test_delete_term_is_synced() {
@@ -80,7 +80,7 @@ public function test_added_terms_to_post_is_synced() {
 
 		$object_terms        = get_the_terms( $this->post_id, $this->taxonomy );
 		$server_object_terms = $this->server_replica_storage->get_the_terms( $this->post_id, $this->taxonomy );
-		$this->assertEqualsObject( $object_terms, $server_object_terms );
+		$this->assertEqualsObject( $object_terms, $server_object_terms, 'Synced terms do not match local terms.' );
 	}
 
 	public function test_added_terms_to_post_is_synced_appended() {
@@ -94,7 +94,7 @@ public function test_added_terms_to_post_is_synced_appended() {
 		$object_terms        = get_the_terms( $this->post_id, $this->taxonomy );
 		$server_object_terms = $this->server_replica_storage->get_the_terms( $this->post_id, $this->taxonomy );
 		$server_object_terms = array_reverse( $server_object_terms );
-		$this->assertEqualsObject( $object_terms, $server_object_terms );
+		$this->assertEqualsObject( $object_terms, $server_object_terms, 'Synced terms do not match local terms.' );
 	}
 
 	public function test_deleted_terms_to_post_is_synced() {
@@ -112,7 +112,7 @@ public function test_deleted_terms_to_post_is_synced() {
 		$server_object_terms = $this->server_replica_storage->get_the_terms( $this->post_id, $this->taxonomy );
 		$server_object_terms = array_reverse( $server_object_terms );
 
-		$this->assertEqualsObject( $object_terms, $server_object_terms );
+		$this->assertEqualsObject( $object_terms, $server_object_terms, 'Synced terms do not match local terms.' );
 	}
 
 	public function test_delete_object_term_relationships() {