<!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>[45013] branches/4.0: Build/Test tools: Fix the Travis CI build for the 4.0 branch.</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/45013">45013</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/45013","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-03-26 00:45:57 +0000 (Tue, 26 Mar 2019)</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'>Build/Test tools: Fix the Travis CI build for the 4.0 branch.
Among other fixes, this backports <a href="https://core.trac.wordpress.org/changeset/29860">[29860]</a>, <a href="https://core.trac.wordpress.org/changeset/29869">[29869]</a>, <a href="https://core.trac.wordpress.org/changeset/29954">[29954]</a>, <a href="https://core.trac.wordpress.org/changeset/30160">[30160]</a>, <a href="https://core.trac.wordpress.org/changeset/30530">[30530]</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/46646">#46646</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches40packagejson">branches/4.0/package.json</a></li>
<li><a href="#branches40phpunitxmldist">branches/4.0/phpunit.xml.dist</a></li>
<li><a href="#branches40testsphpunitincludestestcasephp">branches/4.0/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#branches40testsphpunitmultisitexml">branches/4.0/tests/phpunit/multisite.xml</a></li>
<li><a href="#branches40testsphpunittestscanonicalhttpsphp">branches/4.0/tests/phpunit/tests/canonical/https.php</a></li>
<li><a href="#branches40testsphpunittestsformattingSanitizeTitleWithDashesphp">branches/4.0/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php</a></li>
<li><a href="#branches40testsphpunittestsformattingSanitizeUserphp">branches/4.0/tests/phpunit/tests/formatting/SanitizeUser.php</a></li>
<li><a href="#branches40testsphpunittestsfunctionsphp">branches/4.0/tests/phpunit/tests/functions.php</a></li>
<li><a href="#branches40testsphpunittestsmailphp">branches/4.0/tests/phpunit/tests/mail.php</a></li>
<li><a href="#branches40testsphpunittestspostfilteringphp">branches/4.0/tests/phpunit/tests/post/filtering.php</a></li>
<li><a href="#branches40testsphpunittestspostlistPagesphp">branches/4.0/tests/phpunit/tests/post/listPages.php</a></li>
<li><a href="#branches40testsphpunittestspostphp">branches/4.0/tests/phpunit/tests/post.php</a></li>
<li><a href="#branches40testsphpunittestsqueryresultsphp">branches/4.0/tests/phpunit/tests/query/results.php</a></li>
<li><a href="#branches40testsphpunittestsshortcodephp">branches/4.0/tests/phpunit/tests/shortcode.php</a></li>
<li><a href="#branches40testsphpunitteststaxonomyphp">branches/4.0/tests/phpunit/tests/taxonomy.php</a></li>
<li><a href="#branches40testsphpunittestsxmlrpcwpuploadFilephp">branches/4.0/tests/phpunit/tests/xmlrpc/wp/uploadFile.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches40">branches/4.0/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.0
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.0 2019-03-25 17:07:12 UTC (rev 45012)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.0 2019-03-26 00:45:57 UTC (rev 45013)
</ins><a id="branches40"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.8:42478
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:42434
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43988,43994,44014,44017,44047
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:29723-29725,29727,29730,29733,29738,29745-29746,29751,29755,29765-29766,29777,29783,29829,29884,29886,29979,30001,30090,30185,30242,30263-30264,30282,30285,30378,30401,30412,30417,30422,30425,30430,30435,30438,30443,30458,30466,30513-30514,30517,30519,30521,30529,31258-31259,33124,33142,33374,36083,36435,37651,38524,39645,39659,39759,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40241,40400,40538,40604,40677,40692,40704,40723,40736,41072,41393,41395,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424,42433,42892-42893,44021,44048,44842,44993
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:29723-29725,29727,29730,29733,29738,29745-29746,29751,29755,29765-29766,29777,29783,29829,29860,29869,29884,29886,29954,29979,30001,30090,30160,30185,30242,30263-30264,30282,30285,30378,30401,30412,30417,30422,30425,30430,30435,30438,30443,30458,30466,30513-30514,30517,30519,30521,30529-30530,31258-31259,33124,33142,33374,36083,36435,37651,38524,39645,39659,39759,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40241,40400,40538,40604,40677,40692,40704,40723,40736,41072,41393,41395,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424,42433,42892-42893,44021,44048,44842,44993
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches40packagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/package.json 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/package.json 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-jsvalidate": "~0.2.2",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-legacy-util": "^0.2.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-patch-wordpress": "~0.2.1",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "grunt-sass": "~0.14.0",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "grunt-sass": "~0.16.0",
</ins><span class="cx" style="display: block; padding: 0 10px"> "matchdep": "~0.3.0"
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches40phpunitxmldist"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/phpunit.xml.dist</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/phpunit.xml.dist 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/phpunit.xml.dist 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,4 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <logging>
</span><span class="cx" style="display: block; padding: 0 10px"> <log type="junit" target="tests/phpunit/build/logs/junit.xml" logIncompleteSkipped="false"/>
</span><span class="cx" style="display: block; padding: 0 10px"> </logging>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <php>
+ <const name="WP_RUN_CORE_TESTS" value="1" />
+ </php>
</ins><span class="cx" style="display: block; padding: 0 10px"> </phpunit>
</span></span></pre></div>
<a id="branches40testsphpunitincludestestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/includes/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/includes/testcase.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/includes/testcase.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,11 +37,51 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ini_set('display_errors', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory = new WP_UnitTest_Factory;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->clean_up_global_scope();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /*
+ * When running core tests, ensure that post types and taxonomies
+ * are reset for each test. We skip this step for non-core tests,
+ * given the large number of plugins that register post types and
+ * taxonomies at 'init'.
+ */
+ if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
+ $this->reset_post_types();
+ $this->reset_taxonomies();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->start_transaction();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectDeprecated();
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
</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">+ /**
+ * Unregister existing post types and register defaults.
+ *
+ * Run before each test in order to clean up the global scope, in case
+ * a test forgets to unregister a post type on its own, or fails before
+ * it has a chance to do so.
+ */
+ protected function reset_post_types() {
+ foreach ( get_post_types() as $pt ) {
+ _unregister_post_type( $pt );
+ }
+ create_initial_post_types();
+ }
+
+ /**
+ * Unregister existing taxonomies and register defaults.
+ *
+ * Run before each test in order to clean up the global scope, in case
+ * a test forgets to unregister a taxonomy on its own, or fails before
+ * it has a chance to do so.
+ */
+ protected function reset_taxonomies() {
+ foreach ( get_taxonomies() as $tax ) {
+ _unregister_taxonomy( $tax );
+ }
+ create_initial_taxonomies();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function tearDown() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $wp_query, $post;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectedDeprecated();
</span></span></pre></div>
<a id="branches40testsphpunitmultisitexml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/multisite.xml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/multisite.xml 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/multisite.xml 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,4 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <group>ajax</group>
</span><span class="cx" style="display: block; padding: 0 10px"> </exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> </groups>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <php>
+ <const name="WP_RUN_CORE_TESTS" value="1" />
+ </php>
</ins><span class="cx" style="display: block; padding: 0 10px"> </phpunit>
</span></span></pre></div>
<a id="branches40testsphpunittestscanonicalhttpsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/canonical/https.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/canonical/https.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/canonical/https.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,21 +44,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27954
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_http_request_with_https_home() {
-
- add_filter( 'home_url', array( $this, 'set_https' ) );
-
- $redirect = redirect_canonical( $this->http, false );
-
- $this->assertEquals( $redirect, $this->https );
-
- remove_filter( 'home_url', array( $this, 'set_https' ) );
-
- }
-
- /**
- * @ticket 27954
- */
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_https_request_with_https_home() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'home_url', array( $this, 'set_https' ) );
</span></span></pre></div>
<a id="branches40testsphpunittestsformattingSanitizeTitleWithDashesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,20 +35,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals("penn-teller-bull", sanitize_title_with_dashes("penn & teller bull"));
</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">- /**
- * @ticket 10823
- */
- function test_strips_entities() {
- $this->assertEquals("no-entities-here", sanitize_title_with_dashes("No Entities – Here &"));
- $this->assertEquals("one-two", sanitize_title_with_dashes("One & Two", '', 'save'));
- $this->assertEquals("one-two", sanitize_title_with_dashes("One { Two;", '', 'save'));
- $this->assertEquals("one-two", sanitize_title_with_dashes("One & Two;", '', 'save'));
- $this->assertEquals("one-two", sanitize_title_with_dashes("One Two™;", '', 'save'));
- $this->assertEquals("one-two", sanitize_title_with_dashes("One && Two;", '', 'save'));
- $this->assertEquals("onetwo", sanitize_title_with_dashes("One&Two", '', 'save'));
- $this->assertEquals("onetwo-test", sanitize_title_with_dashes("One&Two Test;", '', 'save'));
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function test_replaces_nbsp() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals("dont-break-the-space", sanitize_title_with_dashes("don't break the space", '', 'save'));
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches40testsphpunittestsformattingSanitizeUserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/formatting/SanitizeUser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/formatting/SanitizeUser.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/formatting/SanitizeUser.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,14 +9,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = is_multisite() ? 'captain awesome' : 'Captain Awesome';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals($expected, sanitize_user($input));
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * @ticket 10823
- */
- function test_strips_entities() {
- $this->assertEquals("ATT", sanitize_user("AT&T"));
- $this->assertEquals("ATT Test;", sanitize_user("AT&T Test;"));
- $this->assertEquals("AT&T Test;", sanitize_user("AT&T Test;"));
- }
</del><span class="cx" style="display: block; padding: 0 10px"> function test_strips_percent_encoded_octets() {
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = is_multisite() ? 'franois' : 'Franois';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, sanitize_user( "Fran%c3%a7ois" ) );
</span></span></pre></div>
<a id="branches40testsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/functions.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/functions.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,37 +132,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 9930
- */
- function test_is_serialized() {
- $cases = array(
- serialize(null),
- serialize(true),
- serialize(false),
- serialize(-25),
- serialize(25),
- serialize(1.1),
- serialize(2.1E+200),
- serialize('this string will be serialized'),
- serialize("a\nb"),
- serialize(array()),
- serialize(array(1,1,2,3,5,8,13)),
- serialize( (object)array('test' => true, '3', 4) )
- );
- foreach ( $cases as $case )
- $this->assertTrue( is_serialized($case), "Serialized data: $case" );
-
- $not_serialized = array(
- 'a string',
- 'garbage:a:0:garbage;',
- 'b:4;',
- 's:4:test;'
- );
- foreach ( $not_serialized as $case )
- $this->assertFalse( is_serialized($case), "Test data: $case" );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @group add_query_arg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_add_query_arg() {
</span></span></pre></div>
<a id="branches40testsphpunittestsmailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/mail.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/mail.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/mail.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,40 +72,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 15448
- */
- function test_wp_mail_plain_and_html() {
- $to = 'user@example.com';
- $subject = 'Test email with plain text and html versions';
- $messages = array( 'text/plain' => 'Here is some plain text.',
- 'text/html' =>'<html><head></head><body>Here is the HTML ;-)<body></html>' );
-
- wp_mail( $to, $subject, $messages );
-
- preg_match( '/boundary="(.*)"/', $GLOBALS['phpmailer']->mock_sent[0]['header'], $matches);
- $boundry = $matches[1];
- $body = '--' . $boundry . '
-Content-Type: text/plain; charset = "UTF-8"
-Content-Transfer-Encoding: 8bit
-
-Here is some plain text.
-
-
---' . $boundry . '
-Content-Type: text/html; charset = "UTF-8"
-Content-Transfer-Encoding: 8bit
-
-<html><head></head><body>Here is the HTML ;-)<body></html>
-
-
-
---' . $boundry . '--
-';
- // We need some better assertions here but these test the behaviour for now.
- $this->assertEquals($body, $GLOBALS['phpmailer']->mock_sent[0]['body']);
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 17305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_mail_rfc2822_addresses() {
</span></span></pre></div>
<a id="branches40testsphpunittestspostfilteringphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/post/filtering.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/post/filtering.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/post/filtering.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,106 +90,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $post->post_content );
</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">- /**
- * make sure unbalanced tags are fixed when they span a --more-- tag
- * @ticket 6297
- */
- function test_post_content_unbalanced_more() {
- $content = <<<EOF
-<em>some text<!--more-->
-that's continued after the jump</em>
-EOF;
-
- $expected = <<<EOF
-<em>some text</em><!--more-->
-that's continued after the jump
-EOF;
-
- $id = $this->factory->post->create( array( 'post_content' => $content ) );
- $post = get_post($id);
-
- $this->assertEquals( $expected, $post->post_content );
- }
-
- /**
- * make sure unbalanced tags are fixed when they span a --nextpage-- tag
- * @ticket 6297
- */
- function test_post_content_unbalanced_nextpage() {
- $content = <<<EOF
-<em>some text<!--nextpage-->
-that's continued after the jump</em>
-EOF;
-
- $expected = <<<EOF
-<em>some text</em><!--nextpage-->
-that's continued after the jump
-EOF;
-
- $id = $this->factory->post->create( array( 'post_content' => $content ) );
- $post = get_post($id);
-
- $this->assertEquals( $expected, $post->post_content );
- }
-
- /**
- * make sure unbalanced tags are fixed when they span both --more-- and --nextpage-- tags (in that order)
- * @ticket 6297
- */
- function test_post_content_unbalanced_more_nextpage() {
- $content = <<<EOF
-<em>some text<!--more-->
-that's continued after the jump</em>
-<!--nextpage-->
-<p>and the next page
-<!--nextpage-->
-breaks the graf</p>
-EOF;
-
- $expected = <<<EOF
-<em>some text</em><!--more-->
-that's continued after the jump
-<!--nextpage-->
-<p>and the next page
-</p><!--nextpage-->
-breaks the graf
-EOF;
-
- $id = $this->factory->post->create( array( 'post_content' => $content ) );
- $post = get_post($id);
-
- $this->assertEquals( $expected, $post->post_content );
- }
-
- /**
- * make sure unbalanced tags are fixed when they span both --nextpage-- and --more-- tags (in that order)
- * @ticket 6297
- */
- function test_post_content_unbalanced_nextpage_more() {
- $content = <<<EOF
-<em>some text<!--nextpage-->
-that's continued after the jump</em>
-<!--more-->
-<p>and the next page
-<!--nextpage-->
-breaks the graf</p>
-EOF;
-
- $expected = <<<EOF
-<em>some text</em><!--nextpage-->
-that's continued after the jump
-<!--more-->
-<p>and the next page
-</p><!--nextpage-->
-breaks the graf
-EOF;
-
- $id = $this->factory->post->create( array( 'post_content' => $content ) );
- $post = get_post($id);
-
- $this->assertEquals( $expected, $post->post_content );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // make sure unbalanced tags are untouched when the balance option is off
</span><span class="cx" style="display: block; padding: 0 10px"> function test_post_content_nobalance_nextpage_more() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches40testsphpunittestspostlistPagesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/post/listPages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/post/listPages.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/post/listPages.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,35 +343,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->AssertEquals( $expected['exclude'], $actual );
</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">- /**
- * @ticket 27326
- */
- function test_wp_list_page_combo_exclude_depth() {
- $args = array(
- 'echo' => false,
- 'exclude' => '3',
- 'depth' => 3
- );
- $expected['exclude_depth'] = '<li class="pagenav">Pages<ul><li class="page_item page-item-1 page_item_has_children"><a href="' . get_permalink( 1 ) . '">Parent 1</a>
-<ul class=\'children\'>
- <li class="page_item page-item-4"><a href="' . get_permalink( 4 ) . '">Child 1</a></li>
- <li class="page_item page-item-5"><a href="' . get_permalink( 5 ) . '">Child 2</a></li>
- <li class="page_item page-item-6"><a href="' . get_permalink( 6 ) . '">Child 3</a></li>
-</ul>
-</li>
-<li class="page_item page-item-2 page_item_has_children"><a href="' . get_permalink( 2 ) . '">Parent 2</a>
-<ul class=\'children\'>
- <li class="page_item page-item-7"><a href="' . get_permalink( 7 ) . '">Child 1</a></li>
- <li class="page_item page-item-8"><a href="' . get_permalink( 8 ) . '">Child 2</a></li>
- <li class="page_item page-item-9"><a href="' . get_permalink( 9 ) . '">Child 3</a></li>
-</ul>
-</li>
-<li class="page_item page-item-10"><a href="' . get_permalink( 10 ) . '">Child 1</a></li>
-<li class="page_item page-item-11"><a href="' . get_permalink( 11 ) . '">Child 2</a></li>
-<li class="page_item page-item-12"><a href="' . get_permalink( 12 ) . '">Child 3</a></li>
-</ul></li>';
- $actual = wp_list_pages( $args );
- $this->AssertEquals( $expected['exclude_depth'], $actual );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches40testsphpunittestspostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/post.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/post.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,61 +740,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 19373
- */
- function test_insert_programmatic_without_current_user_success() {
- $this->_unset_current_user();
-
- register_taxonomy( 'test_tax', 'post' );
-
- $title = rand_str();
- $post_data = array(
- 'post_author' => $this->author_id,
- 'post_status' => 'public',
- 'post_content' => rand_str(),
- 'post_title' => $title,
- 'tax_input' => array(
- 'test_tax' => array( 'term', 'term2', 'term3' )
- )
- );
- // with sanitize set to false
- $insert_post_id = wp_insert_post( $post_data, true, false );
-
- $post = get_post( $insert_post_id );
- $this->assertEquals( $post->post_author, $this->author_id );
- $this->assertEquals( $post->post_title, $title );
-
- $terms = wp_get_object_terms( $insert_post_id, 'test_tax' );
- $this->assertTrue( ( is_array( $terms ) && count( $terms ) == 3 ) );
- }
-
- /**
- * @ticket 19373
- */
- function test_insert_programmatic_without_current_user_fail() {
- $this->_unset_current_user();
-
- register_taxonomy( 'test_tax', 'post' );
-
- $title = rand_str();
- $post_data = array(
- // post_author not set
- 'post_status' => 'public',
- 'post_content' => rand_str(),
- 'post_title' => $title,
- 'tax_input' => array(
- 'test_tax' => array( 'term', 'term2', 'term3' )
- )
- );
- // with sanitize set to false
- $insert_post_id = wp_insert_post( $post_data, true, false );
-
- // should error because no default user exists and no post author is passed in
- $this->assertInstanceOf( 'WP_Error', $insert_post_id );
- $this->assertEquals( 'empty_author', $insert_post_id->get_error_code() );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24803
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_count_posts() {
</span></span></pre></div>
<a id="branches40testsphpunittestsqueryresultsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/query/results.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/query/results.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/query/results.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,30 +279,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 18897
- */
- function test_query_offset_and_paged() {
- $posts = $this->q->query('paged=2&offset=3');
-
- $expected = array (
- 0 => 'many-trackbacks',
- 1 => 'one-trackback',
- 2 => 'comment-test',
- 3 => 'lorem-ipsum',
- 4 => 'cat-c',
- 5 => 'cat-b',
- 6 => 'cat-a',
- 7 => 'cats-a-and-c',
- 8 => 'cats-b-and-c',
- 9 => 'cats-a-and-b',
- );
-
- $this->assertCount( 10, $posts );
- $this->assertTrue( $this->q->is_paged() );
- $this->assertEquals( $expected, wp_list_pluck( $posts, 'post_name' ) );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11056
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_query_post_parent__in() {
</span></span></pre></div>
<a id="branches40testsphpunittestsshortcodephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/shortcode.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/shortcode.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/shortcode.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,16 +308,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 14050
- */
- function test_multiple_shortcode_unautop() {
- // a blank line is added at the end, so test with it already there
- $test_string = "[footag]\n[footag]\n";
- $actual = shortcode_unautop( wpautop( $test_string ) );
- $this->assertEquals( $test_string, $actual );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 10326
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_strip_shortcodes() {
</span></span></pre></div>
<a id="branches40testsphpunitteststaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/taxonomy.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/taxonomy.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,22 +33,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_get_the_taxonomies() {
- $post_id = $this->factory->post->create();
-
- $taxes = get_the_taxonomies( $post_id );
- $this->assertNotEmpty( $taxes );
- $this->assertEquals( array( 'category' ), array_keys( $taxes ) );
-
- $id = $this->factory->tag->create();
- wp_set_post_tags( $post_id, array( $id ) );
-
- $taxes = get_the_taxonomies( $post_id );
- $this->assertNotEmpty( $taxes );
- $this->assertCount( 2, $taxes );
- $this->assertEquals( array( 'category', 'post_tag' ), array_keys( $taxes ) );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function test_the_taxonomies() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,54 +119,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 11058
- */
- function test_registering_taxonomies_to_object_types() {
- // Create a taxonomy to test with
- $tax = 'test_tax';
- $this->assertFalse( taxonomy_exists($tax) );
- register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
-
- // Create a post type to test with
- $post_type = 'test_cpt';
- $this->assertFalse( get_post_type( $post_type ) );
- $this->assertObjectHasAttribute( 'name', register_post_type( $post_type ) );
-
- // Core taxonomy, core post type
- $this->assertTrue( unregister_taxonomy_for_object_type( 'category', 'post' ) );
- $this->assertFalse( unregister_taxonomy_for_object_type( 'category', 'post' ) );
- $this->assertTrue( register_taxonomy_for_object_type( 'category', 'post' ) );
-
- // Core taxonomy, non-core post type
- $this->assertTrue( register_taxonomy_for_object_type( 'category', $post_type ) );
- $this->assertTrue( unregister_taxonomy_for_object_type( 'category', $post_type ) );
- $this->assertFalse( unregister_taxonomy_for_object_type( 'category', $post_type ) );
- $this->assertTrue( register_taxonomy_for_object_type( 'category', $post_type ) );
-
- // Core taxonomies, non-post object types
- $this->assertFalse( register_taxonomy_for_object_type( 'category', 'user' ) );
- $this->assertFalse( unregister_taxonomy_for_object_type( 'category', 'user' ) );
-
- // Non-core taxonomy, core post type
- $this->assertTrue( unregister_taxonomy_for_object_type( $tax, 'post' ) );
- $this->assertFalse( unregister_taxonomy_for_object_type( $tax, 'post' ) );
- $this->assertTrue( register_taxonomy_for_object_type( $tax, 'post' ) );
-
- // Non-core taxonomy, non-core post type
- $this->assertTrue( register_taxonomy_for_object_type( $tax, $post_type ) );
- $this->assertTrue( unregister_taxonomy_for_object_type( $tax, $post_type ) );
- $this->assertFalse( unregister_taxonomy_for_object_type( $tax, $post_type ) );
- $this->assertTrue( register_taxonomy_for_object_type( $tax, $post_type ) );
-
- // Non-core taxonomies, non-post object types
- $this->assertFalse( register_taxonomy_for_object_type( $tax, 'user' ) );
- $this->assertFalse( unregister_taxonomy_for_object_type( $tax, 'user' ) );
-
- unset($GLOBALS['wp_taxonomies'][$tax]);
- _unregister_post_type( $post_type );
-
- }
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25706
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_in_category() {
</span></span></pre></div>
<a id="branches40testsphpunittestsxmlrpcwpuploadFilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/xmlrpc/wp/uploadFile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/xmlrpc/wp/uploadFile.php 2019-03-25 17:07:12 UTC (rev 45012)
+++ branches/4.0/tests/phpunit/tests/xmlrpc/wp/uploadFile.php 2019-03-26 00:45:57 UTC (rev 45013)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,30 +29,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'string', $result['type'] );
</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">- /**
- * @ticket 21292
- */
- function test_network_limit() {
- $this->make_user_by_role( 'editor' );
-
- update_option( 'blog_upload_space', 0.1 );
-
- // create attachment
- $filename = ( DIR_TESTDATA . '/images/canola.jpg' );
- $contents = file_get_contents( $filename );
- $data = array(
- 'name' => 'canola.jpg',
- 'type' => 'image/jpeg',
- 'bits' => $contents
- );
-
- $result = $this->myxmlrpcserver->mw_newMediaObject( array( 0, 'editor', 'editor', $data ) );
-
- // Only multisite should have a limit
- if ( is_multisite() )
- $this->assertInstanceOf( 'IXR_Error', $result );
- else
- $this->assertNotInstanceOf( 'IXR_Error', $result );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>