Commit dd05b48

authored

chore: fix flakiness of exports by waiting to at least have 1 available (#516)

1 parent b26cd46 commit dd05b48Copy full SHA for dd05b48

File tree

2 files changed

+15

-5

lines changed

src/common
- exportsManager.ts
tests/unit/common
- exportsManager.test.ts

2 files changed

+15

-5

lines changed

`‎src/common/exportsManager.ts`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ type StoredExport = ReadyExport \| InProgressExport;`
`56`	`56`	`*`
`57`	`57`	`* Ref Cursor: https://forum.cursor.com/t/cursor-mcp-resource-feature-support/50987`
`58`	`58`	`* JIRA: https://jira.mongodb.org/browse/MCP-104 */`
`59`		`-type AvailableExport = Pick<StoredExport, "exportName" \| "exportTitle" \| "exportURI" \| "exportPath">;`
	`59`	`+exporttype AvailableExport = Pick<StoredExport, "exportName" \| "exportTitle" \| "exportURI" \| "exportPath">;`
`60`	`60`
`61`	`61`	`export type ExportsManagerConfig = Pick<UserConfig, "exportsPath" \| "exportTimeoutMs" \| "exportCleanupIntervalMs">;`
`62`	`62`

`‎tests/unit/common/exportsManager.test.ts`

Lines changed: 14 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import {`
`11`	`11`	`ExportsManager,`
`12`	`12`	`validateExportName,`
`13`	`13`	`} from "../../../src/common/exportsManager.js";`
`14`		`-`
	`14`	`+importtype{AvailableExport}from"../../../src/common/exportsManager.js";`
`15`	`15`	`import { config } from "../../../src/common/config.js";`
`16`	`16`	`import { ROOT_DIR } from "../../accuracy/sdk/constants.js";`
`17`	`17`	`import { timeout } from "../../integration/helpers.js";`
`@@ -124,6 +124,15 @@ function timeoutPromise(timeoutMS: number, context: string): Promise<never> {`
`124`	`124`	`});`
`125`	`125`	`}`
`126`	`126`
	`127`	`+async function waitUntilThereIsAnExportAvailable(manager: ExportsManager): Promise<AvailableExport[]> {`
	`128`	`+ return await vi.waitFor(() => {`
	`129`	`+ const exports = manager.availableExports;`
	`130`	`+ expect(exports.length).toBeGreaterThan(0);`
	`131`	`+`
	`132`	`+ return exports;`
	`133`	`+ });`
	`134`	`+}`
	`135`	`+`
`127`	`136`	`async function getExportAvailableNotifier(`
`128`	`137`	`expectedExportURI: string,`
`129`	`138`	`manager: ExportsManager,`
`@@ -318,7 +327,8 @@ describe("ExportsManager unit test", () => {`
`318`	`327`	`await cursorCloseNotification;`
`319`	`328`
`320`	`329`	`// Updates available export`
`321`		`- const availableExports = manager.availableExports;`
	`330`	`+ // this is async code so we should wait and retry`
	`331`	`+ const availableExports = await waitUntilThereIsAnExportAvailable(manager);`
`322`	`332`	`expect(availableExports).toHaveLength(1);`
`323`	`333`	`expect(availableExports).toContainEqual(`
`324`	`334`	`expect.objectContaining({`
`@@ -352,7 +362,7 @@ describe("ExportsManager unit test", () => {`
`352`	`362`
`353`	`363`	const expectedExportName = exportName.endsWith(".json") ? exportName : `${exportName}.json`;
`354`	`364`	`// Updates available export`
`355`		`- const availableExports = manager.availableExports;`
	`365`	`+ const availableExports = awaitwaitUntilThereIsAnExportAvailable(manager);`
`356`	`366`	`expect(availableExports).toHaveLength(1);`
`357`	`367`	`expect(availableExports).toContainEqual(`
`358`	`368`	`expect.objectContaining({`
`@@ -387,7 +397,7 @@ describe("ExportsManager unit test", () => {`
`387`	`397`
`388`	`398`	const expectedExportName = exportName.endsWith(".json") ? exportName : `${exportName}.json`;
`389`	`399`	`// Updates available export`
`390`		`- const availableExports = manager.availableExports;`
	`400`	`+ const availableExports = awaitwaitUntilThereIsAnExportAvailable(manager);`
`391`	`401`	`expect(availableExports).toHaveLength(1);`
`392`	`402`	`expect(availableExports).toContainEqual(`
`393`	`403`	`expect.objectContaining({`

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 dd05b48

File tree

2 files changed

2 files changed

`‎src/common/exportsManager.ts`

`‎tests/unit/common/exportsManager.test.ts`

0 commit comments