Changeset 9831 for trunk/tests/phpunit

Timestamp:

05/02/2015 08:55:07 PM (11 years ago)

Author:

imath

Message:

Make sure the BP Attachments API behaves the right way when WordPress < 4.0

Before WordPress 4.0, there was no dynamic filter based on the name of the action posted in the upload form. So we also need to filter wp_handle_upload_prefilter to make sure the BP_Attachments->validate_upload() function will actually validate the uploads for versions of WordPress < 4.0.

Improve the i18n of the avatar type error, as the avatar types can now be filtered in the BP_Attachment_Avatar class.

Add unit tests for the BP Attachement class.

Fixes #6278

Location:

trunk/tests/phpunit

Files:

• assets/attachment-extensions.php (added)
• includes/testcase.php (modified) (1 diff)
• testcases/core/avatars.php (modified) (1 diff)
• testcases/core/class-bp-attachment.php (added)
• testcases/core/functions.php (modified) (1 diff)

trunk/tests/phpunit/includes/testcase.php

@@ -424 +424 @@
                 $wpdb->query( 'COMMIT;' );
         }
+
+        /**
+         * Clean up created directories/files
+         */
+        public function rrmdir( $dir ) {
+                // Make sure we are only removing files/dir from uploads
+                if ( 0 !== strpos( $dir, bp_core_avatar_upload_path() ) ) {
+                        return;
+                }
+
+                $d = glob( $dir . '/*' );
+
+                if ( ! empty( $d ) ) {
+                        foreach ( $d as $file ) {
+                                if ( is_dir( $file ) ) {
+                                        $this->rrmdir( $file );
+                                } else {
+                                        @unlink( $file );
+                                }
+                        }
+                }
+
+                @rmdir( $dir );
+        }
 }

trunk/tests/phpunit/testcases/core/avatars.php

@@ -15 +15 @@
 
                 $this->rrmdir( bp_core_avatar_upload_path() . '/' . $avatar_dir );
-        }
-
-        private function rrmdir( $dir ) {
-                $d = glob( $dir . '/*' );
-
-                if ( empty( $d ) ) {
-                        return;
-                }
-
-                foreach ( $d as $file ) {
-                        if ( is_dir( $file ) ) {
-                                $this->rrmdir( $file );
-                        } else {
-                                @unlink( $file );
-                        }
-                }
-
-                @rmdir( $dir );
         }
 

trunk/tests/phpunit/testcases/core/functions.php

@@ -599 +599 @@
                 }
         }
+
+        /**
+         * @group bp_attachments
+         * @group bp_upload_dir
+         */
+        public function test_bp_upload_dir_ms() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
+                }
+
+                $expected_upload_dir = wp_upload_dir();
+
+                $b = $this->factory->blog->create();
+
+                switch_to_blog( $b );
+
+                $tested_upload_dir = bp_upload_dir();
+
+                restore_current_blog();
+
+                $this->assertSame( $expected_upload_dir, $tested_upload_dir );
+        }
 }