Add tests for WooCommerce

includes/classes/Feature/WooCommerce/WooCommerce.php

@@ -284,7 +284,6 @@ public function translate_args( $query ) {
 
 // Act only on a defined subset of all indexable post types here
 $post_types = array(
-'product',
 'shop_order',
 'shop_order_refund',
 'product_variation',
@@ -300,6 +299,10 @@ public function translate_args( $query ) {
 */
 $supported_post_types = apply_filters( 'ep_woocommerce_default_supported_post_types', $post_types );
 
+if ( $query->is_post_type_archive( 'product' ) || isset( $query->query_vars['ep_integrate'] ) && filter_var( $query->query_vars['ep_integrate'], FILTER_VALIDATE_BOOLEAN ) ) {
+$supported_post_types[] = 'product';
+}
+
 $supported_post_types = array_intersect(
 $supported_post_types,
 Indexables::factory()->get( 'post' )->get_indexable_post_types()
@@ -1168,6 +1171,14 @@ protected function should_integrate_with_query( $query ) {
 return false;
 }
 
+if ( defined( 'WC_API_REQUEST' ) && WC_API_REQUEST ) {
+return false;
+}
+
+if ( isset( $query->query_vars['ep_integrate'] ) && ! filter_var( $query->query_vars['ep_integrate'], FILTER_VALIDATE_BOOLEAN ) ) {
+return false;
+}
+
 /**
 * Filter to skip WP Query integration
 *
@@ -1176,29 +1187,26 @@ protected function should_integrate_with_query( $query ) {
 * @param {WP_Query} $query WP Query to evaluate
 * @return {bool} New skip value
 */
-if ( apply_filters( 'ep_skip_query_integration', false, $query ) ||
-( isset( $query->query_vars['ep_integrate'] ) && ! filter_var( $query->query_vars['ep_integrate'], FILTER_VALIDATE_BOOLEAN ) ) ) {
+if ( apply_filters( 'ep_skip_query_integration', false, $query ) ) {
 return false;
 }
 
 if ( ! Utils\is_integrated_request( $this->slug ) ) {
 return false;
 }
 
-$product_name = $query->get( 'product', false );
-
-$post_parent = $query->get( 'post_parent', false );
-
 /**
 * Do nothing for single product queries
 */
+$product_name = $query->get( 'product', false );
 if ( ! empty( $product_name ) || $query->is_single() ) {
 return false;
 }
 
 /**
 * ElasticPress does not yet support post_parent queries
 */
+$post_parent = $query->get( 'post_parent', false );
 if ( ! empty( $post_parent ) ) {
 return false;
 }
@@ -1210,13 +1218,6 @@ protected function should_integrate_with_query( $query ) {
 return false;
 }
 
-/**
-* Cant hook into WC API yet
-*/
-if ( defined( 'WC_API_REQUEST' ) && WC_API_REQUEST ) {
-return false;
-}
-
 return true;
 }
 

tests/php/bootstrap.php

@@ -124,6 +124,7 @@ function skip_translations_api() {
 require_once __DIR__ . '/includes/classes/factory/UserFactory.php';
 require_once __DIR__ . '/includes/classes/factory/TermFactory.php';
 require_once __DIR__ . '/includes/classes/factory/CommentFactory.php';
+require_once __DIR__ . '/includes/classes/factory/ProductFactory.php';
 require_once __DIR__ . '/includes/classes/BaseTestCase.php';
 require_once __DIR__ . '/includes/classes/FeatureTest.php';
 require_once __DIR__ . '/includes/classes/mock/class-wp-cli-command.php';