Changeset 37358 for trunk/tests/phpunit/tests/comment.php

Timestamp:

05/04/2016 03:48:46 AM (8 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.

File:

• trunk/tests/phpunit/tests/comment.php (modified) (4 diffs)

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;