Changeset 40125

Timestamp:

02/26/2017 04:05:25 PM (10 years ago)

Author:

joemcgill

Message:

Media: Fix unit tests for MIME checks on multisite.

A few of the multisite tests were failing after [40124] because
multisite filters upload_mimes with the check_upload_mimes()
function to reduce the set of allowed MIME types. This fixes those
errors by skipping the tests for adding additional MIME types and
only tests file types assumed to be allowed.

See #39550.

File:

• trunk/tests/phpunit/tests/functions.php (modified) (5 diffs)

trunk/tests/phpunit/tests/functions.php

@@ -932 +932 @@
          */
         function test_wp_check_filetype_and_ext_with_filtered_svg() {
+                if ( ! extension_loaded( 'fileinfo' ) ) {
+                        $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
+                }
+
+                if ( is_multisite() ) {
+                        $this->markTestSkipped( 'Test does not run in multisite' );
+                }
+
                 $file = DIR_TESTDATA . '/uploads/video-play.svg';
                 $filename = 'video-play.svg';
@@ -952 +960 @@
          */
         function test_wp_check_filetype_and_ext_with_filtered_woff() {
+                if ( ! extension_loaded( 'fileinfo' ) ) {
+                        $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
+                }
+
+                if ( is_multisite() ) {
+                        $this->markTestSkipped( 'Test does not run in multisite' );
+                }
+
                 $file = DIR_TESTDATA . '/uploads/dashicons.woff';
                 $filename = 'dashicons.woff';
@@ -979 +995 @@
 
         public function _wp_check_filetype_and_ext_data() {
-                return array(
+                $data = array(
                         // Standard image.
                         array(
@@ -1020 +1036 @@
                                 ),
                         ),
-                        // Standard non-image file.
-                        array(
-                                DIR_TESTDATA . '/formatting/big5.txt',
-                                'big5.txt',
-                                array(
-                                        'ext' => 'txt',
-                                        'type' => 'text/plain',
-                                        'proper_filename' => false,
-                                ),
-                        ),
-                        // Non-image file with wrong sub-type.
-                        array(
-                                DIR_TESTDATA . '/uploads/pages-to-word.docx',
-                                'pages-to-word.docx',
-                                array(
-                                        'ext' => 'docx',
-                                        'type' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-                                        'proper_filename' => false,
-                                ),
-                        ),
                         // Non-image file not allowed.
                         array(
@@ -1051 +1047 @@
                         ),
                 );
+
+                // Test a few additional file types on single sites.
+                if ( ! is_multisite() ) {
+                        $data = array_merge( $data, array(
+                                // Standard non-image file.
+                                array(
+                                        DIR_TESTDATA . '/formatting/big5.txt',
+                                        'big5.txt',
+                                        array(
+                                                'ext' => 'txt',
+                                                'type' => 'text/plain',
+                                                'proper_filename' => false,
+                                        ),
+                                ),
+                                // Non-image file with wrong sub-type.
+                                array(
+                                        DIR_TESTDATA . '/uploads/pages-to-word.docx',
+                                        'pages-to-word.docx',
+                                        array(
+                                                'ext' => 'docx',
+                                                'type' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                                                'proper_filename' => false,
+                                        ),
+                                ),
+                        ) );
+                }
+
+                return $data;
         }
 }