Changeset 43705 for branches/4.9/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php

Timestamp:

10/11/2018 04:03:23 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Revert [43614] from the 4.9 branch.

This change is out of the 4.9.x scope, and will be reintroduced in 5.0.x.

See #43985.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php (modified) (6 diffs)

branches/4.9/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php

@@ -40 +40 @@
      * @since 4.9.6
      */
-    public function setUp() {
+    function setUp() {
         parent::setUp();
         reset_phpmailer_instance();
@@ -50 +50 @@
      * @since 4.9.6
      */
-    public function tearDown() {
+    function tearDown() {
         reset_phpmailer_instance();
         parent::tearDown();
@@ -96 +96 @@
         $email_sent = wp_privacy_send_personal_data_export_email( $request_id );
         $this->assertWPError( $email_sent );
-        $this->assertSame( 'invalid_request', $email_sent->get_error_code() );
+        $this->assertSame( 'invalid', $email_sent->get_error_code() );
 
         $request_id = PHP_INT_MAX;
         $email_sent = wp_privacy_send_personal_data_export_email( $request_id );
         $this->assertWPError( $email_sent );
-        $this->assertSame( 'invalid_request', $email_sent->get_error_code() );
+        $this->assertSame( 'invalid', $email_sent->get_error_code() );
     }
 
@@ -112 +112 @@
         add_filter( 'wp_mail_from', '__return_empty_string' ); // Cause `wp_mail()` to return false.
         $email_sent = wp_privacy_send_personal_data_export_email( self::$request_id );
+        remove_filter( 'wp_mail_from', '__return_empty_string' );
 
         $this->assertWPError( $email_sent );
-        $this->assertSame( 'privacy_email_error', $email_sent->get_error_code() );
+        $this->assertSame( 'error', $email_sent->get_error_code() );
     }
 
@@ -125 +126 @@
         add_filter( 'wp_privacy_export_expiration', array( $this, 'modify_export_expiration' ) );
         wp_privacy_send_personal_data_export_email( self::$request_id );
+        remove_filter( 'wp_privacy_export_expiration', array( $this, 'modify_export_expiration' ) );
 
         $mailer = tests_retrieve_phpmailer_instance();
@@ -151 +153 @@
         add_filter( 'wp_privacy_personal_data_email_content', array( $this, 'modify_email_content' ), 10, 2 );
         wp_privacy_send_personal_data_export_email( self::$request_id );
+        remove_filter( 'wp_privacy_personal_data_email_content', array( $this, 'modify_email_content' ) );
 
         $mailer = tests_retrieve_phpmailer_instance();