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

Timestamp:

09/03/2018 09:00:16 PM (12 months ago)

Author:

SergeyBiryukov

Message:

Privacy: Ensure the user request email is sent in the requested user's locale (or the site's default locale if they are not a registered user) when the administrator creating the request uses a different locale.

Props desrosj, Chouby, iandunn, lbenicio, birgire, earnjam, swissspidy, garrett-eclipse.
Merges [43568] to the 4.9 branch.
Fixes #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
      */
-    function setUp() {
+    public function setUp() {
         parent::setUp();
         reset_phpmailer_instance();
@@ -50 +50 @@
      * @since 4.9.6
      */
-    function tearDown() {
+    public 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', $email_sent->get_error_code() );
+        $this->assertSame( 'invalid_request', $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', $email_sent->get_error_code() );
+        $this->assertSame( 'invalid_request', $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( 'error', $email_sent->get_error_code() );
+        $this->assertSame( 'privacy_email_error', $email_sent->get_error_code() );
     }
 
@@ -126 +125 @@
         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();
@@ -153 +151 @@
         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();