Merge pull request #1254 from WP-API/1224-return-term

rmccue · rmccue · commit 3debab3c090c · 2015-05-21T11:44:35.000+10:00
Return full term object when deleting term
diff --git a/lib/endpoints/class-wp-rest-terms-controller.php b/lib/endpoints/class-wp-rest-terms-controller.php
@@ -281,8 +281,16 @@ public function delete_item( $request ) {
 
 		// Get the actual term_id
 		$term = get_term_by( 'term_taxonomy_id', (int) $request['id'], $this->taxonomy );
+		$get_request = new WP_REST_Request( 'GET', rest_url( 'wp/v2/terms/' . $this->get_taxonomy_base( $term->taxonomy ) . '/' . (int) $request['id'] ) );
+		$get_request->set_param( 'context', 'view' );
+		$response = $this->prepare_item_for_response( $term, $get_request );
 
-		wp_delete_term( $term->term_id, $term->taxonomy );
+		$retval = wp_delete_term( $term->term_id, $term->taxonomy );
+		if ( ! $retval ) {
+			return new WP_Error( 'rest_cannot_delete', __( 'The term cannot be deleted.' ), array( 'status' => 500 ) );
+		}
+		
+		return $response;
 	}
 
 	/**
diff --git a/tests/test-rest-terms-controller.php b/tests/test-rest-terms-controller.php
@@ -413,10 +413,12 @@ public function test_update_item_parent_non_hierarchical_taxonomy() {
 
 	public function test_delete_item() {
 		wp_set_current_user( $this->administrator );
-		$term = get_term_by( 'id', $this->factory->category->create(), 'category' );
+		$term = get_term_by( 'id', $this->factory->category->create( array( 'name' => 'Deleted Category' ) ), 'category' );
 		$request = new WP_REST_Request( 'DELETE', '/wp/v2/terms/category/' . $term->term_taxonomy_id );
 		$response = $this->server->dispatch( $request );
 		$this->assertEquals( 200, $response->get_status() );
+		$data = $response->get_data();
+		$this->assertEquals( 'Deleted Category', $data['name'] );
 	}
 
 	public function test_delete_item_invalid_taxonomy() {
