Changeset 50606 for branches/5.2/tests/phpunit/tests/admin/includesPlugin.php

Timestamp:

03/26/2021 08:02:01 PM (4 years ago)

Author:

desrosj

Message:

Build/Test Tools: Backport GitHub Action and build improvements to the 5.2 branch.

This backports several build and test tool improvements to the 5.2 branch. Most notably, this includes:

• The changes required to allow each workflow to be triggered by the workflow_dispatch event so that tests can be run on a schedule [50590].
• The ability to run PHPUnit tests from src instead of build [50441-50443].
• Splitting single site and multisite tests into parallel jobs [50379].
• Split slow tests into separate, parallel jobs for PHP 5.6 [50444].
• Better branch and path scoping for GitHub Action workflows when running on pull_request [50432,50479].
• Several devDependency updates.

Merges [50267,50299,50379,50387,50413,50416,50432,50435-50436,50441-50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50598] to the 5.2 branch.
See #50401, #51734, #51801, #51802, #52548, #52608, #52612, #52623, #52624, #52625, #52645, #52653, #52658, #52660, #52667.

Location:

branches/5.2

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/admin/includesPlugin.php (modified) (10 diffs)

branches/5.2/tests/phpunit/tests/admin/includesPlugin.php

@@ -5 +5 @@
  */
 class Tests_Admin_includesPlugin extends WP_UnitTestCase {
+    public static function wpSetUpBeforeClass( $factory ) {
+        self::_back_up_mu_plugins();
+    }
+
+    public static function wpTearDownAfterClass() {
+        self::_restore_mu_plugins();
+    }
+
     function test_get_plugin_data() {
         $data = get_plugin_data( DIR_TESTDATA . '/plugins/hello.php' );
@@ -111 +119 @@
             'list_files_test_plugin/subdir/subfile.php',
         );
-        $this->assertEquals( $expected, $plugin_files );
 
         unlink( $sub_dir . '/subfile.php' );
@@ -117 +124 @@
         rmdir( $sub_dir );
         rmdir( $plugin_dir );
+
+        $this->assertSame( $expected, $plugin_files );
     }
 
@@ -123 +132 @@
      */
     public function test_get_mu_plugins_when_mu_plugins_exists_but_is_empty() {
-        if ( is_dir( WPMU_PLUGIN_DIR ) ) {
-            $exists = true;
-            $this->_back_up_mu_plugins();
-        } else {
-            $exists = false;
-            mkdir( WPMU_PLUGIN_DIR );
-        }
-
-        $this->assertEquals( array(), get_mu_plugins() );
-
-        // Clean up.
-        if ( $exists ) {
-            $this->_restore_mu_plugins();
-        } else {
-            rmdir( WPMU_PLUGIN_DIR );
-        }
+        mkdir( WPMU_PLUGIN_DIR );
+
+        $mu_plugins = get_mu_plugins();
+
+        rmdir( WPMU_PLUGIN_DIR );
+
+        $this->assertSame( array(), $mu_plugins );
     }
 
@@ -145 +145 @@
      */
     public function test_get_mu_plugins_when_mu_plugins_directory_does_not_exist() {
-        $exists = false;
-        if ( is_dir( WPMU_PLUGIN_DIR ) ) {
-            $exists = true;
-            $this->_back_up_mu_plugins();
-            rmdir( WPMU_PLUGIN_DIR );
-        }
-
-        $this->assertEquals( array(), get_mu_plugins() );
-
-        // Clean up.
-        if ( $exists ) {
-            mkdir( WPMU_PLUGIN_DIR );
-            $this->_restore_mu_plugins();
-        }
+        $this->assertFileNotExists( WPMU_PLUGIN_DIR );
+        $this->assertSame( array(), get_mu_plugins() );
     }
 
@@ -165 +153 @@
      */
     public function test_get_mu_plugins_should_ignore_index_php_containing_silence_is_golden() {
-        if ( is_dir( WPMU_PLUGIN_DIR ) ) {
-            $exists = true;
-            $this->_back_up_mu_plugins();
-        } else {
-            $exists = false;
-            mkdir( WPMU_PLUGIN_DIR );
-        }
+        mkdir( WPMU_PLUGIN_DIR );
 
         $this->_create_plugin( '<?php\n//Silence is golden.', 'index.php', WPMU_PLUGIN_DIR );
-        $this->assertEquals( array(), get_mu_plugins() );
+
+        $mu_plugins = get_mu_plugins();
+
+        unlink( WPMU_PLUGIN_DIR . '/index.php' );
+        rmdir( WPMU_PLUGIN_DIR );
+
+        $this->assertSame( array(), $mu_plugins );
+    }
+
+    /**
+     * @covers ::get_mu_plugins
+     */
+    public function test_get_mu_plugins_should_not_ignore_index_php_containing_something_other_than_silence_is_golden() {
+        mkdir( WPMU_PLUGIN_DIR );
+
+        $this->_create_plugin( '<?php\n//Silence is not golden.', 'index.php', WPMU_PLUGIN_DIR );
+        $found = get_mu_plugins();
 
         // Clean up.
         unlink( WPMU_PLUGIN_DIR . '/index.php' );
-        if ( $exists ) {
-            $this->_restore_mu_plugins();
-        } else {
-            rmdir( WPMU_PLUGIN_DIR );
-        }
+        rmdir( WPMU_PLUGIN_DIR );
+
+        $this->assertSame( array( 'index.php' ), array_keys( $found ) );
     }
 
