Combine phpunit configuration for unit and functional tests into a single file, and move it back to its historic location. (#3798)

Author: greg-1-anderson

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Drush is built by people like you! Please [join us](https://github.com/drush-ops
 * Contributions are submitted, reviewed, and accepted using GitHub pull requests.
 * The latest changes are in the `master` branch. PR's should initially target this branch.
 * Try to make clean commits that are easily readable (including descriptive commit messages!)
-* Test before you push. Get familiar with Unish, our test suite. See the test-specific [README.md](tests/README.md). Optionally run tests in the provided Docker containers.
+* See the test-specific [README.md](tests/README.md) for instructions on running the test suite. Test before you push. Get familiar with Unish, our test suite. Optionally run tests in the provided Docker containers.
 * We maintain branches named 9.x, 8.x, etc. These are release branches. From these branches, we make new tags for patch and minor versions.
 
 ## Development Environment

composer.json

@@ -107,8 +107,8 @@
     "scenario": "scenarios/install",
     "sut": "./drush --uri=dev",
     "sut:si": "./drush site:install testing --uri=dev --sites-subdir=dev --db-url=${UNISH_DB_URL:-mysql://root:password@mariadb}/unish_dev -v",
-    "unit": "phpunit --colors=always --configuration tests/unit",
-    "functional": "phpunit --colors=always --configuration tests/functional",
+    "unit": "phpunit --colors=always --configuration tests --testsuite unit",
+    "functional": "phpunit --colors=always --configuration tests --testsuite functional",
     "post-update-cmd": [
         "create-scenario phpunit4 --autoload-dir internal-copy 'phpunit/phpunit:^4.8.36'"
     ]

tests/functional/phpunit.xml.dist renamed to tests/phpunit.xml.dist

@@ -1,22 +1,23 @@
 <!--
-      This is the phpunit configuration file for the functional tests.
-      For the unit tests configuration, see the phpunit.xml.dist file
-      at the root of the project.
-
       Copy and rename this file to phpunit.xml to customize.
 
       The variables shown below must usually be defined in order to run the
       functional tests. They may be set by customizing this file, or they may
       be defined as environment variables. Alternately, you may run the
       tests without defining these variables if you use the default values.
 -->
-<phpunit backupGlobals="false"
+<phpunit
+    bootstrap="../vendor/autoload.php"
+    backupGlobals="false"
     backupStaticAttributes="false"
     syntaxCheck="false"
     colors="true">
   <testsuites>
-    <testsuite name="Drush Test Suite">
-      <directory>.</directory>
+    <testsuite name="unit">
+      <directory suffix="Test.php">unit</directory>
+    </testsuite>
+    <testsuite name="functional">
+      <directory>functional</directory>
     </testsuite>
   </testsuites>