Changes in branches/4.4/tests/phpunit/tests/media.php [35821:36152]

File:

• branches/4.4/tests/phpunit/tests/media.php (modified) (3 diffs)

branches/4.4/tests/phpunit/tests/media.php

@@ -867 +867 @@
 
     /**
+     * @ticket 35106
+     */
+    function test_wp_calculate_image_srcset_with_absolute_path_in_meta() {
+        global $_wp_additional_image_sizes;
+
+        $year_month = date('Y/m');
+        $image_meta = wp_get_attachment_metadata( self::$large_id );
+        $uploads_dir_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/';
+
+        // Set up test cases for all expected size names.
+        $intermediates = array( 'medium', 'medium_large', 'large', 'full' );
+
+        // Add any soft crop intermediate sizes.
+        foreach ( $_wp_additional_image_sizes as $name => $additional_size ) {
+            if ( ! $_wp_additional_image_sizes[$name]['crop'] || 0 === $_wp_additional_image_sizes[$name]['height'] ) {
+                $intermediates[] = $name;
+            }
+        }
+
+        $expected = '';
+
+        foreach( $image_meta['sizes'] as $name => $size ) {
+            // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
+            if ( in_array( $name, $intermediates ) ) {
+                $expected .= $uploads_dir_url . $year_month . '/' . $size['file'] . ' ' . $size['width'] . 'w, ';
+            }
+        }
+
+        // Add the full size width at the end.
+        $expected .= $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] .'w';
+
+        // Prepend an absolute path to simulate a pre-2.7 upload
+        $image_meta['file'] = 'H:\home\wordpress\trunk/wp-content/uploads/' . $image_meta['file'];
+
+        foreach ( $intermediates as $int ) {
+            $image_url = wp_get_attachment_image_url( self::$large_id, $int );
+            $size_array = $this->_get_image_size_array_from_name( $int );
+            $this->assertSame( $expected, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
+        }
+    }
+
+    /**
      * @ticket 33641
      */
@@ -890 +932 @@
         // The srcset should be false.
         $this->assertFalse( $srcset );
+    }
+
+    /**
+     * @ticket 35108
+     * @ticket 33641
+     */
+    function test_wp_calculate_image_srcset_include_src() {
+        // Mock data for this test.
+        $size_array = array( 2000, 1000 );
+        $image_src = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test.png';
+        $image_meta = array(
+            'width' => 2000,
+            'height' => 1000,
+            'file' => '2015/12/test.png',
+            'sizes' => array(
+                'thumbnail' => array(
+                    'file' => 'test-150x150.png',
+                    'width' => 150,
+                    'height' => 150,
+                    'mime-type' => 'image/png',
+                ),
+                'medium' => array(
+                    'file' => 'test-300x150.png',
+                    'width' => 300,
+                    'height' => 150,
+                    'mime-type' => 'image/png',
+                ),
+                'medium_large' => array(
+                    'file' => 'test-768x384.png',
+                    'width' => 768,
+                    'height' => 384,
+                    'mime-type' => 'image/png',
+                ),
+                'large' => array(
+                    'file' => 'test-1024x512.png',
+                    'width' => 1024,
+                    'height' => 512,
+                    'mime-type' => 'image/png',
+                ),
+            ),
+        );
+
+        $expected_srcset = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test-300x150.png 300w, http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test-768x384.png 768w, http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test-1024x512.png 1024w, http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test.png 2000w';
+
+        $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_src, $image_meta ) );
     }
 
@@ -1134 +1221 @@
         $this->assertFalse( strpos( wp_calculate_image_srcset( $size_array, $large_src, $image_meta ), $full_src ) );
     }
+
+    /**
+     * @ticket 35045
+     * @ticket 33641
+     */
+    function test_wp_make_content_images_responsive_schemes() {
+        $image_meta = wp_get_attachment_metadata( self::$large_id );
+        $size_array = $this->_get_image_size_array_from_name( 'medium' );
+
+        $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( self::$large_id, $size_array, $image_meta ) );
+
+        // Build HTML for the editor.
+        $img          = get_image_tag( self::$large_id, '', '', '', 'medium' );
+        $img_https    = str_replace( 'http://', 'https://', $img );
+        $img_relative = str_replace( 'http://', '//', $img );
+
+        // Manually add srcset and sizes to the markup from get_image_tag().
+        $respimg          = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img );
+        $respimg_https    = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_https );
+        $respimg_relative = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . $srcset . ' ' . $sizes . ' />', $img_relative );
+
+        $content = '
+            <p>Image, http: protocol. Should have srcset and sizes.</p>
+            %1$s
+
+            <p>Image, https: protocol. Should have srcset and sizes.</p>
+            %2$s
+
+            <p>Image, protocol-relative. Should have srcset and sizes.</p>
+            %3$s';
+
+        $unfiltered = sprintf( $content, $img, $img_https, $img_relative );
+        $expected   = sprintf( $content, $respimg, $respimg_https, $respimg_relative );
+        $actual     = wp_make_content_images_responsive( $unfiltered );
+
+        $this->assertSame( $expected, $actual );
+    }
 }