Changeset 40450 for branches/4.0

Timestamp:

04/15/2017 09:00:54 PM (8 years ago)

Author:

johnbillion

Message:

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 #30284.

Merges [30282] to the 4.0 branch.

See #40463

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/canonical.php (modified) (5 diffs)
• tests/phpunit/tests/canonical/customRules.php (modified) (1 diff)
• tests/phpunit/tests/canonical/permalinkFormats.php (deleted)

branches/4.0/tests/phpunit/tests/canonical.php

@@ -181 +181 @@
             array( '/category/uncategorized/?paged=2', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ) ),
             array( '/category/uncategorized/?paged=2&category_name=uncategorized', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ), 17174 ),
-            array( '/category/child-1/', '/category/parent/child-1/', 18734 ),
-            array( '/category/foo/child-1/', '/category/parent/child-1/', 18734 ),
 
             // Categories & Intersections with other vars
@@ -192 +190 @@
 
             // Categories with Dates
-            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 ),
+            array( '/2008/04/?cat=1', array( 'url' => '/2008/04/?cat=1', 'qv' => array('cat' => '1', 'year' => '2008', 'monthnum' => '04' ) ), 17661 ),
 //          array( '/2008/?category_name=cat-a', array( 'url' => '/2008/?category_name=cat-a', 'qv' => array('category_name' => 'cat-a', 'year' => '2008' ) ) ),
-            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 ),
 
             // Pages
-            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 ),
             array( '/child-page-1/', '/parent-page/child-page-1/'),
             array( '/?page_id=144', '/parent-page/child-page-1/'),
@@ -222 +213 @@
 
             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 ?!
-            array( '/2008/09/03/images-test/8/', '/2008/09/03/images-test/4/', 11694 ), // post with 4 pages
             array( '/2008/09/03/images-test/?page=3', '/2008/09/03/images-test/3/' ),
             array( '/2008/09/03/images-te?page=3', '/2008/09/03/images-test/3/' ),
@@ -228 +218 @@
             // Comments
             array( '/2008/03/03/comment-test/?cpage=2', '/2008/03/03/comment-test/comment-page-2/' ),
-            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
 
             // Attachments
@@ -252 +240 @@
             array( '/?author=%d', '/author/canonical-author/' ),
 //          array( '/?author=%d&year=2008', '/2008/?author=3'),
-            array( '/?author=%d&year=2008', '/author/canonical-author/?year=2008', 17661 ),
 //          array( '/author/canonical-author/?year=2008', '/2008/?author=3'), //Either or, see previous testcase.
-            array( '/author/canonical-author/?year=2008', '/author/canonical-author/?year=2008', 17661 ),
 
             // Feeds

branches/4.0/tests/phpunit/tests/canonical/customRules.php

@@ -30 +30 @@
             array( '/ccr/uncategorized/sort/asc/', array( 'url' => '/ccr/uncategorized/sort/asc/', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'asc' ) ) ),
             array( '/ccr/uncategorized/sort/desc/', array( 'url' => '/ccr/uncategorized/sort/desc/', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'desc' ) ) ),
-            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 ),
         );
     }