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

Merge branch 'master' of github.com:woocommerce/woocommerce

This commit is contained in:
Rodrigo Primo 2020-01-23 15:25:48 -03:00
parent 2cd4ae6fd4 1078b4fe87
commit 8de3e9e839
6 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.codecov.yml
View File

@ -8,7 +8,7 @@ coverage:
range: "50...100"
status:
project: yes
project: off
patch: off
changes: off
@ -20,7 +20,4 @@ parsers:
method: no
macro: no
comment:
layout: "files"
behavior: default
require_changes: yes
comment: false

6
includes/abstracts/abstract-wc-data.php
View File

@ -346,10 +346,10 @@ abstract class WC_Data {
} else {
$value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
}
}
if ( 'view' === $context ) {
$value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
}
if ( 'view' === $context ) {
$value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
}
return $value;

5
includes/integrations/maxmind-geolocation/class-wc-integration-maxmind-geolocation.php
View File

@ -132,7 +132,10 @@ class WC_Integration_MaxMind_Geolocation extends WC_Integration {
* @throws Exception When the license key is invalid.
*/
public function validate_license_key_field( $key, $value ) {
// Empty license keys have no need to validate the data.
// Trim whitespaces and strip slashes.
$value = $this->validate_password_field( $key, $value );
// Empty license keys have no need test downloading a database.
if ( empty( $value ) ) {
return $value;
}

23
includes/widgets/class-wc-widget-top-rated-products.php
View File

@ -58,16 +58,19 @@ class WC_Widget_Top_Rated_Products extends WC_Widget {
$number = ! empty( $instance['number'] ) ? absint( $instance['number'] ) : $this->settings['number']['std'];
$query_args = array(
'posts_per_page' => $number,
'no_found_rows' => 1,
'post_status' => 'publish',
'post_type' => 'product',
'meta_key' => '_wc_average_rating',
'orderby' => 'meta_value_num',
'order' => 'DESC',
'meta_query' => WC()->query->get_meta_query(),
'tax_query' => WC()->query->get_tax_query(),
$query_args = apply_filters(
'woocommerce_top_rated_products_widget_args',
array(
'posts_per_page' => $number,
'no_found_rows' => 1,
'post_status' => 'publish',
'post_type' => 'product',
'meta_key' => '_wc_average_rating',
'orderby' => 'meta_value_num',
'order' => 'DESC',
'meta_query' => WC()->query->get_meta_query(),
'tax_query' => WC()->query->get_tax_query(),
)
); // WPCS: slow query ok.
$r = new WP_Query( $query_args );

1
tests/e2e-tests/specs/wp-admin/wp-admin-product-new.test.js
View File

@ -94,6 +94,7 @@ describe( 'Add New Variable Product Page', () => {
// Wait for attribute form to save (triggers 2 UI blocks)
await uiUnblocked();
await page.waitFor( 1000 );
await uiUnblocked();
// Create variations from attributes

1
tests/e2e-tests/utils/components.js
View File

@ -78,6 +78,7 @@ const createVariableProduct = async () => {
// Wait for attribute form to save (triggers 2 UI blocks)
await uiUnblocked();
await page.waitFor( 1000 );
await uiUnblocked();
// Create variations from attributes