@@ -188 +184 @@
      * @covers ::get_mu_plugins
      */
-    public function test_get_mu_plugins_should_not_ignore_index_php_containing_something_other_than_silence_is_golden() {
-        if ( is_dir( WPMU_PLUGIN_DIR ) ) {
-            $exists = true;
-            $this->_back_up_mu_plugins();
-        } else {
-            $exists = false;
-            mkdir( WPMU_PLUGIN_DIR );
-        }
-
-        $this->_create_plugin( '<?php\n//Silence is not golden.', 'index.php', WPMU_PLUGIN_DIR );
-        $found = get_mu_plugins();
-        $this->assertEquals( array( 'index.php' ), array_keys( $found ) );
-
-        // Clean up.
-        unlink( WPMU_PLUGIN_DIR . '/index.php' );
-        if ( $exists ) {
-            $this->_restore_mu_plugins();
-        } else {
-            rmdir( WPMU_PLUGIN_DIR );
-        }
-    }
-
-    /**
-     * @covers ::get_mu_plugins
-     */
     public function test_get_mu_plugins_should_ignore_files_without_php_extensions() {
-        if ( is_dir( WPMU_PLUGIN_DIR ) ) {
-            $exists = true;
-            $this->_back_up_mu_plugins();
-        } else {
-            $exists = false;
-            mkdir( WPMU_PLUGIN_DIR );
-        }
+        mkdir( WPMU_PLUGIN_DIR );
 
         $this->_create_plugin( '<?php\n//Test', 'foo.php', WPMU_PLUGIN_DIR );
         $this->_create_plugin( '<?php\n//Test 2', 'bar.txt', WPMU_PLUGIN_DIR );
         $found = get_mu_plugins();
-        $this->assertEquals( array( 'foo.php' ), array_keys( $found ) );
 
         // Clean up.
         unlink( WPMU_PLUGIN_DIR . '/foo.php' );
         unlink( WPMU_PLUGIN_DIR . '/bar.txt' );
-        if ( $exists ) {
-            $this->_restore_mu_plugins();
-        } else {
-            rmdir( WPMU_PLUGIN_DIR );
-        }
+
+        $this->assertSame( array( 'foo.php' ), array_keys( $found ) );
     }
 
@@ -393 +354 @@
 
     /**
-     * Move existing mu-plugins to wp-content/mu-plugin/backup.
+     * Move existing mu-plugins to wp-content/mu-plugin-backup.
      *
      * @since 4.2.0
@@ -399 +360 @@
      * @access private
      */
-    private function _back_up_mu_plugins() {
+    private static function _back_up_mu_plugins() {
         if ( is_dir( WPMU_PLUGIN_DIR ) ) {
             $mu_bu_dir = WP_CONTENT_DIR . '/mu-plugin-backup';
-            if ( ! is_dir( $mu_bu_dir ) ) {
-                mkdir( $mu_bu_dir );
-            }
-
-            $files_to_move = array();
-            if ( $mu_plugins = opendir( WPMU_PLUGIN_DIR ) ) {
-                while ( false !== $plugin = readdir( $mu_plugins ) ) {
-                    if ( 0 !== strpos( $plugin, '.' ) ) {
-                        $files_to_move[] = $plugin;
-                    }
-                }
-            }
-
-            @closedir( $mu_plugins );
-
-            foreach ( $files_to_move as $file_to_move ) {
-                $f = rename( WPMU_PLUGIN_DIR . '/' . $file_to_move, $mu_bu_dir . '/' . $file_to_move );
-            }
+            rename( WPMU_PLUGIN_DIR, $mu_bu_dir );
         }
     }
@@ -430 +374 @@
      * @access private
      */
-    private function _restore_mu_plugins() {
-        $mu_bu_dir     = WP_CONTENT_DIR . '/mu-plugin-backup';
-        $files_to_move = array();
-        if ( is_dir( $mu_bu_dir ) && $mu_plugins = opendir( $mu_bu_dir ) ) {
-            while ( false !== $plugin = readdir( $mu_plugins ) ) {
-                if ( 0 !== strpos( $plugin, '.' ) ) {
-                    $files_to_move[] = $plugin;
-                }
-            }
-        }
-
-        @closedir( $mu_plugins );
-
-        foreach ( $files_to_move as $file_to_move ) {
-            rename( $mu_bu_dir . '/' . $file_to_move, WPMU_PLUGIN_DIR . '/' . $file_to_move );
+    private static function _restore_mu_plugins() {
+        $mu_bu_dir = WP_CONTENT_DIR . '/mu-plugin-backup';
+
+        if ( is_dir( WPMU_PLUGIN_DIR ) ) {
+            rmdir( WPMU_PLUGIN_DIR );
         }
 
         if ( is_dir( $mu_bu_dir ) ) {
-            rmdir( $mu_bu_dir );
+            rename( $mu_bu_dir, WPMU_PLUGIN_DIR );
         }
     }