From a8e76ea8f95e538efdb7150b47301bf2fe536868 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Mon, 11 Nov 2013 18:57:11 +0000 Subject: [PATCH] Set the `page_comments` option to `true` in `Tests_Canonical` to properly check canonical redirection for paged comments. By doing so, one assertion tied to #20388 no longer needs to be. See #20388, 25913. git-svn-id: https://develop.svn.wordpress.org/trunk@26091 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/canonical.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/tests/canonical.php b/tests/phpunit/tests/canonical.php index 48fbab5baa..af073595c4 100644 --- a/tests/phpunit/tests/canonical.php +++ b/tests/phpunit/tests/canonical.php @@ -21,6 +21,7 @@ class Tests_Canonical extends WP_UnitTestCase { function setUp() { parent::setUp(); + update_option( 'page_comments', true ); update_option( 'comments_per_page', 5 ); update_option( 'posts_per_page', 5 ); @@ -220,7 +221,7 @@ class Tests_Canonical extends WP_UnitTestCase { array( '/2008/09/03/images-te?page=3', '/2008/09/03/images-test/3/' ), // Comments - array( '/2008/03/03/comment-test/?cpage=2', '/2008/03/03/comment-test/comment-page-2/', 20388 ), + 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