Changeset 31647

Timestamp:

03/06/2015 08:37:08 PM (10 years ago)

Author:

wonderboymusic

Message:

Add unit tests for wp_attachment_is(), checks the whitelist and arbitrary extension.

See #25275.

Location:

trunk

Files:

• src/wp-includes/post.php (modified) (1 diff)
• tests/phpunit/tests/post/attachments.php (modified) (1 diff)

trunk/src/wp-includes/post.php

@@ -5092 +5092 @@
 
     $check = wp_check_filetype( $file );
-    if ( empty( $check['ext'] ) || 'import' !== $post->post_mime_type ) {
+    if ( empty( $check['ext'] ) ) {
         return false;
     }
+
     $ext = $check['ext'];
+
+    if ( 'import' !== $post->post_mime_type ) {
+        return $type === $ext;
+    }
 
     switch ( $type ) {

trunk/tests/phpunit/tests/post/attachments.php

@@ -440 +440 @@
     }
 
+    public function test_wp_attachment_is() {
+        $filename = DIR_TESTDATA . '/images/test-image.jpg';
+        $contents = file_get_contents( $filename );
+
+        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $attachment_id = $this->_make_attachment( $upload );
+
+        $this->assertTrue( wp_attachment_is_image( $attachment_id ) );
+        $this->assertTrue( wp_attachment_is( 'image', $attachment_id ) );
+        $this->assertFalse( wp_attachment_is( 'audio', $attachment_id ) );
+        $this->assertFalse( wp_attachment_is( 'video', $attachment_id ) );
+    }
+
+    public function test_wp_attachment_is_default() {
+        $filename = DIR_TESTDATA . '/images/test-image.psd';
+        $contents = file_get_contents( $filename );
+
+        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $attachment_id = $this->_make_attachment( $upload );
+
+        $this->assertFalse( wp_attachment_is_image( $attachment_id ) );
+        $this->assertTrue( wp_attachment_is( 'psd', $attachment_id ) );
+        $this->assertFalse( wp_attachment_is( 'audio', $attachment_id ) );
+        $this->assertFalse( wp_attachment_is( 'video', $attachment_id ) );
+    }
 }