Changeset 35560

Timestamp:

11/07/2015 01:32:41 AM (9 years ago)

Author:

azaozz

Message:

Responsive images: add test for invalid size name. Remove invalid size from other tests.

Props jaspermdegroot.
See #33641.

File:

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

trunk/tests/phpunit/tests/media.php

@@ -749 +749 @@
                 $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w';
 
-        // Set up test cases for all expected size names and a random one.
-        $sizes = array( 'medium', 'medium_large', 'large', 'full', 'yoav' );
+        // Set up test cases for all expected size names.
+        $sizes = array( 'medium', 'medium_large', 'large', 'full' );
 
         foreach ( $sizes as $size ) {
@@ -781 +781 @@
                 $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w';
 
-        // Set up test cases for all expected size names and a random one.
-        $sizes = array( 'medium', 'medium_large', 'large', 'full', 'yoav' );
+        // Set up test cases for all expected size names.
+        $sizes = array( 'medium', 'medium_large', 'large', 'full' );
 
         foreach ( $sizes as $size ) {
@@ -863 +863 @@
         $size_array = array( 1600, 1200 ); // full size
 
-        $sizes = wp_get_attachment_image_srcset( self::$large_id, $size_array, $image_meta );
+        $srcset = wp_get_attachment_image_srcset( self::$large_id, $size_array, $image_meta );
 
         $year_month = date('Y/m');
@@ -875 +875 @@
         $expected .= 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_meta['file'] . ' ' . $image_meta['width'] .'w';
 
-        $this->assertSame( $expected, $sizes );
+        $this->assertSame( $expected, $srcset );
     }
 
@@ -891 +891 @@
 
         $this->assertFalse( $sizes );
+    }
+
+    /**
+     * @ticket 33641
+     */
+    function test_wp_get_attachment_image_srcset_invalidsize() {
+        $image_meta = wp_get_attachment_metadata( self::$large_id );
+        $invalid_size = 'nailthumb';
+        $original_size = array( 1600, 1200 );
+
+        $srcset = wp_get_attachment_image_srcset( self::$large_id, $invalid_size, $image_meta );
+
+        // Expect a srcset for the original full size image to be returned.
+        $expected = wp_get_attachment_image_srcset( self::$large_id, $original_size, $image_meta );
+
+        $this->assertSame( $expected, $srcset );
     }