Detect phpunit.xml configuration when executing test in sub-directory

calebporzio · Jan 15, 2018 · fde2e7c · fde2e7c
1 parent 513bb8f
commit fde2e7c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/src/phpunit-command.js b/src/phpunit-command.js
@@ -18,7 +18,7 @@ module.exports = class PhpUnitCommand {
 
         this.lastOutput = this.runFullSuite
             ? `${this.binary}${this.suffix}`
-            : `${this.binary} ${this.file} ${this.filter}${this.suffix}`;
+            : `${this.binary} ${this.file} ${this.filter}${this.configuration}${this.suffix}`;
 
         return this.lastOutput;
     }
@@ -31,6 +31,12 @@ module.exports = class PhpUnitCommand {
         return this.method ? `--filter '^.*::${this.method}$'` : '';
     }
 
+    get configuration() {
+        return this.subDirectory
+            ? ` --configuration ${this._normalizePath(path.join(this.subDirectory, 'phpunit.xml'))}`
+            : '';
+    }
+
     get suffix() {
         let suffix = vscode.workspace.getConfiguration('better-phpunit').get('commandSuffix');
 
@@ -42,14 +48,18 @@ module.exports = class PhpUnitCommand {
             return vscode.workspace.getConfiguration('better-phpunit').get('phpunitBinary')
         }
 
-        // find the closest phpunit.xml file in the project (for projects with multiple "vendor/phpunit"s).
+        return this.subDirectory
+            ? this._normalizePath(path.join(this.subDirectory, 'vendor', 'bin', 'phpunit'))
+            : this._normalizePath(path.join(vscode.workspace.rootPath, 'vendor', 'bin', 'phpunit'));
+    }
+
+    get subDirectory() {
+        // find the closest phpunit.xml file in the project (for projects with multiple "vendor/bin/phpunit"s).
         let phpunitDotXml = findUp.sync('phpunit.xml', { cwd: vscode.window.activeTextEditor.document.fileName });
 
-        let rootDirectory = phpunitDotXml
+        return path.dirname(phpunitDotXml) !== vscode.workspace.rootPath
             ? path.dirname(phpunitDotXml)
-            : vscode.workspace.rootPath;
-
-        return this._normalizePath(path.join(rootDirectory, 'vendor', 'bin', 'phpunit'));
+            : null;
     }
 
     get method() {

diff --git a/test/extension.test.js b/test/extension.test.js
@@ -119,6 +119,19 @@ describe("Better PHPUnit Test Suite", function () {
         });
     });
 
+    it("Detect configuration in sub-directory", async () => {
+        let document = await vscode.workspace.openTextDocument(path.join(vscode.workspace.rootPath, 'sub-directory', 'tests', 'SampleTest.php'));
+        await vscode.window.showTextDocument(document);
+        await vscode.commands.executeCommand('better-phpunit.run');
+
+        await timeout(waitToAssertInSeconds, () => {
+            assert.equal(
+                extension.getGlobalCommandInstance().configuration,
+                ' --configuration /Users/calebporzio/Documents/Code/sites/better-phpunit/test/project-stub/sub-directory/phpunit.xml'
+            );
+        });
+    });
+
     it("Check full command", async () => {
         let document = await vscode.workspace.openTextDocument(path.join(vscode.workspace.rootPath, 'tests', 'SampleTest.php'));
         await vscode.window.showTextDocument(document, { selection: new vscode.Range(7, 0, 7, 0) });

diff --git a/test/project-stub/phpunit.xml b/test/project-stub/phpunit.xml
@@ -2,7 +2,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.4/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         colors="true"
+         colors="false"
          forceCoversAnnotation="true"
          beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"

diff --git a/test/project-stub/sub-directory/phpunit.xml b/test/project-stub/sub-directory/phpunit.xml
@@ -2,6 +2,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.4/phpunit.xsd"
          bootstrap="vendor/autoload.php"
+         colors="true"
          forceCoversAnnotation="true"
          beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"