Changeset 13316

Timestamp:

08/13/2022 12:59:52 PM (2 years ago)

Author:

imath

Message:

Media: adjust avatar/cover image unit tests for the WP v5.7 context

As the .webp image file type will only be available if WP version >= 5.8, we need to only check for it using the same requirement.

Fixes #8643

Location:

trunk/tests/phpunit/testcases/core

Files:

• avatars.php (modified) (5 diffs)
• functions.php (modified) (1 diff)

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

@@ -6 +6 @@
 class BP_Tests_Avatars extends BP_UnitTestCase {
     private $params = array();
+    protected $allowed_image_types = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
+    protected $allowed_image_mimes = array( 'image/jpeg', 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png' );
+
+    public function set_up() {
+        parent::set_up();
+
+        if ( bp_is_running_wp( '5.8.0', '>=' ) ) {
+            $this->allowed_image_types[] = 'webp';
+            $this->allowed_image_mimes[] = 'image/webp';
+        }
+    }
 
     private function clean_existing_avatars( $type = 'user' ) {
@@ -256 +267 @@
      */
     public function test_bp_core_get_allowed_avatar_types_filter() {
+        $allowed_image_types = $this->allowed_image_types;
         add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
 
-        $this->assertEquals( array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' ), bp_core_get_allowed_avatar_types() );
+        $this->assertEquals( $allowed_image_types, 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( 'jpeg', 'jpe', 'gif', 'png', 'webp' ), bp_core_get_allowed_avatar_types() );
+        array_shift( $allowed_image_types );
+
+        $this->assertEquals( $allowed_image_types, bp_core_get_allowed_avatar_types() );
 
         remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
@@ -270 +283 @@
         add_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
 
-        $this->assertEquals( array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' ), bp_core_get_allowed_avatar_types() );
+        $this->assertEquals( $this->allowed_image_types, bp_core_get_allowed_avatar_types() );
 
         remove_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
@@ -280 +293 @@
      */
     public function test_bp_core_get_allowed_avatar_mimes() {
-        $mimes = bp_core_get_allowed_avatar_mimes();
-
-        $this->assertEqualSets( array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' ), array_keys( $mimes ) );
-        $this->assertEqualSets( array( 'image/jpeg', 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png', 'image/webp' ), array_values( $mimes ) );
+        $mimes               = bp_core_get_allowed_avatar_mimes();
+        $allowed_image_mimes = $this->allowed_image_mimes;
+
+        $this->assertEqualSets( $this->allowed_image_types, array_keys( $mimes ) );
+        $this->assertEqualSets( $allowed_image_mimes, array_values( $mimes ) );
 
         add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
 
-        $this->assertEqualSets( array( 'image/jpeg', 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png', 'image/webp' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+        $this->assertEqualSets( $allowed_image_mimes, 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->assertEqualSets( array( 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png', 'image/webp', 'image/jpeg' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+        array_shift( $allowed_image_mimes );
+
+        $this->assertEqualSets( array_merge( $allowed_image_mimes, array( 'image/jpeg' ) ), array_values( bp_core_get_allowed_avatar_mimes() ) );
 
         remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
@@ -299 +314 @@
         add_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
 
-        $this->assertEqualSets( array( 'image/jpeg', 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png', 'image/webp' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+        $this->assertEqualSets( $this->allowed_image_mimes, array_values( bp_core_get_allowed_avatar_mimes() ) );
 
         remove_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );

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

@@ -785 +785 @@
      */
     public function test_bp_attachments_get_allowed_types() {
-        $supported = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
+        $supported = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
+        if ( bp_is_running_wp( '5.8.0', '>=' ) ) {
+            $supported[] = 'webp';
+        }
 
         $avatar = bp_attachments_get_allowed_types( 'avatar' );