<!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>[40125] trunk/tests/phpunit/tests/functions.php: Media: Fix unit tests for MIME checks on multisite.</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/40125">40125</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/40125","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joemcgill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-02-26 16:05:25 +0000 (Sun, 26 Feb 2017)</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'>Media: Fix unit tests for MIME checks on multisite.
A few of the multisite tests were failing after <a href="https://core.trac.wordpress.org/changeset/40124">[40124]</a> because
multisite filters `upload_mimes` with the `check_upload_mimes()`
function to reduce the set of allowed MIME types. This fixes those
errors by skipping the tests for adding additional MIME types and
only tests file types assumed to be allowed.
See <a href="https://core.trac.wordpress.org/ticket/39550">#39550</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2017-02-25 16:07:25 UTC (rev 40124)
+++ trunk/tests/phpunit/tests/functions.php 2017-02-26 16:05:25 UTC (rev 40125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -931,6 +931,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39550
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_check_filetype_and_ext_with_filtered_svg() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! extension_loaded( 'fileinfo' ) ) {
+ $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
+ }
+
+ if ( is_multisite() ) {
+ $this->markTestSkipped( 'Test does not run in multisite' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/uploads/video-play.svg';
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = 'video-play.svg';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -951,6 +959,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39550
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_check_filetype_and_ext_with_filtered_woff() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! extension_loaded( 'fileinfo' ) ) {
+ $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
+ }
+
+ if ( is_multisite() ) {
+ $this->markTestSkipped( 'Test does not run in multisite' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/uploads/dashicons.woff';
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = 'dashicons.woff';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -978,7 +994,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"> public function _wp_check_filetype_and_ext_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> // Standard image.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/images/canola.jpg',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1019,26 +1035,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'proper_filename' => false,
</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">- // Standard non-image file.
- array(
- DIR_TESTDATA . '/formatting/big5.txt',
- 'big5.txt',
- array(
- 'ext' => 'txt',
- 'type' => 'text/plain',
- 'proper_filename' => false,
- ),
- ),
- // Non-image file with wrong sub-type.
- array(
- DIR_TESTDATA . '/uploads/pages-to-word.docx',
- 'pages-to-word.docx',
- array(
- 'ext' => 'docx',
- 'type' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- 'proper_filename' => false,
- ),
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> // Non-image file not allowed.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/export/crazy-cdata.xml',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1050,5 +1046,33 @@
</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"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Test a few additional file types on single sites.
+ if ( ! is_multisite() ) {
+ $data = array_merge( $data, array(
+ // Standard non-image file.
+ array(
+ DIR_TESTDATA . '/formatting/big5.txt',
+ 'big5.txt',
+ array(
+ 'ext' => 'txt',
+ 'type' => 'text/plain',
+ 'proper_filename' => false,
+ ),
+ ),
+ // Non-image file with wrong sub-type.
+ array(
+ DIR_TESTDATA . '/uploads/pages-to-word.docx',
+ 'pages-to-word.docx',
+ array(
+ 'ext' => 'docx',
+ 'type' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ 'proper_filename' => false,
+ ),
+ ),
+ ) );
+ }
+
+ return $data;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>