Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates per feedback.

This commit is contained in:
Timmy Crawford 2019-02-21 15:15:10 -08:00 committed by Kelly Dwan
parent 4311670956
commit c1313d433c
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
includes/api/wc-blocks/class-wc-blocks-rest-product-attribute-terms-controller.php
View File

@ -2,7 +2,7 @@
/**
* REST API Product Attribute Terms controller customized for Products Block.
*
* Handles requests to the /products/categories endpoint.
* Handles requests to the /products/attributes/<attribute_id/terms endpoint.
*
* @package WooCommerce\Blocks\Products\Rest\Controller
*/
@ -114,8 +114,11 @@ class WC_REST_Blocks_Product_Attribute_Terms_Controller extends WC_REST_Product_
'name' => $item->name,
'slug' => $item->slug,
'count' => (int) $item->count,
'attr_name' => $attribute->name,
'attr_slug' => $attribute->slug,
'attribute' => array(
'id' => $attribute->id,
'name' => $attribute->name,
'slug' => $attribute->slug,
),
);
$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
@ -138,7 +141,7 @@ class WC_REST_Blocks_Product_Attribute_Terms_Controller extends WC_REST_Product_
$raw_schema = parent::get_item_schema();
$schema = array(
'$schema' => 'http://json-schema.org/draft-04/schema#',
'title' => 'product_block_category',
'title' => 'product_attribute_term',
'type' => 'object',
'properties' => array(),
);
@ -147,20 +150,30 @@ class WC_REST_Blocks_Product_Attribute_Terms_Controller extends WC_REST_Product_
$schema['properties']['name'] = $raw_schema['properties']['name'];
$schema['properties']['slug'] = $raw_schema['properties']['slug'];
$schema['properties']['count'] = $raw_schema['properties']['count'];
$schema['properties']['attr_name'] = array(
'description' => __( 'Attribute group name.', 'woo-gutenberg-products-block' ),
'type' => 'string',
$schema['properties']['attribute'] = array(
'description' => __( 'Attribute.', 'woocommerce' ),
'type' => 'object',
'context' => array( 'view', 'edit' ),
'arg_options' => array(
'sanitize_callback' => 'sanitize_text_field',
),
);
$schema['properties']['attr_slug'] = array(
'description' => __( 'An alphanumeric identifier for the resource unique to its type.', 'woo-gutenberg-products-block' ),
'type' => 'string',
'context' => array( 'view', 'edit' ),
'arg_options' => array(
'sanitize_callback' => 'sanitize_title',
'readonly' => true,
'properties' => array(
'id' => array(
'description' => __( 'Attribute ID.', 'woocommerce' ),
'type' => 'integer',
'context' => array( 'view', 'edit' ),
'readonly' => true,
),
'name' => array(
'description' => __( 'Attribute name.', 'woocommerce' ),
'type' => 'string',
'context' => array( 'view', 'edit' ),
'readonly' => true,
),
'slug' => array(
'description' => __( 'Attribute slug.', 'woocommerce' ),
'type' => 'string',
'context' => array( 'view', 'edit' ),
'readonly' => true,
),
),
);

13
tests/unit-tests/api/wc-blocks/products-attributes-terms.php
View File

@ -31,9 +31,9 @@ class WC_Tests_API_Products_Attributes_Terms_Controller extends WC_REST_Unit_Tes
)
);
$this->editor = $this->factory->user->create(
$this->contributor = $this->factory->user->create(
array(
'role' => 'editor',
'role' => 'contributor',
)
);
@ -56,8 +56,11 @@ class WC_Tests_API_Products_Attributes_Terms_Controller extends WC_REST_Unit_Tes
$this->assertEquals( 200, $response->get_status() );
$this->assertEquals( 3, count( $response_terms ) );
$term = $response_terms[0];
$this->assertArrayHasKey( 'attr_name', $term );
$this->assertArrayHasKey( 'attr_slug', $term );
$this->assertArrayHasKey( 'attribute', $term );
$attribute = $term['attribute'];
$this->assertArrayHasKey( 'id', $attribute );
$this->assertArrayHasKey( 'name', $attribute );
$this->assertArrayHasKey( 'slug', $attribute );
}
/**
@ -91,7 +94,7 @@ class WC_Tests_API_Products_Attributes_Terms_Controller extends WC_REST_Unit_Tes
* @since 3.6.0
*/
public function test_get_attribute_terms_editor() {
wp_set_current_user( $this->editor );
wp_set_current_user( $this->contributor );
$request = new WP_REST_Request( 'GET', $this->endpoint . '/products/attributes/'. $this->attr_size['attribute_id'] . '/terms' );
$response = $this->server->dispatch( $request );