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.

git-svn-id: https://develop.svn.wordpress.org/trunk@37358 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges
2016-05-04 03:48:46 +00:00
parent 23b3f3e2ee
commit 8e417dd09b
4 changed files with 26 additions and 9 deletions

View File

@@ -9,7 +9,7 @@ class Tests_Comment extends WP_UnitTestCase {
public function setUp() {
parent::setUp();
unset( $GLOBALS['phpmailer']->mock_sent );
reset_phpmailer_instance();
}
public static function wpSetUpBeforeClass( $factory ) {
@@ -558,7 +558,7 @@ class Tests_Comment extends WP_UnitTestCase {
&& WP_TESTS_EMAIL == $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;
}
@@ -589,7 +589,7 @@ class Tests_Comment extends WP_UnitTestCase {
} else {
$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.
$data = array(
@@ -607,7 +607,7 @@ class Tests_Comment extends WP_UnitTestCase {
! empty( $GLOBALS['phpmailer']->mock_sent ) &&
'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;
}