Changeset 35191

Timestamp:

10/15/2015 05:50:40 AM (9 years ago)

Author:

wonderboymusic

Message:

Unit Tests: after [35186], "upgrade" the Canonical fixtures.

See #30017, #33968.

Location:

trunk/tests/phpunit

Files:

• includes/testcase-canonical.php (modified) (4 diffs)
• tests/canonical.php (modified) (1 diff)
• tests/canonical/noRewrite.php (modified) (2 diffs)
• tests/canonical/pageOnFront.php (modified) (2 diffs)

trunk/tests/phpunit/includes/testcase-canonical.php

@@ -39 +39 @@
      * @since 4.1.0
      */
-    public static function generate_shared_fixtures() {
-        global $wp_rewrite;
-
-        $factory = new WP_UnitTest_Factory;
-
+    public static function generate_shared_fixtures( $factory ) {
         self::$old_current_user = get_current_user_id();
         self::$author_id = $factory->user->create( array( 'user_login' => 'canonical-author' ) );
@@ -131 +127 @@
         $tag1 = $factory->term->create( array( 'name' => 'post-formats' ) );
         self::$term_ids[ $tag1 ] = 'post_tag';
-
-        self::commit_transaction();
     }
 
@@ -141 +135 @@
      */
     public static function delete_shared_fixtures() {
-        global $wp_rewrite;
-
         if ( is_multisite() ) {
             wpmu_delete_user( self::$author_id );
@@ -166 +158 @@
         self::$term_ids = array();
         self::$terms = array();
-
-        self::commit_transaction();
     }
 

trunk/tests/phpunit/tests/canonical.php

@@ -10 +10 @@
  */
 class Tests_Canonical extends WP_Canonical_UnitTestCase {
-    public static function setUpBeforeClass() {
-        self::generate_shared_fixtures();
+    public static function wpSetUpBeforeClass( $factory ) {
+        self::generate_shared_fixtures( $factory );
     }
 
-    public static function tearDownAfterClass() {
+    public static function wpTearDownAfterClass() {
         self::delete_shared_fixtures();
     }

trunk/tests/phpunit/tests/canonical/noRewrite.php

@@ -11 +11 @@
 
     // These test cases are run against the test handler in WP_Canonical
-    public static function setUpBeforeClass() {
-        self::generate_shared_fixtures();
+    public static function wpSetUpBeforeClass( $factory ) {
+        self::generate_shared_fixtures( $factory );
     }
 
-    public static function tearDownAfterClass() {
+    public static function wpTearDownAfterClass() {
         self::delete_shared_fixtures();
     }
@@ -27 +27 @@
         $wp_rewrite->set_permalink_structure( '' );
         $wp_rewrite->flush_rules();
-        $wp_rewrite->init();
     }
 

trunk/tests/phpunit/tests/canonical/pageOnFront.php

@@ -7 +7 @@
  */
 class Tests_Canonical_PageOnFront extends WP_Canonical_UnitTestCase {
-    public static function setUpBeforeClass() {
-        self::generate_shared_fixtures();
+    public static function wpSetUpBeforeClass( $factory ) {
+        self::generate_shared_fixtures( $factory );
     }
 
-    public static function tearDownAfterClass() {
+    public static function wpTearDownAfterClass() {
         self::delete_shared_fixtures();
     }
@@ -17 +17 @@
     function setUp() {
         parent::setUp();
-        global $wp_rewrite;
+
         update_option( 'show_on_front', 'page' );
         update_option( 'page_for_posts', $this->factory->post->create( array( 'post_title' => 'blog-page', 'post_type' => 'page' ) ) );
         update_option( 'page_on_front', $this->factory->post->create( array( 'post_title' => 'front-page', 'post_type' => 'page' ) ) );
-        $wp_rewrite->init();
-        $wp_rewrite->flush_rules();
-    }
-
-    function tearDown() {
-        global $wp_rewrite;
-        $wp_rewrite->init();
-        parent::tearDown();
     }