Changeset 36594 for trunk/tests/phpunit/tests/user.php

Timestamp:

02/20/2016 03:40:49 AM (9 years ago)

Author:

boonebgorges

Message:

Tests: Add decorators to PHPMailer mock object.

The new get_recipient() and get_sent() methods greatly simplify the
syntax required when writing tests for wp_mail().

Props welcher.
Fixes #34161.

File:

• trunk/tests/phpunit/tests/user.php (modified) (1 diff)

trunk/tests/phpunit/tests/user.php

@@ -1029 +1029 @@
         wp_new_user_notification( self::$contrib_id, null, $notify );
 
+        $mailer = tests_retrieve_phpmailer_instance();
+
         /*
          * Check to see if a notification email was sent to the
          * post author `blackburn@battlefield3.com` and and site admin `admin@example.org`.
          */
-        if ( ! empty( $GLOBALS['phpmailer']->mock_sent ) ) {
-            $was_admin_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && WP_TESTS_EMAIL == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
-            $was_user_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[1] ) && 'blackburn@battlefield3.com' == $GLOBALS['phpmailer']->mock_sent[1]['to'][0][0] );
-        }
+        $admin_email = $mailer->get_recipient( 'to' );
+        $was_admin_email_sent = $admin_email && WP_TESTS_EMAIL === $admin_email->address;
+
+        $user_email = $mailer->get_recipient( 'to', 1 );
+        $was_user_email_sent = $user_email && 'blackburn@battlefield3.com' == $user_email->address;
+
 
         $this->assertSame( $admin_email_sent_expected, $was_admin_email_sent, 'Admin email result was not as expected in test_wp_new_user_notification' );