Changeset 9760 for trunk/tests/phpunit/testcases/core/avatars.php

Timestamp:

04/16/2015 11:09:33 PM (11 years ago)

Author:

imath

Message:

Improve bp_core_get_allowed_avatar_types(). Make sure to get the file type if the upload was not done using html5

The way we used to check the image file type is not working if the browser is Internet Explorer < 10. In this particular case, the Plupload runtime is falling back to flash and the file type is application/octet-stream. We are now using wp_check_filetype_and_ext() to fix this issue.

You can use the filter bp_core_get_allowed_avatar_types if you wish to *restrict* the avatar image types. Our supported types are: jpg, jpeg, png and gif.

Props DJPaul.

Fixes #6336
See #6290
See #6278

File:

• trunk/tests/phpunit/testcases/core/avatars.php (modified) (1 diff)

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

@@ -205 +205 @@
         $this->assertSame( $expected, array_intersect_key( $expected, $classes ) );
     }
+
+    /**
+     * @group bp_core_check_avatar_type
+     */
+    public function test_bp_core_check_avatar_type() {
+        $plugin_dir = trailingslashit( buddypress()->plugin_dir );
+
+        $file = array(
+            'file' => array(
+                'name' => 'humans.txt',
+                'type' => 'text/plain',
+                'tmp_name' => $plugin_dir . 'humans.txt',
+            )
+        );
+
+        $this->assertFalse( bp_core_check_avatar_type( $file ) );
+
+        $file = array(
+            'file' => array(
+                'name' => 'mystery-man.jpg',
+                'type' => 'image/jpeg',
+                'tmp_name' => $plugin_dir . 'bp-core/images/mystery-man.jpg',
+            )
+        );
+
+        $this->assertTrue( bp_core_check_avatar_type( $file ) );
+
+        $file = array(
+            'file' => array(
+                'name' => 'mystery-man.jpg',
+                'type' => 'application/octet-stream',
+                'tmp_name' => $plugin_dir . 'bp-core/images/mystery-man.jpg',
+            )
+        );
+
+        $this->assertTrue( bp_core_check_avatar_type( $file ), 'flash is using application/octet-stream for image uploads' );
+    }
+
+    /**
+     * @group bp_core_check_avatar_type
+     * @group bp_core_get_allowed_avatar_types
+     */
+    public function test_bp_core_get_allowed_avatar_types_filter() {
+        add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
+
+        $this->assertEquals( array( 'jpeg', 'gif', 'png' ), bp_core_get_allowed_avatar_types() );
+
+        remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
+
+        add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
+
+        $this->assertEquals( array( 'gif', 'png' ), bp_core_get_allowed_avatar_types() );
+
+        remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
+
+        add_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
+
+        $this->assertEquals( array( 'jpeg', 'gif', 'png' ), bp_core_get_allowed_avatar_types() );
+
+        remove_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
+    }
+
+    /**
+     * @group bp_core_check_avatar_type
+     * @group bp_core_get_allowed_avatar_mimes
+     */
+    public function test_bp_core_get_allowed_avatar_mimes() {
+        $mimes = bp_core_get_allowed_avatar_mimes();
+
+        $this->assertEquals( array( 'jpeg', 'gif', 'png', 'jpg' ), array_keys( $mimes ) );
+        $this->assertEquals( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( $mimes ) );
+
+        add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
+
+        $this->assertEquals( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+
+        remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
+
+        add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
+
+        $this->assertEquals( array( 'image/gif', 'image/png' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+
+        remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
+
+        add_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
+
+        $this->assertEquals( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+
+        remove_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
+    }
+
+    public function avatar_types_filter_add_type( $types ) {
+        $types[] = 'bmp';
+
+        return $types;
+    }
+
+    public function avatar_types_filter_remove_type( $types ) {
+        $jpeg = array_shift( $types );
+
+        return $types;
+    }
 }