Changeset 42578

Timestamp:

01/23/2018 08:21:46 PM (5 years ago)

Author:

jorbin

Message:

REST API: Add existing term_id to the error data object when attempting to create a duplicate term.

Merges [42350] into 4.9

Props shooper, coleh, rachelbaker.
Fixes #42597. See #41370.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-categories-controller.php (modified) (1 diff)

branches/4.9/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php

@@ -416 +416 @@
                 $existing_term = get_term( $term_id, $this->taxonomy );
                 $term->add_data( $existing_term->term_id, 'term_exists' );
-                $term->add_data( array( 'status' => 409 ) );
+                $term->add_data( array( 'status' => 409, 'term_id' => $term_id ) );
             }
 

branches/4.9/tests/phpunit/tests/rest-api/rest-categories-controller.php

@@ -624 +624 @@
     public function test_create_item_term_already_exists() {
         wp_set_current_user( self::$administrator );
+        $existing_id = $this->factory->category->create( array( 'name' => 'Existing' ) );
+
         $request = new WP_REST_Request( 'POST', '/wp/v2/categories' );
-        $request->set_param( 'name', 'test' );
-        $response = $this->server->dispatch( $request );
-        $this->assertEquals( 201, $response->get_status() );
+        $request->set_param( 'name', 'Existing' );
+
         $response = $this->server->dispatch( $request );
         $this->assertEquals( 409, $response->get_status() );
         $data = $response->get_data();
         $this->assertEquals( 'term_exists', $data['code'] );
+        $this->assertEquals( $existing_id, (int) $data['data']['term_id'] );
+
+        wp_delete_term( $existing_id, 'category' );
     }