<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[35179] trunk/tests/phpunit/tests/media.php: Unit Tests: make a fixture in `Tests_Media` to represent the large image, instead of creating it 10 times.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/35179">35179</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/35179","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-15 01:42:27 +0000 (Thu, 15 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Unit Tests: make a fixture in `Tests_Media` to represent the large image, instead of creating it 10 times.
See <a href="https://core.trac.wordpress.org/ticket/30017">#30017</a>, <a href="https://core.trac.wordpress.org/ticket/33968">#33968</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2015-10-15 01:28:05 UTC (rev 35178)
+++ trunk/tests/phpunit/tests/media.php 2015-10-15 01:42:27 UTC (rev 35179)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group shortcode
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Media extends WP_UnitTestCase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $large_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function setUpBeforeClass() {
+ parent::setUpBeforeClass();
+
+ $factory = new WP_UnitTest_Factory();
+
+ $filename = DIR_TESTDATA . '/images/test-image-large.png';
+ self::$large_id = $factory->attachment->create_upload_object( $filename );
+
+ self::commit_transaction();
+ }
+
+ public static function tearDownAfterClass() {
+ parent::tearDownAfterClass();
+
+ wp_delete_attachment( self::$large_id );
+
+ self::commit_transaction();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->caption = 'A simple caption.';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -709,11 +729,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_image_srcset_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = DIR_TESTDATA . '/images/test-image-large.png';
- $id = $this->factory->attachment->create_upload_object( $filename );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $year_month = date('Y/m');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image = wp_get_attachment_metadata( $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image = wp_get_attachment_metadata( self::$large_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,7 +754,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = array( 'medium', 'large', 'full', 'yoav' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sizes as $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $expected, wp_get_attachment_image_srcset_array( $id, $size ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, wp_get_attachment_image_srcset_array( self::$large_id, $size ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -790,12 +807,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_image_srcset_array_with_edits() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make an image.
- $filename = DIR_TESTDATA . '/images/test-image-large.png';
- $id = $this->factory->attachment->create_upload_object( $filename );
</del><span class="cx" style="display: block; padding: 0 10px"> // For this test we're going to mock metadata changes from an edit.
</span><span class="cx" style="display: block; padding: 0 10px"> // Start by getting the attachment metadata.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = wp_get_attachment_metadata( $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = wp_get_attachment_metadata( self::$large_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Copy hash generation method used in wp_save_image().
</span><span class="cx" style="display: block; padding: 0 10px"> $hash = 'e' . time() . rand(100, 999);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -806,13 +820,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['sizes']['medium']['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $meta['sizes']['medium']['file'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Save edited metadata.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_attachment_metadata( $id, $meta );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_attachment_metadata( self::$large_id, $meta );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get the edited image and observe that a hash was created.
- $img_url = wp_get_attachment_url( $id );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Calculate a srcset array.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sizes = wp_get_attachment_image_srcset_array( $id, 'medium' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sizes = wp_get_attachment_image_srcset_array( self::$large_id, 'medium' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test to confirm all sources in the array include the same edit hash.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sizes as $size ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -824,9 +835,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_image_srcset_array_false() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make an image.
- $filename = DIR_TESTDATA . '/images/test-image-large.png';
- $id = $this->factory->attachment->create_upload_object( $filename );
</del><span class="cx" style="display: block; padding: 0 10px"> $sizes = wp_get_attachment_image_srcset_array( 99999, 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For canola.jpg we should return
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -845,11 +853,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->attachment->create_upload_object( $filename );
</span><span class="cx" style="display: block; padding: 0 10px"> $srcset = wp_get_attachment_image_srcset_array( $id, 'medium' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove filter.
+ remove_filter( 'wp_generate_attachment_metadata', array( $this, '_test_wp_get_attachment_image_srcset_array_no_width_filter' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // The srcset should be false.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $srcset );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Remove filter.
- remove_filter( 'wp_generate_attachment_metadata', array( $this, '_test_wp_get_attachment_image_srcset_array_no_width_filter' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -865,12 +873,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_image_srcset() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make an image.
- $filename = DIR_TESTDATA . '/images/test-image-large.png';
- $id = $this->factory->attachment->create_upload_object( $filename );
- $sizes = wp_get_attachment_image_srcset( $id, 'full-size' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sizes = wp_get_attachment_image_srcset( self::$large_id, 'full-size' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image = wp_get_attachment_metadata( $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image = wp_get_attachment_metadata( self::$large_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $year_month = date('Y/m');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = 'http://example.org/wp-content/uploads/' . $year_month = date('Y/m') . '/'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -886,14 +891,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_image_srcset_single_srcset() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make an image.
- $filename = DIR_TESTDATA . '/images/test-image-large.png';
- $id = $this->factory->attachment->create_upload_object( $filename );
</del><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * In our tests, thumbnails will only return a single srcset candidate,
</span><span class="cx" style="display: block; padding: 0 10px"> * so we shouldn't return a srcset value in order to avoid unneeded markup.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sizes = wp_get_attachment_image_srcset( $id, 'thumbnail' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sizes = wp_get_attachment_image_srcset( self::$large_id, 'thumbnail' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $sizes );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -902,11 +904,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_image_sizes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make an image.
- $filename = DIR_TESTDATA . '/images/test-image-large.png';
- $id = $this->factory->attachment->create_upload_object( $filename );
-
-
</del><span class="cx" style="display: block; padding: 0 10px"> global $content_width;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test sizes against the default WP sizes.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -921,7 +918,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '(max-width: ' . $width . 'px) 100vw, ' . $width . 'px';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sizes = wp_get_attachment_image_sizes( $id, $int );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sizes = wp_get_attachment_image_sizes( self::$large_id, $int );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame($expected, $sizes);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -931,11 +928,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_image_sizes_with_args() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make an image.
- $filename = DIR_TESTDATA . '/images/test-image-large.png';
- $id = $this->factory->attachment->create_upload_object( $filename );
-
-
</del><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'sizes' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -955,9 +947,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '(min-width: 60em) 10em, (min-width: 30em) 20em, calc(100vm - 30px)';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sizes = wp_get_attachment_image_sizes( $id, 'medium', $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sizes = wp_get_attachment_image_sizes( self::$large_id, 'medium', $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame($expected, $sizes);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, $sizes );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -967,16 +959,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add our test filter.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_image_sizes_args', array( $this, '_test_wp_image_sizes_args' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make an image.
- $filename = DIR_TESTDATA . '/images/test-image-large.png';
- $id = $this->factory->attachment->create_upload_object( $filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sizes = wp_get_attachment_image_sizes( self::$large_id, 'medium' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sizes = wp_get_attachment_image_sizes($id, 'medium');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wp_image_sizes_args', array( $this, '_test_wp_image_sizes_args' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Evaluate that the sizes returned is what we expected.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $sizes, '100vm');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- remove_filter( 'wp_image_sizes_args', array( $this, '_test_wp_image_sizes_args' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -991,15 +979,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_make_content_images_responsive() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make an image.
- $filename = DIR_TESTDATA . '/images/test-image-large.png';
- $id = $this->factory->attachment->create_upload_object( $filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $srcset = sprintf( 'srcset="%s"', wp_get_attachment_image_srcset( self::$large_id, 'medium' ) );
+ $sizes = sprintf( 'sizes="%s"', wp_get_attachment_image_sizes( self::$large_id, 'medium' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $srcset = sprintf( 'srcset="%s"', wp_get_attachment_image_srcset( $id, 'medium' ) );
- $sizes = sprintf( 'sizes="%s"', wp_get_attachment_image_sizes( $id, 'medium' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Function used to build HTML for the editor.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $img = get_image_tag( $id, '', '', '', 'medium' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $img = get_image_tag( self::$large_id, '', '', '', 'medium' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $img_no_size = str_replace( 'size-', '', $img );
</span><span class="cx" style="display: block; padding: 0 10px"> $img_no_size_id = str_replace( 'wp-image-', 'id-', $img_no_size );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1045,12 +1029,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_make_content_images_responsive_with_preexisting_srcset() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make an image.
- $filename = DIR_TESTDATA . '/images/test-image-large.png';
- $id = $this->factory->attachment->create_upload_object( $filename );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Generate HTML and add a dummy srcset attribute.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_html = get_image_tag( $id, '', '', '', 'medium' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_html = get_image_tag( self::$large_id, '', '', '', 'medium' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_html = preg_replace('|<img ([^>]+) />|', '<img $1 ' . 'srcset="image2x.jpg 2x" />', $image_html );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The content filter should return the image unchanged.
</span></span></pre>
</div>
</div>
</body>
</html>