Skip to content

Commit 092bfaa

Browse files
committed
Rename dir to workspaceDir
1 parent 2e001f2 commit 092bfaa

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

test/e2e/codeServer.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ describe("CodeServer", true, [], () => {
2828
})
2929

3030
test("should open a file", async ({ codeServerPage }) => {
31-
const dir = await codeServerPage.dir()
31+
const dir = await codeServerPage.workspaceDir
3232
const file = path.join(dir, "foo")
3333
await fs.writeFile(file, "bar")
3434
await codeServerPage.openFile(file)
3535
})
3636

3737
test("should not share state with other paths", async ({ codeServerPage }) => {
38-
const dir = await codeServerPage.dir()
38+
const dir = await codeServerPage.workspaceDir
3939
const file = path.join(dir, "foo")
4040
await fs.writeFile(file, "bar")
4141

test/e2e/models/CodeServer.ts

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export class CodeServer {
3737
private process: Promise<CodeServerProcess> | undefined
3838
public readonly logger: Logger
3939
private closed = false
40-
private workspaceDir: Promise<string> | undefined
40+
private _workspaceDir: Promise<string> | undefined
4141

4242
constructor(name: string, private readonly codeServerArgs: string[]) {
4343
this.logger = logger.named(name)
@@ -55,18 +55,21 @@ export class CodeServer {
5555
return address
5656
}
5757

58-
async dir(): Promise<string> {
59-
if (!this.workspaceDir) {
60-
this.workspaceDir = tmpdir(workspaceDir)
58+
/**
59+
* The workspace directory code-server opens with.
60+
*/
61+
get workspaceDir(): Promise<string> {
62+
if (!this._workspaceDir) {
63+
this._workspaceDir = tmpdir(workspaceDir)
6164
}
62-
return this.workspaceDir
65+
return this._workspaceDir
6366
}
6467

6568
/**
6669
* Create a random workspace and seed it with settings.
6770
*/
6871
private async createWorkspace(): Promise<string> {
69-
const dir = await this.dir()
72+
const dir = await this.workspaceDir
7073
await fs.mkdir(path.join(dir, "User"))
7174
await fs.writeFile(
7275
path.join(dir, "User/settings.json"),
@@ -198,8 +201,11 @@ export class CodeServerPage {
198201
return this.codeServer.address()
199202
}
200203

201-
dir() {
202-
return this.codeServer.dir()
204+
/**
205+
* The workspace directory code-server opens with.
206+
*/
207+
get workspaceDir() {
208+
return this.codeServer.workspaceDir
203209
}
204210

205211
/**

0 commit comments

Comments
 (0)