diff --git a/plugins/woocommerce/changelog/dev-slow-tests b/plugins/woocommerce/changelog/dev-slow-tests new file mode 100644 index 00000000000..d60c7d44a53 --- /dev/null +++ b/plugins/woocommerce/changelog/dev-slow-tests @@ -0,0 +1,4 @@ +Significance: patch +Type: dev + +Fix slow test for Reports diff --git a/plugins/woocommerce/tests/legacy/framework/helpers/class-wc-helper-queue.php b/plugins/woocommerce/tests/legacy/framework/helpers/class-wc-helper-queue.php index a2f4e0acfb8..50f3c8766a4 100644 --- a/plugins/woocommerce/tests/legacy/framework/helpers/class-wc-helper-queue.php +++ b/plugins/woocommerce/tests/legacy/framework/helpers/class-wc-helper-queue.php @@ -13,36 +13,42 @@ class WC_Helper_Queue { /** * Get all pending queued actions. - * + * @param string|null $group Optionally. Filter the actions by group. * @return array Pending jobs. */ - public static function get_all_pending() { - $jobs = WC()->queue()->search( - array( - 'per_page' => -1, - 'status' => 'pending', - 'claimed' => false, - ) + public static function get_all_pending( $group = null ) { + $args = array( + 'per_page' => -1, + 'status' => 'pending', + 'claimed' => false, ); - return $jobs; + if ( $group ) { + $args['group'] = $group; + } + + return WC()->queue()->search( $args ); } + + /** * Run all pending queued actions. - * + * @param string|null $group Optionally. Filter the actions by group. * @return void */ - public static function run_all_pending() { + public static function run_all_pending( $group = null ) { $queue_runner = new ActionScheduler_QueueRunner(); - - while ( $jobs = self::get_all_pending() ) { + $jobs = self::get_all_pending( $group ); + while ( $jobs ) { foreach ( $jobs as $job_id => $job ) { $queue_runner->process_action( $job_id ); } + $jobs = self::get_all_pending( $group ); } } + /** * Cancel all pending actions. * diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/products-lowinstock.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/products-lowinstock.php index b85177b3221..489a4d66fc9 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/products-lowinstock.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/products-lowinstock.php @@ -51,7 +51,7 @@ class WC_Admin_Tests_API_ProductsLowInStock extends WC_REST_Unit_Test_Case { $order->save(); // Sync analytics data (used for last order date). - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', '/wc-analytics/products/low-in-stock' ); $request->set_param( 'low_in_stock', true ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-categories.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-categories.php index f5f37b9404d..7b704fc7b4a 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-categories.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-categories.php @@ -66,7 +66,7 @@ class WC_Admin_Tests_API_Reports_Categories extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); // $25 x 4. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $uncategorized_term = get_term_by( 'slug', 'uncategorized', 'product_cat' ); @@ -114,7 +114,7 @@ class WC_Admin_Tests_API_Reports_Categories extends WC_REST_Unit_Test_Case { $product->set_category_ids( array( $second_category_id ) ); $product->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $uncategorized_term = get_term_by( 'slug', 'uncategorized', 'product_cat' ); @@ -170,7 +170,7 @@ class WC_Admin_Tests_API_Reports_Categories extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); // $25 x 4. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Populate all of the data. $product = new WC_Product_Simple(); @@ -186,7 +186,7 @@ class WC_Admin_Tests_API_Reports_Categories extends WC_REST_Unit_Test_Case { $order->set_total( 400 ); // $100 x 4. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $uncategorized_term = get_term_by( 'slug', 'uncategorized', 'product_cat' ); $params = array( diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-coupons-stats.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-coupons-stats.php index 9ebdcb6db25..86de2a966a4 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-coupons-stats.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-coupons-stats.php @@ -87,7 +87,7 @@ class WC_Admin_Tests_API_Reports_Coupons_Stats extends WC_REST_Unit_Test_Case { $order_2c->set_date_created( $time ); $order_2c->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-coupons.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-coupons.php index ee8d5271552..b085e3ee690 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-coupons.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-coupons.php @@ -82,7 +82,7 @@ class WC_Admin_Tests_API_Reports_Coupons extends WC_REST_Unit_Test_Case { $order_2c->calculate_totals(); $order_2c->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $response = $this->server->dispatch( new WP_REST_Request( 'GET', $this->endpoint ) ); $coupon_reports = $response->get_data(); @@ -132,7 +132,7 @@ class WC_Admin_Tests_API_Reports_Coupons extends WC_REST_Unit_Test_Case { $order_1c->calculate_totals(); $order_1c->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-customers-stats.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-customers-stats.php index 6b2c479bf93..0cc1ccacdc7 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-customers-stats.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-customers-stats.php @@ -127,7 +127,7 @@ class WC_Admin_Tests_API_Reports_Customers_Stats extends WC_REST_Unit_Test_Case $order->set_total( 9.12 ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $response = $this->server->dispatch( $request ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-customers.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-customers.php index 24a3af46ec5..166bf344918 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-customers.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-customers.php @@ -149,7 +149,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( array( 'per_page' => 10 ) ); @@ -164,7 +164,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { // Creating a customer should show up regardless of orders. $customer = WC_Helper_Customer::create_customer( 'customer', 'password', 'customer@example.com' ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( @@ -221,7 +221,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( @@ -317,7 +317,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order->save(); // Ensure order customer data is synced to lookup table. - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $query_params = array( 'force_cache_refresh' => true, @@ -400,7 +400,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $customer->set_billing_city( '' ); $customer->set_first_name( 'customer_andrei_1' ); $customer->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request->set_query_params( array( @@ -433,7 +433,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { // Test filter_empty param by state and postcode non empty. $customer = WC_Helper_Customer::create_customer( 'customer_2', 'password', 'customer_2@example.com' ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request->set_query_params( array( @@ -498,7 +498,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $response = $this->server->dispatch( $request ); @@ -527,7 +527,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $response = $this->server->dispatch( $request ); @@ -555,7 +555,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $response = $this->server->dispatch( $request ); @@ -584,7 +584,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { // Creating a customer should show up regardless of orders. $customer = WC_Helper_Customer::create_customer( 'deleteme', 'password', 'deleteme@example.com' ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( @@ -602,7 +602,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { // Delete the user associated with the customer. wp_delete_user( $customer->get_id() ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Verify they are gone. $request = new WP_REST_Request( 'GET', $this->endpoint ); @@ -630,7 +630,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // update order info. $order->set_billing_city( 'Random' ); @@ -638,11 +638,11 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order->set_billing_postcode( '54321' ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $result = CustomersDataStore::sync_order_customer( $order->get_id() ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $this->assertNotEquals( -1, $result ); @@ -671,7 +671,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order2->set_total( 100 ); $order2->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $customer_id = CustomersDataStore::get_existing_customer_id_from_order( $order ); $customer2_id = CustomersDataStore::get_existing_customer_id_from_order( $order2 ); @@ -682,11 +682,11 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order->set_billing_postcode( '54321' ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $result = CustomersDataStore::sync_order_customer( $order->get_id() ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Didn't update anything. $this->assertTrue( -1 === $result ); @@ -721,7 +721,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order3->set_billing_email( 'different@example.org' ); $order3->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $customer_id = CustomersDataStore::get_existing_customer_id_from_order( $order ); $customer2_id = CustomersDataStore::get_existing_customer_id_from_order( $order2 ); @@ -734,11 +734,11 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order3->set_billing_postcode( '54321' ); $order3->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $result = CustomersDataStore::sync_order_customer( $order3->get_id() ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Didn't update anything. $this->assertNotEquals( -1, $result ); @@ -780,7 +780,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order3->set_total( 100 ); $order3->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $customer_id = CustomersDataStore::get_existing_customer_id_from_order( $order ); $customer2_id = CustomersDataStore::get_existing_customer_id_from_order( $order2 ); @@ -794,7 +794,7 @@ class WC_Admin_Tests_API_Reports_Customers extends WC_REST_Unit_Test_Case { $order->set_date_created( time() + 60 ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $latest_order = CustomersDataStore::get_last_order( $customer_id ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-downloads-stats.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-downloads-stats.php index 0e098e40b72..8a58da14e7b 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-downloads-stats.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-downloads-stats.php @@ -152,7 +152,7 @@ class WC_Admin_Tests_API_Reports_Downloads_Stats extends WC_REST_Unit_Test_Case $order->save(); $order_1 = $order->get_id(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $download = new WC_Customer_Download(); $download->set_user_id( 1 ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-downloads.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-downloads.php index 3750eaba48c..98b10737888 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-downloads.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-downloads.php @@ -169,7 +169,7 @@ class WC_Admin_Tests_API_Reports_Downloads extends WC_REST_Unit_Test_Case { $object->set_timestamp( gmdate( 'Y-m-d H:00:00', $time - ( 2 * DAY_IN_SECONDS ) ) ); $id = $object->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); return array( 'time' => $time, diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-export.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-export.php index 48494f8fcf0..faae1f452eb 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-export.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-export.php @@ -119,7 +119,7 @@ class WC_Admin_Tests_API_Reports_Export extends WC_REST_Unit_Test_Case { $order->calculate_totals(); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Initiate an export of the taxes report. $response = $this->server->dispatch( new WP_REST_Request( 'POST', '/wc-analytics/reports/taxes/export' ) ); @@ -143,7 +143,7 @@ class WC_Admin_Tests_API_Reports_Export extends WC_REST_Unit_Test_Case { $this->assertStringMatchesFormat( '%s/wc-analytics/reports/taxes/export/%d/status', $status['_links']['self'][0]['href'] ); // Run the pending export jobs. - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Check that the status shows 100% and includes a download url. $response = $this->server->dispatch( new WP_REST_Request( 'GET', $status_route ) ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-import.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-import.php index b40e02390ea..e9cd6edb762 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-import.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-import.php @@ -119,7 +119,7 @@ class WC_Admin_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case { $this->assertEquals( 200, $response->get_status() ); $this->assertEquals( 'success', $report['status'] ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', '/wc-analytics/reports/customers' ); $response = $this->server->dispatch( $request ); @@ -161,7 +161,7 @@ class WC_Admin_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case { $this->assertEquals( 200, $response->get_status() ); $this->assertEquals( 'success', $report['status'] ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', '/wc-analytics/reports/customers' ); $response = $this->server->dispatch( $request ); @@ -247,7 +247,7 @@ class WC_Admin_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case { } // Check that stats exist before deleting. - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', '/wc-analytics/reports/orders' ); $request->set_query_params( array( 'per_page' => 25 ) ); @@ -273,7 +273,7 @@ class WC_Admin_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case { $this->assertEquals( 200, $response->get_status() ); $this->assertEquals( 'success', $report['status'] ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Check that stats have been deleted. $request = new WP_REST_Request( 'GET', '/wc-analytics/reports/orders' ); @@ -375,7 +375,7 @@ class WC_Admin_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case { $this->assertEquals( 0, $report['orders']['imported'] ); $this->assertEquals( 4, $report['orders']['total'] ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Test import status after processing. $request = new WP_REST_Request( 'GET', $this->endpoint . '/status' ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders-stats.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders-stats.php index 18c8b856222..08b2a41cf74 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders-stats.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders-stats.php @@ -154,7 +154,7 @@ class WC_Admin_Tests_API_Reports_Orders_Stats extends WC_REST_Unit_Test_Case { $global_attribute = new WC_Product_Attribute(); $global_attribute->set_id( $size_attr_id ); $global_attribute->set_name( 'pa_size' ); - $global_attribute->set_options( array( $large_term->term_id ) ); // Set to small. + $global_attribute->set_options( array( $large_term->term_id ) ); // Set to large. $global_attribute->set_position( 1 ); $global_attribute->set_visible( true ); $global_attribute->set_variation( false ); @@ -187,7 +187,8 @@ class WC_Admin_Tests_API_Reports_Orders_Stats extends WC_REST_Unit_Test_Case { $order->save(); } - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); + WC_Helper_Queue::run_all_pending( 'woocommerce-db-updates' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( array( 'per_page' => 15 ) ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders.php index 38aeb49eed6..2a695b5d9ff 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-orders.php @@ -69,7 +69,7 @@ class WC_Admin_Tests_API_Reports_Orders extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); // $25 x 4. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $expected_customer_id = CustomersDataStore::get_customer_id_by_user_id( 1 ); @@ -126,7 +126,7 @@ class WC_Admin_Tests_API_Reports_Orders extends WC_REST_Unit_Test_Case { ) ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $response = $this->server->dispatch( new WP_REST_Request( 'GET', $this->endpoint ) ); $reports = $response->get_data(); @@ -238,7 +238,8 @@ class WC_Admin_Tests_API_Reports_Orders extends WC_REST_Unit_Test_Case { $order->save(); } - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); + WC_Helper_Queue::run_all_pending( 'woocommerce-db-updates' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( array( 'per_page' => 15 ) ); @@ -369,7 +370,7 @@ class WC_Admin_Tests_API_Reports_Orders extends WC_REST_Unit_Test_Case { $order->save(); } - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( array( 'per_page' => 15 ) ); @@ -438,7 +439,7 @@ class WC_Admin_Tests_API_Reports_Orders extends WC_REST_Unit_Test_Case { $order_to_be_included->set_status( 'completed' ); $order_to_be_included->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Test product exclusion. $request = new WP_REST_Request( 'GET', $this->endpoint ); @@ -515,7 +516,7 @@ class WC_Admin_Tests_API_Reports_Orders extends WC_REST_Unit_Test_Case { $second_order->set_status( 'on-hold' ); $second_order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Get the created orders from REST API. $request = new WP_REST_Request( 'GET', $this->endpoint ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-performance-indicators.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-performance-indicators.php index 8cbab9032a1..058a40370a6 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-performance-indicators.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-performance-indicators.php @@ -90,7 +90,7 @@ class WC_Admin_Tests_API_Reports_Performance_Indicators extends WC_REST_Unit_Tes $object->set_user_ip_address( '1.2.3.4' ); $object->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $time = time(); $request = new WP_REST_Request( 'GET', $this->endpoint ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-products-stats.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-products-stats.php index f203a65b84e..49862190354 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-products-stats.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-products-stats.php @@ -71,7 +71,7 @@ class WC_Admin_Tests_API_Reports_Products_Stats extends WC_REST_Unit_Test_Case { $order->set_total( 97 ); // $25x4 products + $10 shipping - $20 discount + $7 tax. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-products.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-products.php index 9e6aade8a16..b332a5047ad 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-products.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-products.php @@ -67,7 +67,7 @@ class WC_Admin_Tests_API_Reports_Products extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); // $25 x 4. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $response = $this->server->dispatch( new WP_REST_Request( 'GET', $this->endpoint ) ); $reports = $response->get_data(); @@ -109,7 +109,7 @@ class WC_Admin_Tests_API_Reports_Products extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); // $25 x 4. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-taxes-stats.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-taxes-stats.php index 1920b20b029..9ea322b25eb 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-taxes-stats.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-taxes-stats.php @@ -99,7 +99,7 @@ class WC_Admin_Tests_API_Reports_Taxes_Stats extends WC_REST_Unit_Test_Case { $wc_refund = wc_create_refund( $refund ); } - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $response = $this->server->dispatch( new WP_REST_Request( 'GET', $this->endpoint ) ); $reports = $response->get_data(); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-taxes.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-taxes.php index 3f896cc5b78..cfadb1787a8 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-taxes.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-taxes.php @@ -115,7 +115,7 @@ class WC_Admin_Tests_API_Reports_Taxes extends WC_REST_Unit_Test_Case { ) ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $response = $this->server->dispatch( new WP_REST_Request( 'GET', $this->endpoint ) ); $reports = $response->get_data(); @@ -416,6 +416,6 @@ class WC_Admin_Tests_API_Reports_Taxes extends WC_REST_Unit_Test_Case { ) ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); } } diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-variations.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-variations.php index d8906331c79..2c4a974ad1b 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-variations.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/api/reports-variations.php @@ -69,7 +69,7 @@ class WC_Admin_Tests_API_Reports_Variations extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); // $25 x 4. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $response = $this->server->dispatch( new WP_REST_Request( 'GET', $this->endpoint ) ); $reports = $response->get_data(); @@ -102,7 +102,7 @@ class WC_Admin_Tests_API_Reports_Variations extends WC_REST_Unit_Test_Case { $order->set_total( 15 ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( @@ -146,7 +146,7 @@ class WC_Admin_Tests_API_Reports_Variations extends WC_REST_Unit_Test_Case { $order->set_total( 100 ); // $25 x 4. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $request = new WP_REST_Request( 'GET', $this->endpoint ); $request->set_query_params( diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-coupons-stats.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-coupons-stats.php index 04e1c98698d..4abbd68e1cf 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-coupons-stats.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-coupons-stats.php @@ -57,7 +57,7 @@ class WC_Admin_Tests_Reports_Coupons_Stats extends WC_Unit_Test_Case { $order_2c->calculate_totals(); $order_2c->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new CouponsStatsDataStore(); $start_time = gmdate( 'Y-m-d 00:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -133,7 +133,7 @@ class WC_Admin_Tests_Reports_Coupons_Stats extends WC_Unit_Test_Case { // Delete the coupon. $coupon_1->delete( true ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $start_time = gmdate( 'Y-m-d 00:00:00', $order->get_date_created()->getOffsetTimestamp() ); $end_time = gmdate( 'Y-m-d 23:59:59', $order->get_date_created()->getOffsetTimestamp() ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-coupons.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-coupons.php index 867de990e28..f7d96278eeb 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-coupons.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-coupons.php @@ -59,7 +59,7 @@ class WC_Admin_Tests_Reports_Coupons extends WC_Unit_Test_Case { $order_2c->calculate_totals(); $order_2c->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new CouponsDataStore(); $start_time = gmdate( 'Y-m-d 00:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -375,7 +375,7 @@ class WC_Admin_Tests_Reports_Coupons extends WC_Unit_Test_Case { // Delete the coupons. $coupon_2->delete( true ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new CouponsDataStore(); $start_time = gmdate( 'Y-m-d 00:00:00', $order->get_date_created()->getOffsetTimestamp() ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-customers.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-customers.php index c25c56b1376..bb7283220fe 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-customers.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-customers.php @@ -29,7 +29,7 @@ class WC_Admin_Tests_Reports_Customer extends WC_Unit_Test_Case { $product->set_regular_price( 25 ); $product->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $customer_id = DataStore::get_customer_id_by_user_id( $customer->get_id() ); // This is the customer ID from lookup table. @@ -39,7 +39,7 @@ class WC_Admin_Tests_Reports_Customer extends WC_Unit_Test_Case { $order->save(); } - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Customer should have 3 orders. $this->assertSame( 3, DataStore::get_order_count( $customer_id ) ); @@ -75,7 +75,7 @@ class WC_Admin_Tests_Reports_Customer extends WC_Unit_Test_Case { $product2->set_regular_price( 2 ); $product2->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Create the first order. $order1 = WC_Helper_Order::create_order( $customer->get_id(), $product1 ); @@ -85,7 +85,7 @@ class WC_Admin_Tests_Reports_Customer extends WC_Unit_Test_Case { $order2 = WC_Helper_Order::create_order( $customer->get_id(), $product2 ); $order2->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $customer_id = DataStore::get_customer_id_by_user_id( $customer->get_id() ); // This is the customer ID from lookup table. diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-orders-stats.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-orders-stats.php index f19ee7b5dc0..09a1628daad 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-orders-stats.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-orders-stats.php @@ -63,7 +63,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { ) ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new OrdersStatsDataStore(); @@ -208,7 +208,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $order->save(); } - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new OrdersStatsDataStore(); @@ -377,7 +377,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { ) ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new OrdersStatsDataStore(); @@ -666,7 +666,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $orders[] = $order; } - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new OrdersStatsDataStore(); @@ -917,7 +917,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { } } - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new OrdersStatsDataStore(); @@ -3865,7 +3865,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $order->apply_coupon( $coupon ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Check if lookup tables are populated. foreach ( $tables as $table ) { @@ -3996,7 +3996,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $order_2->calculate_totals(); $order_2->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new OrdersStatsDataStore(); @@ -4544,7 +4544,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $orders[] = $order; } - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new OrdersStatsDataStore(); @@ -5328,7 +5328,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $orders[] = $order; } - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); global $wpdb; $res = $wpdb->get_results( "SELECT * FROM {$wpdb->prefix}wc_order_stats" ); @@ -6094,7 +6094,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $order_0->set_total( 100 ); $order_0->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $start_time = gmdate( 'Y-m-d H:00:00', $order_0->get_date_created()->getOffsetTimestamp() ); $end_time = gmdate( 'Y-m-d H:59:59', $order_0->get_date_created()->getOffsetTimestamp() ); @@ -6114,7 +6114,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $order_1->set_total( 100 ); $order_1->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Time frame includes both orders -> customer is a new customer. $start_time = gmdate( 'Y-m-d H:00:00', $order_0->get_date_created()->getOffsetTimestamp() ); @@ -6153,7 +6153,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $order_2->set_total( 100 ); $order_2->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Time frame includes second and third order -> there is one returning customer. $start_time = gmdate( 'Y-m-d H:i:s', $order_0_time + 1 ); @@ -6204,7 +6204,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $order_0->set_total( 100 ); $order_0->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $start_time = gmdate( 'Y-m-d H:00:00', $order_0->get_date_created()->getOffsetTimestamp() ); $end_time = gmdate( 'Y-m-d H:59:59', $order_0->get_date_created()->getOffsetTimestamp() ); @@ -6224,7 +6224,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $order_1->set_total( 100 ); $order_1->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Time frame includes both orders -> customer is a new customer. $start_time = gmdate( 'Y-m-d H:00:00', $order_0->get_date_created()->getOffsetTimestamp() ); @@ -6263,7 +6263,7 @@ class WC_Admin_Tests_Reports_Orders_Stats extends WC_Unit_Test_Case { $order_2->set_total( 100 ); $order_2->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // Time frame includes second and third order -> there is one returning customer. $start_time = gmdate( 'Y-m-d H:i:s', $order_0_time + 1 ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-orders.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-orders.php index 078da5f087b..40b50f9a248 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-orders.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-orders.php @@ -64,7 +64,7 @@ class WC_Admin_Tests_Reports_Orders extends WC_Unit_Test_Case { $order->set_status( 'completed' ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new OrdersDataStore(); $start_time = gmdate( 'Y-m-d H:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -143,7 +143,7 @@ class WC_Admin_Tests_Reports_Orders extends WC_Unit_Test_Case { ) ); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new OrdersDataStore(); $start_time = gmdate( 'Y-m-d H:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -255,7 +255,7 @@ class WC_Admin_Tests_Reports_Orders extends WC_Unit_Test_Case { $order2->set_status( 'completed' ); $order2->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new OrdersDataStore(); $start_time = gmdate( 'Y-m-d H:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -310,7 +310,7 @@ class WC_Admin_Tests_Reports_Orders extends WC_Unit_Test_Case { $order_2->set_status( 'completed' ); $order_2->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $start_time = gmdate( 'Y-m-d H:00:00', $order->get_date_created()->getOffsetTimestamp() ); $end_time = gmdate( 'Y-m-d H:59:59', $order->get_date_created()->getOffsetTimestamp() ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-products.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-products.php index e088c2f47e4..94e74ab59a3 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-products.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-products.php @@ -42,7 +42,7 @@ class WC_Admin_Tests_Reports_Products extends WC_Unit_Test_Case { $order->set_total( 97 ); // $25x4 products + $10 shipping - $20 discount + $7 tax. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new ProductsDataStore(); $start_time = gmdate( 'Y-m-d H:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -119,7 +119,7 @@ class WC_Admin_Tests_Reports_Products extends WC_Unit_Test_Case { $order_2->set_date_created( $date_created_2 ); $order_2->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new ProductsDataStore(); $start_time = gmdate( 'Y-m-d H:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -220,7 +220,7 @@ class WC_Admin_Tests_Reports_Products extends WC_Unit_Test_Case { $order->set_total( 97 ); // $25x4 products + $10 shipping - $20 discount + $7 tax. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new ProductsDataStore(); $start_time = gmdate( 'Y-m-d H:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -301,7 +301,7 @@ class WC_Admin_Tests_Reports_Products extends WC_Unit_Test_Case { $order->set_total( 97 ); // $25x4 products + $10 shipping - $20 discount + $7 tax. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new ProductsDataStore(); $start_time = gmdate( 'Y-m-d H:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -383,7 +383,7 @@ class WC_Admin_Tests_Reports_Products extends WC_Unit_Test_Case { break; } - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new ProductsDataStore(); $start_time = gmdate( 'Y-m-d H:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -441,7 +441,7 @@ class WC_Admin_Tests_Reports_Products extends WC_Unit_Test_Case { $order->set_total( 97 ); // $25x4 products + $10 shipping - $20 discount + $7 tax. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $term = wp_insert_term( 'Unused Category', 'product_cat' ); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-revenue-stats.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-revenue-stats.php index 30a9b0832de..7722921486f 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-revenue-stats.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-revenue-stats.php @@ -43,7 +43,7 @@ class WC_Admin_Tests_Reports_Revenue_Stats extends WC_Unit_Test_Case { $order->set_total( 97 ); // $25x4 products + $10 shipping - $20 discount + $7 tax. $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); // /reports/revenue/stats is mapped to Orders_Data_Store. $data_store = new OrdersStatsDataStore(); diff --git a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-variations.php b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-variations.php index 66e55d262d1..435600978ca 100644 --- a/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-variations.php +++ b/plugins/woocommerce/tests/legacy/unit-tests/woocommerce-admin/reports/class-wc-tests-reports-variations.php @@ -42,7 +42,7 @@ class WC_Admin_Tests_Reports_Variations extends WC_Unit_Test_Case { $order->set_status( 'completed' ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new VariationsDataStore(); $start_time = gmdate( 'Y-m-d H:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -111,7 +111,7 @@ class WC_Admin_Tests_Reports_Variations extends WC_Unit_Test_Case { $order->set_status( 'completed' ); $order->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new VariationsDataStore(); $start_time = gmdate( 'Y-m-d H:00:00', $order->get_date_created()->getOffsetTimestamp() ); @@ -228,7 +228,7 @@ class WC_Admin_Tests_Reports_Variations extends WC_Unit_Test_Case { $order_3->set_status( 'completed' ); $order_3->save(); - WC_Helper_Queue::run_all_pending(); + WC_Helper_Queue::run_all_pending( 'wc-admin-data' ); $data_store = new VariationsDataStore();