Changeset 35256

Timestamp:

10/18/2015 01:34:29 AM (9 years ago)

Author:

johnbillion

Message:

Move the test_is_home_should_be_false_when_visiting_custom_endpoint_without_a_registered_query_var_and_page_on_front_is_set() test into a more appropriate place.

See #25143

Location:

trunk/tests/phpunit/tests

Files:

• rewrite.php (modified) (1 diff)
• rewrite/addRewriteEndpoint.php (modified) (1 diff)

trunk/tests/phpunit/tests/rewrite.php

@@ -291 +291 @@
 
     /**
-     * @ticket 25143
-     */
-    public function test_is_home_should_be_false_when_visiting_custom_endpoint_without_a_registered_query_var_and_page_on_front_is_set() {
-
-        $page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
-        update_option( 'show_on_front', 'page' );
-        update_option( 'page_on_front', $page_id );
-
-        add_rewrite_endpoint( 'test', EP_ALL, false );
-        flush_rewrite_rules();
-
-        $this->go_to( home_url( '/test/1' ) );
-
-        $this->assertQueryTrue( 'is_front_page', 'is_page', 'is_singular' );
-        $this->assertFalse( is_home() );
-    }
-
-    /**
      * @ticket 21970
      */

trunk/tests/phpunit/tests/rewrite/addRewriteEndpoint.php

@@ -48 +48 @@
         $this->assertSame( $qvs, $GLOBALS['wp']->public_query_vars );
     }
+
+    /**
+     * @ticket 25143
+     */
+    public function test_is_home_should_be_false_when_visiting_custom_endpoint_without_a_registered_query_var_and_page_on_front_is_set() {
+
+        $page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
+        update_option( 'show_on_front', 'page' );
+        update_option( 'page_on_front', $page_id );
+
+        add_rewrite_endpoint( 'test', EP_ALL, false );
+        flush_rewrite_rules();
+
+        $this->go_to( home_url( '/test/1' ) );
+
+        $this->assertQueryTrue( 'is_front_page', 'is_page', 'is_singular' );
+        $this->assertFalse( is_home() );
+    }
 }