Changeset 35309 for trunk/tests/phpunit/tests/general/template.php

Timestamp:

10/21/2015 01:58:52 AM (10 years ago)

Author:

wonderboymusic

Message:

Unit Tests: consolidate the many separate implementations of _make_attachment() into a helper method on WP_UnitTestCase.

Fixes #34075.

File:

• trunk/tests/phpunit/tests/general/template.php (modified) (1 diff)

trunk/tests/phpunit/tests/general/template.php

@@ -155 +155 @@
 
         $upload = wp_upload_bits( basename( $filename ), null, $contents );
-        $type   = '';
-        if ( ! empty( $upload['type'] ) ) {
-            $type = $upload['type'];
-        } else {
-            $mime = wp_check_filetype( $upload['file'] );
-            if ( $mime ) {
-                $type = $mime['type'];
-            }
-        }
+        $this->site_icon_url = $upload['url'];
 
-        $attachment = array(
-            'post_title'     => basename( $upload['file'] ),
-            'post_content'   => $upload['url'],
-            'post_type'      => 'attachment',
-            'post_mime_type' => $type,
-            'guid'           => $upload['url'],
-        );
 
         // Save the data
-        $this->site_icon_url = $upload['url'];
-        $this->site_icon_id  = wp_insert_attachment( $attachment, $upload['file'] );
-        wp_update_attachment_metadata( $this->site_icon_id, wp_generate_attachment_metadata( $this->site_icon_id, $upload['file'] ) );
+        $this->site_icon_id = $this->_make_attachment( $upload );
+        return $this->site_icon_id;
     }
 }