Fix Ajax tests

Co-authored-by: Aditya Dhade <[email protected]>

Author: westonruter

plugins/performance-lab/tests/includes/site-health/audit-enqueued-assets/test-audit-enqueued-assets-helper.php

@@ -284,11 +284,15 @@ public function test_perflab_aea_enqueued_blocking_assets_test_but_one_style_is_
 	 */
 	public function test_perflab_aea_enqueued_ajax_blocking_assets_test_unauthenticated_without_nonce(): void {
 		$this->add_filter_to_mock_front_page_loopback_request();
-		$this->expectException( WPAjaxDieStopException::class );
-		$this->_handleAjax( 'health-check-enqueued-blocking-assets-test' );
-		$response = json_decode( $this->_last_response, true );
-		$this->assertArrayHasKey( 'success', $response );
-		$this->assertFalse( $response['success'] );
+		$exception = null;
+		try {
+			$this->_handleAjax( 'health-check-enqueued-blocking-assets-test' );
+		} catch ( Exception $e ) {
+			$exception = $e;
+		}
+		$this->assertInstanceOf( WPAjaxDieStopException::class, $exception );
+		$this->assertEquals( '-1', $exception->getMessage() );
+		$this->assertSame( '', $this->_last_response );
 	}
 
 	/**
@@ -299,8 +303,14 @@ public function test_perflab_aea_enqueued_ajax_blocking_assets_test_unauthentica
 	public function test_perflab_aea_enqueued_ajax_blocking_assets_test_unauthenticated_with_nonce(): void {
 		$this->add_filter_to_mock_front_page_loopback_request();
 		$_GET['_wpnonce'] = wp_create_nonce( 'health-check-site-status' );
-		$this->expectException( WPAjaxDieContinueException::class );
-		$this->_handleAjax( 'health-check-enqueued-blocking-assets-test' );
+		$exception        = null;
+		try {
+			$this->_handleAjax( 'health-check-enqueued-blocking-assets-test' );
+		} catch ( Exception $e ) {
+			$exception = $e;
+		}
+		$this->assertInstanceOf( WPAjaxDieContinueException::class, $exception );
+		$this->assertEquals( '', $exception->getMessage() );
 		$response = json_decode( $this->_last_response, true );
 		$this->assertFalse( $response['success'] );
 	}
@@ -314,8 +324,14 @@ public function test_perflab_aea_enqueued_ajax_blocking_assets_test_unauthorized
 		$this->add_filter_to_mock_front_page_loopback_request();
 		wp_set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
 		$_GET['_wpnonce'] = wp_create_nonce( 'health-check-site-status' );
-		$this->expectException( WPAjaxDieContinueException::class );
-		$this->_handleAjax( 'health-check-enqueued-blocking-assets-test' );
+		$exception        = null;
+		try {
+			$this->_handleAjax( 'health-check-enqueued-blocking-assets-test' );
+		} catch ( Exception $e ) {
+			$exception = $e;
+		}
+		$this->assertInstanceOf( WPAjaxDieContinueException::class, $exception );
+		$this->assertEquals( '', $exception->getMessage() );
 		$response = json_decode( $this->_last_response, true );
 		$this->assertFalse( $response['success'] );
 	}
@@ -329,10 +345,21 @@ public function test_perflab_aea_enqueued_ajax_blocking_assets_test_authorized()
 		$this->add_filter_to_mock_front_page_loopback_request();
 		wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 		$_GET['_wpnonce'] = wp_create_nonce( 'health-check-site-status' );
-		$this->expectException( WPAjaxDieContinueException::class );
-		$this->_handleAjax( 'health-check-enqueued-blocking-assets-test' );
+		$exception        = null;
+		try {
+			$this->_handleAjax( 'health-check-enqueued-blocking-assets-test' );
+		} catch ( Exception $e ) {
+			$exception = $e;
+		}
+		$this->assertInstanceOf( WPAjaxDieContinueException::class, $exception );
+		$this->assertEquals( '', $exception->getMessage() );
 		$response = json_decode( $this->_last_response, true );
 		$this->assertTrue( $response['success'] );
+		$this->assertArrayHasKey( 'data', $response );
+		$this->assertSameSets(
+			array( 'label', 'status', 'badge', 'description', 'actions', 'test' ),
+			array_keys( $response['data'] )
+		);
 	}
 
 	/**