vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-04 04:34:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests: Permalink Structures Phase II: DRY up logic for setting permalink structures in test methods.

Browse Source 
Renames `reset_permalinks()` to `set_permalink_structure()` (mimicking `$wp_rewrite->set_permalink_structure()`) and allows it to accept an optional permalink structure. In this way, we can double dip using it to both set and reset the permalink structure from anywhere.

Removes alot of duplicated code from tests.

See #33968.


git-svn-id: https://develop.svn.wordpress.org/trunk@34810 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Drew Jaynes
2015-10-03 20:54:11 +00:00
parent eebe549408
commit 0ea2acb720
15 changed files with 82 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
tests/phpunit/tests/admin/includesPost.php
View File

@@ -251,11 +251,8 @@ class Tests_Admin_includesPost extends WP_UnitTestCase {
* @ticket 30910
*/
public function test_get_sample_permalink_should_return_pretty_permalink_for_posts_with_post_status_future() {
global $wp_rewrite;
$permalink_structure = '%postname%';
$wp_rewrite->set_permalink_structure( "/$permalink_structure/" );
flush_rewrite_rules();
$this->set_permalink_structure( "/$permalink_structure/" );
$future_date = date( 'Y-m-d H:i:s', time() + 100 );
$p = $this->factory->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
@@ -285,10 +282,7 @@ class Tests_Admin_includesPost extends WP_UnitTestCase {
* @ticket 18306
*/
public function test_get_sample_permalink_html_should_use_pretty_permalink_for_view_post_link_when_pretty_permalinks_are_enabled() {
global $wp_rewrite;
$permalink_structure = '%postname%';
$wp_rewrite->set_permalink_structure( "/$permalink_structure/" );
flush_rewrite_rules();
$this->set_permalink_structure( '/%postname%/' );
wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
@@ -305,10 +299,7 @@ class Tests_Admin_includesPost extends WP_UnitTestCase {
* @ticket 18306
*/
public function test_get_sample_permalink_html_should_use_correct_permalink_for_view_post_link_when_changing_slug() {
global $wp_rewrite;
$permalink_structure = '%postname%';
$wp_rewrite->set_permalink_structure( "/$permalink_structure/" );
flush_rewrite_rules();
$this->set_permalink_structure( '/%postname%/' );
wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
@@ -346,10 +337,7 @@ class Tests_Admin_includesPost extends WP_UnitTestCase {
* @ticket 5305
*/
public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_year_archives() {
global $wp_rewrite;
$wp_rewrite->init();
$wp_rewrite->set_permalink_structure( '/%postname%/' );
$wp_rewrite->flush_rules();
$this->set_permalink_structure( '/%postname%/' );
$p = $this->factory->post->create( array(
'post_name' => '2015',
@@ -363,10 +351,7 @@ class Tests_Admin_includesPost extends WP_UnitTestCase {
* @ticket 5305
*/
public function test_get_sample_permalink_should_allow_yearlike_slugs_if_permastruct_does_not_cause_an_archive_conflict() {
global $wp_rewrite;
$wp_rewrite->init();
$wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
$wp_rewrite->flush_rules();
$this->set_permalink_structure( '/%year%/%postname%/' );
$p = $this->factory->post->create( array(
'post_name' => '2015',
@@ -380,10 +365,7 @@ class Tests_Admin_includesPost extends WP_UnitTestCase {
* @ticket 5305
*/
public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_month_archives() {
global $wp_rewrite;
$wp_rewrite->init();
$wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
$wp_rewrite->flush_rules();
$this->set_permalink_structure( '/%year%/%postname%/' );
$p = $this->factory->post->create( array(
'post_name' => '11',
@@ -397,10 +379,7 @@ class Tests_Admin_includesPost extends WP_UnitTestCase {
* @ticket 5305
*/
public function test_get_sample_permalink_should_ignore_potential_month_conflicts_for_invalid_monthnum() {
global $wp_rewrite;
$wp_rewrite->init();
$wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
$wp_rewrite->flush_rules();
$this->set_permalink_structure( '/%year%/%postname%/' );
$p = $this->factory->post->create( array(
'post_name' => '13',
@@ -414,10 +393,7 @@ class Tests_Admin_includesPost extends WP_UnitTestCase {
* @ticket 5305
*/
public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_day_archives() {
global $wp_rewrite;
$wp_rewrite->init();
$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
$wp_rewrite->flush_rules();
$this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
$p = $this->factory->post->create( array(
'post_name' => '30',
@@ -431,10 +407,7 @@ class Tests_Admin_includesPost extends WP_UnitTestCase {
* @ticket 5305
*/
public function test_get_sample_permalink_should_iterate_slug_suffix_when_a_date_conflict_is_found() {
global $wp_rewrite;
$wp_rewrite->init();
$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
$wp_rewrite->flush_rules();
$this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
$this->factory->post->create( array(
'post_name' => '30-2',
@@ -452,10 +425,7 @@ class Tests_Admin_includesPost extends WP_UnitTestCase {
* @ticket 5305
*/
public function test_get_sample_permalink_should_ignore_potential_day_conflicts_for_invalid_day() {
global $wp_rewrite;
$wp_rewrite->init();
$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
$wp_rewrite->flush_rules();
$this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
$p = $this->factory->post->create( array(
'post_name' => '32',
@@ -469,10 +439,7 @@ class Tests_Admin_includesPost extends WP_UnitTestCase {
* @ticket 5305
*/
public function test_get_sample_permalink_should_allow_daylike_slugs_if_permastruct_does_not_cause_an_archive_conflict() {
global $wp_rewrite;
$wp_rewrite->init();
$wp_rewrite->set_permalink_structure( '/%year%/%month%/%day%/%postname%/' );
$wp_rewrite->flush_rules();
$this->set_permalink_structure( '/%year%/%month%/%day%/%postname%/' );
$p = $this->factory->post->create( array(
'post_name' => '30',