<!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>[40450] branches/4.0: Remove failing unit tests from 'canonical' group.</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/40450">40450</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/40450","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>2017-04-15 21:00:54 +0000 (Sat, 15 Apr 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'>Remove failing unit tests from 'canonical' group.
Each removed test has been turned into a patch and posted to the open ticket
that it belongs to.
See <a href="https://core.trac.wordpress.org/ticket/30284">#30284</a>.
Merges <a href="https://core.trac.wordpress.org/changeset/30282">[30282]</a> to the 4.0 branch.
See <a href="https://core.trac.wordpress.org/ticket/40463">#40463</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches40testsphpunittestscanonicalcustomRulesphp">branches/4.0/tests/phpunit/tests/canonical/customRules.php</a></li>
<li><a href="#branches40testsphpunittestscanonicalphp">branches/4.0/tests/phpunit/tests/canonical.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branches40testsphpunittestscanonicalpermalinkFormatsphp">branches/4.0/tests/phpunit/tests/canonical/permalinkFormats.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 2017-04-15 20:19:49 UTC (rev 40449)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.0 2017-04-15 21:00:54 UTC (rev 40450)
</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.2:33499
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.3:39765
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.6:38615
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,29723-29725,29727,29730,29733,29738,29745-29746,29751,29755,29765-29766,29777,29783,29829,29884,29886,29979,30090,30185,30242,30263-30264,30378,30401,30412,30417,30422,30425,30430,30435,30438,30443,30458,30466,31258-31259,33124,33142,33374,36083,36435,37651,38524,39645,39659,39759,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40241
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,29723-29725,29727,29730,29733,29738,29745-29746,29751,29755,29765-29766,29777,29783,29829,29884,29886,29979,30090,30185,30242,30263-30264,30282,30378,30401,30412,30417,30422,30425,30430,30435,30438,30443,30458,30466,31258-31259,33124,33142,33374,36083,36435,37651,38524,39645,39659,39759,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40241
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches40testsphpunittestscanonicalcustomRulesphp"></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/customRules.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/canonical/customRules.php 2017-04-15 20:19:49 UTC (rev 40449)
+++ branches/4.0/tests/phpunit/tests/canonical/customRules.php 2017-04-15 21:00:54 UTC (rev 40450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Custom Rewrite rules leading to Categories
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/ccr/uncategorized/sort/asc/', array( 'url' => '/ccr/uncategorized/sort/asc/', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'asc' ) ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/ccr/uncategorized/sort/desc/', array( 'url' => '/ccr/uncategorized/sort/desc/', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'desc' ) ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '/ccr/uncategorized/sort/desc/?year=2008', array( 'url' => '/ccr/uncategorized/sort/desc/?year=2008', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'desc', 'year' => '2008' ) ), 17661 ),
</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></pre></div>
<a id="branches40testsphpunittestscanonicalpermalinkFormatsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/4.0/tests/phpunit/tests/canonical/permalinkFormats.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/canonical/permalinkFormats.php 2017-04-15 20:19:49 UTC (rev 40449)
+++ branches/4.0/tests/phpunit/tests/canonical/permalinkFormats.php 2017-04-15 21:00:54 UTC (rev 40450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,80 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * @group canonical
- * @group rewrite
- * @group query
- */
-class Tests_Canonical_PermalinkFormat extends WP_UnitTestCase {
-
- /**
- * @ticket 21167
- */
- public function test_dotted_formats() {
- global $wp_rewrite;
-
- // Create a sample post
- $cat_id = $this->factory->term->create( array(
- 'name' => 'permalink-test',
- 'taxonomy' => 'category'
- ) );
- $user_id = $this->factory->user->create( array(
- 'role' => 'editor',
- 'user_login' => 'permalink_user',
- ) );
- $post_id = $this->factory->post->create( array(
- 'post_title' => 'lorem-ipsum',
- 'post_date' => '2012-08-02 14:15:05',
- 'post_author' => $user_id,
- 'category' => $cat_id
- ) );
- wp_set_post_categories( $post_id, array( $cat_id ) );
-
- // Sample permalinks
- $tests = array(
- '/%postname%.%post_id%/ ' => array(
- 'regex' => '([^/]+)\.([0-9]+)(/[0-9]+)?/?$',
- 'url' => 'index.php?name=$1&p=$2&page=$3'
- ),
- '/%year%.%monthnum%.%postname%/' => array(
- 'regex' => '([0-9]{4})\.([0-9]{1,2})\.([^/]+)(/[0-9]+)?/?$',
- 'url' => 'index.php?year=$1&monthnum=$2&name=$3&page=$4'
- ),
- '/%post_id%.%postname%/' => array(
- 'regex' => '([0-9]+)\.([^/]+)(/[0-9]+)?/?$',
- 'url' => 'index.php?p=$1&name=$2&page=$3'
- ),
- '/%postname%.%year%/' => array(
- 'regex' => '([^/]+)\.([0-9]{4})(/[0-9]+)?/?$',
- 'url' => 'index.php?name=$1&year=$2&page=$3'
- ),
- '/$%postname%$/' => array(
- 'regex' => '\$([^/]+)\$(/[0-9]+)?/?$',
- 'url' => 'index.php?name=$1&page=$2'
- ),
- '%year%.+?%monthnum%.+?%day%.+?%hour%.+?%minute%.+?%second%.+?%post_id%.+?%postname%.+?%category%.+?%author%.+?' => array(
- 'regex' => '([0-9]{4})\.\+\?([0-9]{1,2})\.\+\?([0-9]{1,2})\.\+\?([0-9]{1,2})\.\+\?([0-9]{1,2})\.\+\?([0-9]{1,2})\.\+\?([0-9]+)\.\+\?([^/]+)\.\+\?%category%\.\+\?([^/]+)\.\+\?(/[0-9]+)?/?$',
- 'url' => 'index.php?year=$1&monthnum=$2&day=$3&hour=$4&minute=$5&second=$6&p=$7&name=$8&%category%$9&author_name=$10&page=$11'
- ),
- );
-
- // Test permalinks
- foreach ( $tests as $permalink_format => $expected ) {
- update_option( 'permalink_structure', $permalink_format );
-
- // Get the rewrite rules
- $rules = $wp_rewrite->generate_rewrite_rules( get_option( 'permalink_structure' ), EP_PERMALINK, false, false, false, false );
-
- // Filter out only the post rewrite rule
- foreach ( $rules as $regex => $url ) {
- if ( false === strpos( $url, 'attachment=$' ) && false === strpos( $url, 'tb=' ) && false === strpos( $url, 'cpage=$' ) ) {
- break;
- }
- }
-
- // Test that expected === actual
- $this->assertEquals( $regex, $expected['regex'], "Problem with permalink format: $permalink_format" );
- $this->assertEquals( $url, $expected['url'], "Problem with permalink format: $permalink_format" );
- }
- }
-}
</del></span></pre></div>
<a id="branches40testsphpunittestscanonicalphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/canonical.php 2017-04-15 20:19:49 UTC (rev 40449)
+++ branches/4.0/tests/phpunit/tests/canonical.php 2017-04-15 21:00:54 UTC (rev 40450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,8 +180,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/category/uncategorized/page/2/', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/category/uncategorized/?paged=2', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/category/uncategorized/?paged=2&category_name=uncategorized', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ), 17174 ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '/category/child-1/', '/category/parent/child-1/', 18734 ),
- array( '/category/foo/child-1/', '/category/parent/child-1/', 18734 ),
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Categories & Intersections with other vars
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/category/uncategorized/?tag=post-formats', array( 'url' => '/category/uncategorized/?tag=post-formats', 'qv' => array('category_name' => 'uncategorized', 'tag' => 'post-formats') ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,17 +189,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/category/cat-a/page/1/?test=one%20two', '/category/cat-a/?test=one%20two', 18086), // Extra query vars should stay encoded
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Categories with Dates
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '/category/uncategorized/?paged=2&year=2008', array( 'url' => '/category/uncategorized/page/2/?year=2008', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2, 'year' => 2008) ), 17661 ),
-// array( '/2008/04/?cat=1', array( 'url' => '/2008/04/?cat=1', 'qv' => array('cat' => '1', 'year' => '2008', 'monthnum' => '04' ) ), 17661 ),
- array( '/2008/04/?cat=1', array( 'url' => '/category/uncategorized/?year=2008&monthnum=04', 'qv' => array('category_name' => 'uncategorized', 'year' => '2008', 'monthnum' => '04' ) ), 17661 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( '/2008/04/?cat=1', array( 'url' => '/2008/04/?cat=1', 'qv' => array('cat' => '1', 'year' => '2008', 'monthnum' => '04' ) ), 17661 ),
</ins><span class="cx" style="display: block; padding: 0 10px"> // array( '/2008/?category_name=cat-a', array( 'url' => '/2008/?category_name=cat-a', 'qv' => array('category_name' => 'cat-a', 'year' => '2008' ) ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '/2008/?category_name=cat-a', array( 'url' => '/category/cat-a/?year=2008', 'qv' => array('category_name' => 'cat-a', 'year' => '2008' ) ), 20386 ),
-// array( '/category/uncategorized/?year=2008', array( 'url' => '/2008/?category_name=uncategorized', 'qv' => array('category_name' => 'uncategorized', 'year' => '2008' ) ), 17661 ),
- array( '/category/uncategorized/?year=2008', array( 'url' => '/category/uncategorized/?year=2008', 'qv' => array('category_name' => 'uncategorized', 'year' => '2008' ) ), 17661 ),
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Pages
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '/sample%20page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 17653 ), // Page rules always set 'page'
- array( '/sample------page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 14773 ),
</del><span class="cx" style="display: block; padding: 0 10px"> array( '/child-page-1/', '/parent-page/child-page-1/'),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/?page_id=144', '/parent-page/child-page-1/'),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/abo', '/about/' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,14 +212,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/2008/09/03/images-test/3/', array( 'url' => '/2008/09/03/images-test/3/', 'qv' => array( 'name' => 'images-test', 'year' => '2008', 'monthnum' => '09', 'day' => '03', 'page' => '/3' ) ) ), // page = /3 ?!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '/2008/09/03/images-test/8/', '/2008/09/03/images-test/4/', 11694 ), // post with 4 pages
</del><span class="cx" style="display: block; padding: 0 10px"> array( '/2008/09/03/images-test/?page=3', '/2008/09/03/images-test/3/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/2008/09/03/images-te?page=3', '/2008/09/03/images-test/3/' ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Comments
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/2008/03/03/comment-test/?cpage=2', '/2008/03/03/comment-test/comment-page-2/' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '/2008/03/03/comment-test/comment-page-20/', '/2008/03/03/comment-test/comment-page-3/', 20388 ), // there's only 3 pages
- array( '/2008/03/03/comment-test/?cpage=30', '/2008/03/03/comment-test/comment-page-3/', 20388 ), // there's only 3 pages
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Attachments
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/?attachment_id=611', '/2008/06/10/post-format-test-gallery/canola2/' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,9 +239,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Authors
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/?author=%d', '/author/canonical-author/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> // array( '/?author=%d&year=2008', '/2008/?author=3'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '/?author=%d&year=2008', '/author/canonical-author/?year=2008', 17661 ),
</del><span class="cx" style="display: block; padding: 0 10px"> // array( '/author/canonical-author/?year=2008', '/2008/?author=3'), //Either or, see previous testcase.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '/author/canonical-author/?year=2008', '/author/canonical-author/?year=2008', 17661 ),
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Feeds
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/?feed=atom', '/feed/atom/' ),
</span></span></pre>
</div>
</div>
</body>
</html>