Support adding an OutputFile and allow running from command pallet (#…

…2730) * Support adding OutputPath and run file * refactor all logic
PowerShell · Jun 1, 2020 · 0291818 · 0291818
1 parent a210bb4
commit 0291818
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 12 deletions.
diff --git a/InvokePesterStub.ps1 b/InvokePesterStub.ps1
@@ -53,7 +53,10 @@ param(
     [switch] $MinimumVersion5,
 
     [Parameter(Mandatory)]
-    [string] $Output
+    [string] $Output,
+
+    [Parameter()]
+    [string] $OutputPath
 )
 
 $pesterModule = Microsoft.PowerShell.Core\Get-Module Pester
@@ -103,6 +106,14 @@ if ($All) {
         if ("FromPreference" -ne $Output) {
             $configuration.Add('Output', @{ Verbosity = $Output })
         }
+
+        if ($OutputPath) {
+            $configuration.Add('TestResult', @{
+                Enabled = $true
+                OutputFormat = "NUnit2.5"
+                OutputPath = $OutputPath
+            })
+        }
         Pester\Invoke-Pester -Configuration $configuration | Out-Null
     }
     elseif ($pesterModule.Version -ge '3.4.5') {
@@ -132,6 +143,15 @@ elseif (($LineNumber -match '\d+') -and ($pesterModule.Version -ge '4.6.0')) {
         if ("FromPreference" -ne $Output) {
             $configuration.Add('Output', @{ Verbosity = $Output })
         }
+
+        if ($OutputPath) {
+            $configuration.Add('TestResult', @{
+                Enabled = $true
+                OutputFormat = "NUnit2.5"
+                OutputPath = $OutputPath
+            })
+        }
+
         Pester\Invoke-Pester -Configuration $configuration | Out-Null
     }
     else {

diff --git a/src/features/PesterTests.ts b/src/features/PesterTests.ts
@@ -38,8 +38,8 @@ export class PesterTestsFeature implements IFeature {
         // This command is provided for usage by PowerShellEditorServices (PSES) only
         this.command = vscode.commands.registerCommand(
             "PowerShell.RunPesterTests",
-            (uriString, runInDebugger, describeBlockName?, describeBlockLineNumber?) => {
-                this.launchTests(uriString, runInDebugger, describeBlockName, describeBlockLineNumber);
+            (uriString, runInDebugger, describeBlockName?, describeBlockLineNumber?, outputPath?) => {
+                this.launchTests(uriString, runInDebugger, describeBlockName, describeBlockLineNumber, outputPath);
             });
     }
 
@@ -52,24 +52,30 @@ export class PesterTestsFeature implements IFeature {
     }
 
     private launchAllTestsInActiveEditor(launchType: LaunchType, fileUri: vscode.Uri) {
-        const uriString = fileUri.toString();
+        const uriString = (fileUri || vscode.window.activeTextEditor.document.uri).toString();
         const launchConfig = this.createLaunchConfig(uriString, launchType);
-        launchConfig.args.push("-All");
         this.launch(launchConfig);
     }
 
     private async launchTests(
         uriString: string,
         runInDebugger: boolean,
         describeBlockName?: string,
-        describeBlockLineNumber?: number) {
+        describeBlockLineNumber?: number,
+        outputPath?: string) {
 
         const launchType = runInDebugger ? LaunchType.Debug : LaunchType.Run;
-        const launchConfig = this.createLaunchConfig(uriString, launchType, describeBlockName, describeBlockLineNumber);
+        const launchConfig = this.createLaunchConfig(uriString, launchType, describeBlockName, describeBlockLineNumber, outputPath);
         this.launch(launchConfig);
     }
 
-    private createLaunchConfig(uriString: string, launchType: LaunchType, testName?: string, lineNum?: number) {
+    private createLaunchConfig(
+        uriString: string,
+        launchType: LaunchType,
+        testName?: string,
+        lineNum?: number,
+        outputPath?: string) {
+
         const uri = vscode.Uri.parse(uriString);
         const currentDocument = vscode.window.activeTextEditor.document;
         const settings = Settings.load();
@@ -98,15 +104,15 @@ export class PesterTestsFeature implements IFeature {
 
         if (lineNum) {
             launchConfig.args.push("-LineNumber", `${lineNum}`);
-        }
-
-        if (testName) {
+        } else if (testName) {
             // Escape single quotes inside double quotes by doubling them up
             if (testName.includes("'")) {
                 testName = testName.replace(/'/g, "''");
             }
 
             launchConfig.args.push("-TestName", `'${testName}'`);
+        } else {
+            launchConfig.args.push("-All");
         }
 
         if (!settings.pester.useLegacyCodeLens) {
@@ -120,6 +126,10 @@ export class PesterTestsFeature implements IFeature {
             launchConfig.args.push("-Output", `'${settings.pester.outputVerbosity}'`);
         }
 
+        if (outputPath) {
+            launchConfig.args.push("-OutputPath", `'${outputPath}'`);
+        }
+
         return launchConfig;
     }
 

diff --git a/src/session.ts b/src/session.ts
@@ -283,7 +283,7 @@ export class SessionManager implements Middleware {
             const resolvedCodeLens = next(codeLens, token);
             const resolveFunc =
                 (codeLensToFix: vscode.CodeLens): vscode.CodeLens => {
-                    if (codeLensToFix.command.command === "editor.action.showReferences") {
+                    if (codeLensToFix.command?.command === "editor.action.showReferences") {
                         const oldArgs = codeLensToFix.command.arguments;
 
                         // Our JSON objects don't get handled correctly by