Changeset 10541 for trunk/tests/phpunit/testcases/core/class-bp-email.php

Timestamp:

02/07/2016 12:01:24 PM (11 years ago)

Author:

djpaul

Message:

Unit Tests, Emails: don't un-hook core email actions for unit tests.

The missing default properties cause confusion when writing new tests, and the absence could cause a badly-written test to pass.
The change updates the affected unit tests to correctly handle the default properties.

See #6592

File:

• trunk/tests/phpunit/testcases/core/class-bp-email.php (modified) (5 diffs)

trunk/tests/phpunit/testcases/core/class-bp-email.php

@@ -20 +20 @@
                         'user_email'   => 'test2@example.com',
                 ) );
-
-                remove_filter( 'bp_email_get_headers', 'bp_email_set_default_headers', 6, 4 );
-                remove_filter( 'bp_email_get_tokens', 'bp_email_set_default_tokens', 6, 4 );
-        }
-
-        public function tearDown() {
-                add_filter( 'bp_email_get_tokens', 'bp_email_set_default_tokens', 6, 4 );
-                add_filter( 'bp_email_get_headers', 'bp_email_set_default_headers', 6, 4 );
-                parent::tearDown();
         }
 
@@ -68 +59 @@
 
         public function test_tokens() {
-                $original = array( 'test1' => 'hello', 'test2' => 'world' );
-
-                $email = new BP_Email( 'activity-at-message' );
-                $email->set_tokens( $original );
-
-                $this->assertSame(
-                        array( 'test1', 'test2' ),
+                $email          = new BP_Email( 'activity-at-message' );
+                $default_tokens = $email->get_tokens();
+                $tokens         = array( 'test1' => 'hello', 'test2' => 'world' );
+
+                $email->set_tokens( $tokens );
+
+                $this->assertSame(
+                        array_keys( $tokens + $default_tokens ),
                         array_keys( $email->get_tokens() )
                 );
 
                 $this->assertSame(
-                        array( 'hello', 'world' ),
+                        array_values( $tokens + $default_tokens ),
                         array_values( $email->get_tokens() )
                 );
@@ -85 +77 @@
 
         public function test_headers() {
-                $email = new BP_Email( 'activity-at-message' );
-
-                $headers = array( 'custom_header' => 'custom_value' );
+                $email           = new BP_Email( 'activity-at-message' );
+                $default_headers = $email->get_headers();
+                $headers         = array( 'custom_header' => 'custom_value' );
+
                 $email->set_headers( $headers );
-                $this->assertSame( $headers, $email->get_headers() );
+
+                $this->assertSame( $headers + $default_headers, $email->get_headers() );
         }
 
@@ -101 +95 @@
 
         public function test_invalid_characters_are_stripped_from_tokens() {
-                $email = new BP_Email( 'activity-at-message' );
+                $email          = new BP_Email( 'activity-at-message' );
+                $default_tokens = $email->get_tokens();
+
                 $email->set_tokens( array( 'te{st}1' => 'hello world' ) );
 
                 $this->assertSame(
-                        array( 'test1' ),
+                        array_keys( array( 'test1' => 'hello world' ) + $default_tokens ),
                         array_keys( $email->get_tokens() )
                 );
@@ -133 +129 @@
 
         public function test_invalid_headers() {
-                $email = new BP_Email( 'activity-at-message' );
-
-                $headers = array( 'custom:header' => 'custom:value' );
+                $email           = new BP_Email( 'activity-at-message' );
+                $default_headers = $email->get_headers();
+                $headers         = array( 'custom:header' => 'custom:value' );
+
                 $email->set_headers( $headers );
-                $this->assertNotSame( $headers, $email->get( 'headers' ) );
-                $this->assertSame( array( 'customheader' => 'customvalue' ), $email->get_headers() );
+
+                $this->assertNotSame( $headers + $default_headers, $email->get( 'headers' ) );
+                $this->assertSame( array( 'customheader' => 'customvalue' ) + $default_headers, $email->get( 'headers' ) );
         }