Changeset 37358

Timestamp:

05/04/2016 03:48:46 AM (9 years ago)

Author:

boonebgorges

Message:

Tests: Introduce reset_phpmailer_instance() function.

This function provides a more convenient method for resetting the
PHPMailer instance than the previous technique of reaching into the global.

Props welcher.
Fixes #36658.

Location:

trunk/tests/phpunit

Files:

• includes/mock-mailer.php (modified) (1 diff)
• tests/comment.php (modified) (4 diffs)
• tests/mail.php (modified) (1 diff)
• tests/user.php (modified) (3 diffs)

trunk/tests/phpunit/includes/mock-mailer.php

@@ -85 +85 @@
     return $mailer;
 }
+
+/**
+ * Helper method to reset the phpmailer instance.
+ *
+ * @since 4.6.0
+ *
+ * @return bool
+ */
+function reset_phpmailer_instance() {
+    $mailer = tests_retrieve_phpmailer_instance();
+    if ( $mailer && isset( $mailer->mock_sent ) ) {
+        unset( $mailer->mock_sent );
+        return true;
+    }
+
+    return false;
+}

trunk/tests/phpunit/tests/comment.php

@@ -10 +10 @@
     public function setUp() {
         parent::setUp();
-        unset( $GLOBALS['phpmailer']->mock_sent );
+        reset_phpmailer_instance();
     }
 
@@ -559 +559 @@
         ) {
             $email_sent_when_comment_added = true;
-            unset( $GLOBALS['phpmailer']->mock_sent );
+            reset_phpmailer_instance();
         } else {
             $email_sent_when_comment_added = false;
@@ -590 +590 @@
             $email_sent_when_comment_approved = false;
         }
-        unset( $GLOBALS['phpmailer']->mock_sent );
+        reset_phpmailer_instance();
 
         // Post authors are notified when a new comment is added to their post.
@@ -608 +608 @@
              'test@test.com' == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] ) {
             $email_sent_when_comment_added = true;
-            unset( $GLOBALS['phpmailer']->mock_sent );
+            reset_phpmailer_instance();
         } else {
             $email_sent_when_comment_added = false;

trunk/tests/phpunit/tests/mail.php

@@ -7 +7 @@
     function setUp() {
         parent::setUp();
-        unset( $GLOBALS['phpmailer']->mock_sent );
+        reset_phpmailer_instance();
     }
 
     function tearDown() {
-        unset( $GLOBALS['phpmailer']->mock_sent );
+        reset_phpmailer_instance();
         parent::tearDown();
     }

trunk/tests/phpunit/tests/user.php

@@ -1025 +1025 @@
      */
     function test_wp_new_user_notification( $notify, $admin_email_sent_expected, $user_email_sent_expected ) {
-        unset( $GLOBALS['phpmailer']->mock_sent );
+        reset_phpmailer_instance();
 
         $was_admin_email_sent = false;
@@ -1101 +1101 @@
      */
     function test_wp_new_user_notification_old_signature_throws_deprecated_warning_but_sends() {
-        unset( $GLOBALS['phpmailer']->mock_sent );
+        reset_phpmailer_instance();
 
         $was_admin_email_sent = false;
@@ -1126 +1126 @@
      */
     function test_wp_new_user_notification_old_signature_no_password() {
-        unset( $GLOBALS['phpmailer']->mock_sent );
+        reset_phpmailer_instance();
 
         $was_admin_email_sent = false;