<!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>[54424] trunk/tests/phpunit/tests/customize/manager.php: Tests: Remove unnecessary file copying in `WP_Customize_Manager` tests.</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 { white-space: pre-line; 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/54424">54424</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/54424","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-10-09 13:45:23 +0000 (Sun, 09 Oct 2022)</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'>Tests: Remove unnecessary file copying in `WP_Customize_Manager` tests.
This was added to avoid creating leftover image sub-sizes in the version-controlled `DIR_TESTDATA` directory.
However, this does not appear to be necessary:
* `WP_Customizer_Manager::import_theme_starter_content()` already [source:tags/6.0.2/src/wp-includes/class-wp-customize-manager.php?marks=1370-1374#L1367 makes a copy of the image] before sideloading, so the test was essentially working with a copy of a copy.
* The images were only used in one test out of 70 and do not need to be copied for every single test.
Upon further investigation, there is also no evidence that creating these copies actually resolved the reported issue:
* `WP_UnitTest_Factory_For_Attachment::create_object()` inserts an attachment, but does not create image sub-sizes.
* `media_handle_sideload()` does create image sub-sizes, but the file is already in the media library by that time, and sub-sizes are created in the `uploads` directory, not in the version-controlled `DIR_TESTDATA` directory.
This commit removes ~140 redundant file copying operations when running the test suite.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/39276">[39276]</a>, <a href="https://core.trac.wordpress.org/changeset/39346">[39346]</a>, <a href="https://core.trac.wordpress.org/changeset/39411">[39411]</a>, <a href="https://core.trac.wordpress.org/changeset/40142">[40142]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestscustomizemanagerphp"></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/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2022-10-08 13:39:43 UTC (rev 54423)
+++ trunk/tests/phpunit/tests/customize/manager.php 2022-10-09 13:45:23 UTC (rev 54424)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,20 +34,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $subscriber_user_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Path to test file 1.
- *
- * @var string
- */
- private $test_file;
-
- /**
- * Path to test file 2.
- *
- * @var string
- */
- private $test_file2;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Set up before class.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_UnitTest_Factory $factory Factory.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,13 +50,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->manager = $this->instantiate();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $orig_file = DIR_TESTDATA . '/images/canola.jpg';
- $this->test_file = get_temp_dir() . 'canola.jpg';
- copy( $orig_file, $this->test_file );
- $orig_file2 = DIR_TESTDATA . '/images/waffles.jpg';
- $this->test_file2 = get_temp_dir() . 'waffles.jpg';
- copy( $orig_file2, $this->test_file2 );
</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">@@ -557,7 +536,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'custom-background' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $existing_canola_attachment_id = self::factory()->attachment->create_object(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->test_file,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ DIR_TESTDATA . '/images/canola.jpg',
</ins><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -631,13 +610,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Waffles',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Waffles Attachment Description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Waffles Attachment Caption',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file' => $this->test_file2,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file' => DIR_TESTDATA . '/images/waffles.jpg',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'canola' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'Canola',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Canola Attachment Description',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Canola Attachment Caption',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file' => $this->test_file,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file' => DIR_TESTDATA . '/images/canola.jpg',
</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"> 'options' => array(
</span></span></pre>
</div>
</div>
</body>
</html>