Commit 945745b

committed

Handle OneBranch edge case PowerShell install

1 parent 0ad7bc8 commit 945745bCopy full SHA for 945745b

File tree

+27

-1

lines changed

+27

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { defineConfig } from "@vscode/test-cli";`
	`2`	`+import { existsSync } from "fs";`
`2`	`3`
`3`	`4`	`export default defineConfig({`
`4`	`5`	`files: "test/*/.test.ts",`
`@@ -10,7 +11,7 @@ export default defineConfig({`
`10`	`11`	`// Undocumented but valid option to use a temporary profile for testing`
`11`	`12`	`"--profile-temp",`
`12`	`13`	`],`
`13`		`- workspaceFolder: "test/TestEnvironment.code-workspace",`
	`14`	+ workspaceFolder: `test/${existsSync("C:\\powershell-7\\pwsh.exe") ? "OneBranch" : "TestEnvironment"}.code-workspace`,
`14`	`15`	`mocha: {`
`15`	`16`	`ui: "bdd", // describe, it, etc.`
`16`	`17`	`require: ["esbuild-register"], // transpile TypeScript on-the-fly`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,18 @@`
	`1`	`+{`
	`2`	`+ // A simple test environment that suppresses some first start warnings we don't care about.`
	`3`	`+ "folders": [`
	`4`	`+ {`
	`5`	`+ "path": "mocks",`
	`6`	`+ },`
	`7`	`+ ],`
	`8`	`+ "settings": {`
	`9`	`+ "git.openRepositoryInParentFolders": "never",`
	`10`	`+ "csharp.suppressDotnetRestoreNotification": true,`
	`11`	`+ "extensions.ignoreRecommendations": true,`
	`12`	`+ // The settings tests account for this fix`
	`13`	`+ "powershell.powerShellAdditionalExePaths": {`
	`14`	`+ "OneBranch": "C:\\powershell-7\\pwsh.exe",`
	`15`	`+ },`
	`16`	`+ "powershell.powerShellDefaultVersion": "OneBranch",`
	`17`	`+ },`
	`18`	`+}`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`	`4`	`import * as assert from "assert";`
	`5`	`+import { existsSync } from "fs";`
`5`	`6`	`import * as os from "os";`
`6`	`7`	`import path from "path";`
`7`	`8`	`import * as vscode from "vscode";`
`@@ -38,6 +39,12 @@ describe("Settings E2E", function () {`
`38`	`39`
`39`	`40`	`it("Loads the correct defaults", function () {`
`40`	`41`	`const testSettings = new Settings();`
	`42`	`+ if (existsSync("C:\\powershell-7\\pwsh.exe")) {`
	`43`	`+ testSettings.powerShellAdditionalExePaths = {`
	`44`	`+ OneBranch: "C:\\powershell-7\\pwsh.exe",`
	`45`	`+ };`
	`46`	`+ testSettings.powerShellDefaultVersion = "OneBranch";`
	`47`	`+ }`
`41`	`48`	`const actualSettings = getSettings();`
`42`	`49`	`assert.deepStrictEqual(actualSettings, testSettings);`
`43`	`50`	`});`

Comments

(0)