Changeset 37075 for trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php

Timestamp:

03/23/2016 09:53:44 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Canonical / Query: Restore the is_404() check in wp_old_slug_redirect() which was removed in [34659].
This reverts part of [34659] due to excessive canonical problems it's caused in 4.4.x.

Remove the unit tests which are no longer supported.
This also removes the is_feed() code to avoid confusion - only pages & embeds will be redirected.

Merges [36280] and [36281] to trunk.

Props dd32.
See #21602, #35344.

File:

• trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php (modified) (1 diff)

trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php

@@ -45 +45 @@
 
         $permalink = user_trailingslashit( get_permalink( $this->post_id ) );
-
-        $this->go_to( $old_permalink );
-        wp_old_slug_redirect();
-        $this->assertEquals( $permalink, $this->old_slug_redirect_url );
-    }
-
-    public function test_old_slug_redirect_endpoint() {
-        $old_permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'custom-endpoint' );
-
-        wp_update_post( array(
-            'ID' => $this->post_id,
-            'post_name' => 'bar-baz',
-        ) );
-
-        $permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'custom-endpoint' );
-
-        $this->go_to( $old_permalink );
-        $GLOBALS['wp_query']->query_vars['custom-endpoint'] = true;
-        wp_old_slug_redirect();
-        $this->assertEquals( $permalink, $this->old_slug_redirect_url );
-    }
-
-    public function test_old_slug_redirect_endpoint_custom_query_var() {
-        $old_permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'second-endpoint' );
-
-        wp_update_post( array(
-            'ID' => $this->post_id,
-            'post_name' => 'bar-baz',
-        ) );
-
-        $permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'second-endpoint' );
-
-        $this->go_to( $old_permalink );
-        $GLOBALS['wp_query']->query_vars['custom'] = true;
-        wp_old_slug_redirect();
-        $this->assertEquals( $permalink, $this->old_slug_redirect_url );
-    }
-
-    public function test_old_slug_redirect_feed() {
-        $old_permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'feed' );
-
-        wp_update_post( array(
-            'ID' => $this->post_id,
-            'post_name' => 'bar-baz',
-        ) );
-
-        $permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'feed' );
 
         $this->go_to( $old_permalink );