Changeset 35569 for trunk/tests/phpunit/tests/media.php

Timestamp:

11/07/2015 09:35:34 PM (11 years ago)

Author:

azaozz

Message:

Responsive images: make the new functions and filters signatures more consistent.

Props joemcgill.
Fixes #34612.

File:

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

trunk/tests/phpunit/tests/media.php

@@ -755 +755 @@
                         $image_url = wp_get_attachment_image_url( self::$large_id, $size );
                         $size_array = $this->_get_image_size_array_from_name( $size );
-                        $this->assertSame( $expected, wp_calculate_image_srcset( $image_url, $size_array, $image_meta ) );
+                        $this->assertSame( $expected, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
                 }
         }
@@ -787 +787 @@
                         $size_array = $this->_get_image_size_array_from_name( $size );
                         $image_url = wp_get_attachment_image_url( $id, $size );
-                        $this->assertSame( $expected, wp_calculate_image_srcset( $image_url, $size_array, $image_meta ) );
+                        $this->assertSame( $expected, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
                 }
 
@@ -822 +822 @@
 
                 // Calculate a srcset array.
-                $sizes = explode( ', ', wp_calculate_image_srcset( $image_url, $size_array, $image_meta ) );
+                $sizes = explode( ', ', wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
 
                 // Test to confirm all sources in the array include the same edit hash.
@@ -834 +834 @@
          */
         function test_wp_calculate_image_srcset_false() {
-                $sizes = wp_calculate_image_srcset( 'file.png', array( 400, 300 ), array() );
+                $sizes = wp_calculate_image_srcset( array( 400, 300 ), 'file.png', array() );
 
                 // For canola.jpg we should return
@@ -850 +850 @@
                 $size_array = array(0, 0);
 
-                $srcset = wp_calculate_image_srcset( $image_url, $size_array, $image_meta );
+                $srcset = wp_calculate_image_srcset( $size_array, $image_url, $image_meta );
 
                 // The srcset should be false.
@@ -915 +915 @@
                 // Test sizes against the default WP sizes.
                 $intermediates = array('thumbnail', 'medium', 'medium_large', 'large');
+
+                foreach( $intermediates as $int_size ) {
+                        $image = wp_get_attachment_image_src( self::$large_id, $int_size );
+
+                        $expected = '(max-width: ' . $image[1] . 'px) 100vw, ' . $image[1] . 'px';
+                        $sizes = wp_get_attachment_image_sizes( self::$large_id, $int_size );
+
+                        $this->assertSame( $expected, $sizes );
+                }
+        }
+
+        /**
+         * @ticket 33641
+         */
+        function test_wp_calculate_image_sizes() {
+                // Test sizes against the default WP sizes.
+                $intermediates = array('thumbnail', 'medium', 'medium_large', 'large');
                 $image_meta = wp_get_attachment_metadata( self::$large_id );
 
                 foreach( $intermediates as $int_size ) {
                         $size_array = $this->_get_image_size_array_from_name( $int_size );
+                        $image_src = $image_meta['sizes'][$int_size]['file'];
                         list( $width, $height ) = $size_array;
 
                         $expected = '(max-width: ' . $width . 'px) 100vw, ' . $width . 'px';
-                        $sizes = wp_get_attachment_image_sizes( $size_array, $image_meta );
+                        $sizes = wp_calculate_image_sizes( $size_array, $image_src, $image_meta );
 
                         $this->assertSame( $expected, $sizes );
@@ -936 +954 @@
 
                 $srcset = sprintf( 'srcset="%s"', wp_get_attachment_image_srcset( self::$large_id, $size_array, $image_meta ) );
-                $sizes = sprintf( 'sizes="%s"', wp_get_attachment_image_sizes( $size_array, $image_meta, self::$large_id ) );
+                $sizes = sprintf( 'sizes="%s"', wp_get_attachment_image_sizes( self::$large_id, $size_array, $image_meta ) );
 
                 // Function used to build HTML for the editor.
@@ -1020 +1038 @@
 
                 // Full size GIFs should not return a srcset.
-                $this->assertFalse( wp_calculate_image_srcset( $full_src, $size_array, $image_meta ) );
+                $this->assertFalse( wp_calculate_image_srcset( $size_array, $full_src, $image_meta ) );
                 // Intermediate sized GIFs should not include the full size in the srcset.
-                $this->assertFalse( strpos( wp_calculate_image_srcset( $large_src, $size_array, $image_meta ), $full_src ) );
+                $this->assertFalse( strpos( wp_calculate_image_srcset( $size_array, $large_src, $image_meta ), $full_src ) );
         }
 }