Changeset 51608

Timestamp:

08/13/2021 02:00:05 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Add unit tests for the wp_nonce_ays() function.

Update the wp_die_handler() method to pass the response into WPDieException so that expectExceptionCode() calls work as expected.

Follow-up to [1221/tests], [3934], [4009], [12309].

Props pbearne, jrf, mukesh27.
Fixes #53882.

Location:

trunk/tests/phpunit

Files:

• includes/abstract-testcase.php (modified) (2 diffs)
• tests/functions/wpNonceAys.php (added)

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -453 +453 @@
      * Throws an exception when called.
      *
-     * @throws WPDieException Exception containing the message.
-     *
-     * @param string $message The `wp_die()` message.
-     */
-    public function wp_die_handler( $message ) {
+     * @since UT (3.7.0)
+     * @since 5.9.0 Added the `$title` and `$args` parameters.
+     *
+     * @throws WPDieException Exception containing the message and the response code.
+     *
+     * @param string|WP_Error $message The `wp_die()` message or WP_Error object.
+     * @param string          $title   The `wp_die()` title.
+     * @param string|array    $args    The `wp_die()` arguments.
+     */
+    public function wp_die_handler( $message, $title, $args ) {
         if ( is_wp_error( $message ) ) {
             $message = $message->get_error_message();
@@ -466 +471 @@
         }
 
-        throw new WPDieException( $message );
+        $code = 0;
+        if ( isset( $args['response'] ) ) {
+            $code = $args['response'];
+        }
+
+        throw new WPDieException( $message, $code );
     }