From 3cc9adb890d9a08014ac7a9ef96bba2e45c16d9a Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 15 Oct 2015 02:54:20 +0000 Subject: [PATCH] Unit Tests: in `Tests_Media::test_wp_get_attachment_image_srcset_array_no_width()`, just toggle metadata, instead of creating a new attachment. Shaves 75ms off the test. See #30017, #33968. git-svn-id: https://develop.svn.wordpress.org/trunk@35181 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/media.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/phpunit/tests/media.php b/tests/phpunit/tests/media.php index 770b63cefd..19b4ccca85 100644 --- a/tests/phpunit/tests/media.php +++ b/tests/phpunit/tests/media.php @@ -761,7 +761,7 @@ EOF; /** * @ticket 33641 */ - function test_wp_get_attachment_image_srcset_array_no_date_upoads() { + function test_wp_get_attachment_image_srcset_array_no_date_uploads() { // Save the current setting for uploads folders $uploads_use_yearmonth_folders = get_option( 'uploads_use_yearmonth_folders' ); @@ -848,13 +848,15 @@ EOF; // Filter image_downsize() output. add_filter( 'wp_generate_attachment_metadata', array( $this, '_test_wp_get_attachment_image_srcset_array_no_width_filter' ) ); - // Make our attachment. - $filename = DIR_TESTDATA . '/images/test-image-large.png'; - $id = $this->factory->attachment->create_upload_object( $filename ); - $srcset = wp_get_attachment_image_srcset_array( $id, 'medium' ); + $old_meta = get_post_meta( self::$large_id, '_wp_attachment_metadata', true ); + $file = get_attached_file( self::$large_id ); - // Remove filter. - remove_filter( 'wp_generate_attachment_metadata', array( $this, '_test_wp_get_attachment_image_srcset_array_no_width_filter' ) ); + $data = wp_generate_attachment_metadata( self::$large_id, $file ); + wp_update_attachment_metadata( self::$large_id, $data ); + + $srcset = wp_get_attachment_image_srcset_array( self::$large_id, 'medium' ); + + update_post_meta( self::$large_id, '_wp_attachment_metadata', $old_meta ); // The srcset should be false. $this->assertFalse( $srcset ); @@ -864,6 +866,8 @@ EOF; * Helper function to filter image_downsize and return zero values for width and height. */ public function _test_wp_get_attachment_image_srcset_array_no_width_filter( $meta ) { + remove_filter( 'wp_generate_attachment_metadata', array( $this, __FUNCTION__ ) ); + $meta['sizes']['medium']['width'] = 0; $meta['sizes']['medium']['height'] = 0; return $meta;