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

Add extra verification to import cancel endpoint test.

This commit is contained in:
Jeff Stieler 2019-04-30 10:38:07 -06:00
parent 61492c5f10
commit f9c1b130c3
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/woocommerce-admin/tests/api/reports-import.php
View File

@ -202,6 +202,10 @@ class WC_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case {
$order->set_date_created( time() - ( 3 * DAY_IN_SECONDS ) ); $order->set_date_created( time() - ( 3 * DAY_IN_SECONDS ) );
$order->save(); $order->save();
// Verify there are actions to cancel.
$pending_actions = WC_Helper_Queue::get_all_pending();
$this->assertCount( 1, $pending_actions );
// Cancel outstanding actions. // Cancel outstanding actions.
$request = new WP_REST_Request( 'POST', $this->endpoint . '/cancel' ); $request = new WP_REST_Request( 'POST', $this->endpoint . '/cancel' );
$response = $this->server->dispatch( $request ); $response = $this->server->dispatch( $request );
@ -209,15 +213,9 @@ class WC_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case {
$this->assertEquals( 200, $response->get_status() ); $this->assertEquals( 200, $response->get_status() );
$this->assertEquals( 'success', $report['status'] ); $this->assertEquals( 'success', $report['status'] );
WC_Helper_Queue::run_all_pending();
// @todo It may be better to compare against outstanding actions // Verify there are no pending actions.
// pulled from the import API once #1850 is complete. $pending_actions = WC_Helper_Queue::get_all_pending();
$request = new WP_REST_Request( 'GET', '/wc/v4/reports/orders' ); $this->assertCount( 0, $pending_actions );
$response = $this->server->dispatch( $request );
$reports = $response->get_data();
$this->assertEquals( 200, $response->get_status() );
$this->assertCount( 0, $reports );
} }
} }

17
plugins/woocommerce-admin/tests/framework/helpers/class-wc-helper-queue.php
View File

@ -12,11 +12,11 @@
*/ */
class WC_Helper_Queue { class WC_Helper_Queue {
/** /**
* Run all pending queued actions. * Get all pending queued actions.
* *
* @return void * @return array Pending jobs.
*/ */
public static function run_all_pending() { public static function get_all_pending() {
$jobs = WC()->queue()->search( $jobs = WC()->queue()->search(
array( array(
'per_page' => -1, 'per_page' => -1,
@ -25,6 +25,17 @@ class WC_Helper_Queue {
) )
); );
return $jobs;
}
/**
* Run all pending queued actions.
*
* @return void
*/
public static function run_all_pending() {
$jobs = self::get_all_pending();
foreach ( $jobs as $job ) { foreach ( $jobs as $job ) {
$job->execute(); $job->execute();
} }