Commit 19c9c23

GirlBossRushjsjoeio

authored and

committed

Touch up build, tests.

1 parent ad787bb commit 19c9c23Copy full SHA for 19c9c23

File tree

5 files changed

+54

-57

lines changed

ci/build
- build-vscode.sh
src/node
- cli.ts
test/unit/node

5 files changed

+54

-57

lines changed

`‎ci/build/build-vscode.sh‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ main() {`
`13`	`13`
`14`	`14`	`# extensions-ci compiles extensions and includes their media.`
`15`	`15`	`# compile-web compiles web extensions. TODO: Unsure if used.`
`16`		`- yarn gulp extensions-ci compile-web "vscode-server${MINIFY:+-min}"`
	`16`	`+ yarn gulp extensions-ci compile-web "vscode-reh-web${MINIFY:+-min}"`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`main "$@"`

`‎src/node/cli.ts‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ export function splitOnFirstEquals(str: string): string[] {`
`274`	`274`	`return split`
`275`	`275`	`}`
`276`	`276`
`277`		`-const createDefaultArgs = (): Args => {`
	`277`	`+exportconst createDefaultArgs = (): Args => {`
`278`	`278`	`return {`
`279`	`279`	`_: [],`
`280`	`280`	`workspace: "",`

`‎test/unit/node/app.test.ts‎`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@ import * as http from "http"`
`4`	`4`	`import * as https from "https"`
`5`	`5`	`import * as path from "path"`
`6`	`6`	`import { createApp, ensureAddress, handleArgsSocketCatchError, handleServerError } from "../../../src/node/app"`
`7`		`-import { OptionalString, setDefaults } from "../../../src/node/cli"`
	`7`	`+import { createDefaultArgs,OptionalString, setDefaults } from "../../../src/node/cli"`
`8`	`8`	`import { generateCertificate } from "../../../src/node/util"`
`9`	`9`	`import { getAvailablePort, tmpdir } from "../../utils/helpers"`
`10`	`10`
`11`	`11`	`describe("createApp", () => {`
`12`	`12`	`let spy: jest.SpyInstance`
`13`	`13`	`let unlinkSpy: jest.SpyInstance`
`14`		`- let port: number`
	`14`	`+ let port: string`
`15`	`15`	`let tmpDirPath: string`
`16`	`16`	`let tmpFilePath: string`
`17`	`17`
`@@ -29,7 +29,7 @@ describe("createApp", () => {`
`29`	`29`	`// then you can spy on those modules methods, like unlink.`
`30`	`30`	`// See: https://github.com/aelbore/esbuild-jest/issues/26#issuecomment-893763840`
`31`	`31`	`unlinkSpy = jest.spyOn(promises, "unlink")`
`32`		`- port = await getAvailablePort()`
	`32`	`+ port = (await getAvailablePort()).toString()`
`33`	`33`	`})`
`34`	`34`
`35`	`35`	`afterEach(() => {`
`@@ -44,8 +44,8 @@ describe("createApp", () => {`
`44`	`44`
`45`	`45`	`it("should return an Express app, a WebSockets Express app and an http server", async () => {`
`46`	`46`	`const defaultArgs = await setDefaults({`
	`47`	`+ ...createDefaultArgs(),`
`47`	`48`	`port,`
`48`		`- _: [],`
`49`	`49`	`})`
`50`	`50`	`const app = await createApp(defaultArgs)`
`51`	`51`
`@@ -61,8 +61,8 @@ describe("createApp", () => {`
`61`	`61`
`62`	`62`	`it("should handle error events on the server", async () => {`
`63`	`63`	`const defaultArgs = await setDefaults({`
	`64`	`+ ...createDefaultArgs(),`
`64`	`65`	`port,`
`65`		`- _: [],`
`66`	`66`	`})`
`67`	`67`
`68`	`68`	`const app = await createApp(defaultArgs)`
`@@ -82,10 +82,10 @@ describe("createApp", () => {`
`82`	`82`	`it("should reject errors that happen before the server can listen", async () => {`
`83`	`83`	`// We listen on an invalid port`
`84`	`84`	`// causing the app to reject the Promise called at startup`
`85`		`- const port = 2`
	`85`	`+ const port = "2"`
`86`	`86`	`const defaultArgs = await setDefaults({`
	`87`	`+ ...createDefaultArgs(),`
`87`	`88`	`port,`
`88`		`- _: [],`
`89`	`89`	`})`
`90`	`90`
`91`	`91`	`async function masterBall() {`
`@@ -105,7 +105,7 @@ describe("createApp", () => {`
`105`	`105`	`it("should unlink a socket before listening on the socket", async () => {`
`106`	`106`	`await promises.writeFile(tmpFilePath, "")`
`107`	`107`	`const defaultArgs = await setDefaults({`
`108`		`- _: [],`
	`108`	`+ ...createDefaultArgs(),`
`109`	`109`	`socket: tmpFilePath,`
`110`	`110`	`})`
`111`	`111`
`@@ -119,9 +119,9 @@ describe("createApp", () => {`
`119`	`119`	`const testCertificate = await generateCertificate("localhost")`
`120`	`120`	`const cert = new OptionalString(testCertificate.cert)`
`121`	`121`	`const defaultArgs = await setDefaults({`
	`122`	`+ ...createDefaultArgs(),`
`122`	`123`	`port,`
`123`	`124`	`cert,`
`124`		`- _: [],`
`125`	`125`	`["cert-key"]: testCertificate.certKey,`
`126`	`126`	`})`
`127`	`127`	`const app = await createApp(defaultArgs)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 19c9c23

File tree

5 files changed

5 files changed

`‎ci/build/build-vscode.sh‎`

`‎src/node/cli.ts‎`

`‎test/unit/node/app.test.ts‎`

0 commit comments