Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(e2e): r3-l3 own gfs fixtures before setup awaits

Josué6f335e6e1775
diff --git a/control-ui/e2e/gfs-upload-v2.spec.ts b/control-ui/e2e/gfs-upload-v2.spec.ts
index ff3d9ad70..a72d6646a 100644
--- a/control-ui/e2e/gfs-upload-v2.spec.ts
+++ b/control-ui/e2e/gfs-upload-v2.spec.ts
@@ -138,9 +138,13 @@ async function exerciseCreate(
byteLength: number
): Promise<void> {
const fixtureName = uniqueGfsFixtureName(`e2e-gfs-v2-create-${byteLength}`)
- const fixture = seedGfsDirectoryFixture(fixtureName)
- const source = await createDiskUploadFixture(byteLength, '.parquet', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsDirectoryFixture(fixtureName)
+ cleanupFixture = fixture
+ const source = await createDiskUploadFixture(byteLength, '.parquet', fixtureName)
+ cleanupSource = source
const current = await openWritableFolder(page, fixture.name)
const createResponse = page.waitForResponse(
response =>
@@ -191,9 +195,11 @@ async function exerciseCreate(
const downloaded = await hashDownload(await downloadPromise)
expect(downloaded).toEqual({ bytes: byteLength, sha256: source.sha256 })
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
}
@@ -202,9 +208,13 @@ async function exerciseReplace(
byteLength: number
): Promise<void> {
const fixtureName = uniqueGfsFixtureName(`e2e-gfs-v2-replace-${byteLength}`)
- const fixture = seedGfsFileFixture(fixtureName)
- const source = await createDiskUploadFixture(byteLength, '.parquet', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsFileFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsFileFixture(fixtureName)
+ cleanupFixture = fixture
+ const source = await createDiskUploadFixture(byteLength, '.parquet', fixtureName)
+ cleanupSource = source
const current = await openWritableFolder(page, fixture.name)
const before = await getGfsChildResourceSummary({
parentResourceId: fixture.resourceId,
@@ -263,9 +273,11 @@ async function exerciseReplace(
const downloaded = await hashDownload(await downloadPromise)
expect(downloaded).toEqual({ bytes: byteLength, sha256: source.sha256 })
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
}
@@ -294,9 +306,13 @@ test.describe('GFS Upload v2 — Control UI large-upload project', () => {
page,
}) => {
const fixtureName = uniqueGfsFixtureName('e2e-gfs-v2-drag-resume')
- const fixture = seedGfsDirectoryFixture(fixtureName)
- const source = await createDiskUploadFixture(32 * 1024 * 1024, '.bin', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsDirectoryFixture(fixtureName)
+ cleanupFixture = fixture
+ const source = await createDiskUploadFixture(32 * 1024 * 1024, '.bin', fixtureName)
+ cleanupSource = source
await openWritableFolder(page, fixture.name)
const createResponse = page.waitForResponse(
response =>
@@ -367,9 +383,11 @@ test.describe('GFS Upload v2 — Control UI large-upload project', () => {
resumedCurrent.getByRole('listitem').filter({ hasText: source.fileName })
).toHaveCount(1)
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
})
})
@@ -386,13 +404,17 @@ test.describe('GFS Upload v2 — Control UI runtime product policy', () => {
const lowerMax = 100 * 1024 * 1024
const raisedMax = 300 * 1024 * 1024
const rejectedFixtureName = uniqueGfsFixtureName('e2e-gfs-v2-runtime-cap-ui')
- const rejectedFixture = seedGfsDirectoryFixture(rejectedFixtureName)
- const rejectedSource = await createOversizedDiskUploadFixture(
- '.parquet',
- rejectedFixtureName,
- lowerMax
- )
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createOversizedDiskUploadFixture>> | undefined
try {
+ const rejectedFixture = seedGfsDirectoryFixture(rejectedFixtureName)
+ cleanupFixture = rejectedFixture
+ const rejectedSource = await createOversizedDiskUploadFixture(
+ '.parquet',
+ rejectedFixtureName,
+ lowerMax
+ )
+ cleanupSource = rejectedSource
await setGfsUploadProductMaxBytes(lowerMax)
await exerciseCreate(page, lowerMax)
@@ -418,9 +440,11 @@ test.describe('GFS Upload v2 — Control UI runtime product policy', () => {
try {
await setGfsUploadProductMaxBytes(previous)
} finally {
- await removeDiskUploadFixture(rejectedSource)
- cleanupGfsFixture(rejectedFixtureName)
- assertGfsFixtureCleaned(rejectedFixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(rejectedFixtureName)
+ assertGfsFixtureCleaned(rejectedFixtureName)
+ }
}
}
})
@@ -435,9 +459,13 @@ test.describe('GFS Upload v2 — approved negative Control UI journeys', () => {
test('rejects a 209715201-byte file through the visible upload modal', async ({ page }) => {
const fixtureName = uniqueGfsFixtureName('e2e-gfs-v2-negative-oversize-ui')
- const fixture = seedGfsDirectoryFixture(fixtureName)
- const source = await createOversizedDiskUploadFixture('.parquet', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createOversizedDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsDirectoryFixture(fixtureName)
+ cleanupFixture = fixture
+ const source = await createOversizedDiskUploadFixture('.parquet', fixtureName)
+ cleanupSource = source
const current = await openWritableFolder(page, fixture.name)
await page.getByRole('button', { name: 'Upload file', exact: true }).click()
const dialog = page.getByRole('dialog', { name: 'Upload file' })
@@ -460,18 +488,24 @@ test.describe('GFS Upload v2 — approved negative Control UI journeys', () => {
0
)
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
})
test('falls back to the legacy path when v2 is disabled', async ({ page }) => {
const previous = await readGfsUploadV2Enabled()
const fixtureName = uniqueGfsFixtureName('e2e-gfs-v2-negative-legacy-ui')
- const fixture = seedGfsDirectoryFixture(fixtureName)
- const source = await createDiskUploadFixture(2 * 1024 * 1024, '.bin', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsDirectoryFixture(fixtureName)
+ cleanupFixture = fixture
+ const source = await createDiskUploadFixture(2 * 1024 * 1024, '.bin', fixtureName)
+ cleanupSource = source
await setGfsUploadV2Enabled(false)
const current = await openWritableFolder(page, fixture.name)
await page.getByRole('button', { name: 'Upload file', exact: true }).click()
@@ -501,18 +535,24 @@ test.describe('GFS Upload v2 — approved negative Control UI journeys', () => {
try {
await setGfsUploadV2Enabled(previous)
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
}
})
test('recovers a visible upload after the writer deployment restarts', async ({ page }) => {
const fixtureName = uniqueGfsFixtureName('e2e-gfs-v2-negative-restart-ui')
- const fixture = seedGfsDirectoryFixture(fixtureName)
- const source = await createDiskUploadFixture(64 * 1024 * 1024, '.bin', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsDirectoryFixture(fixtureName)
+ cleanupFixture = fixture
+ const source = await createDiskUploadFixture(64 * 1024 * 1024, '.bin', fixtureName)
+ cleanupSource = source
const current = await openWritableFolder(page, fixture.name)
const capabilitiesResponse = page.waitForResponse(
response =>
@@ -573,9 +613,11 @@ test.describe('GFS Upload v2 — approved negative Control UI journeys', () => {
.toMatchObject({ kind: 'file', bytes: source.byteLength, deleted: false })
await expect(current.getByRole('listitem').filter({ hasText: source.fileName })).toBeVisible()
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
})
})
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index f82798ed4..285ef880b 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.443",
+ "version": "0.1.444",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.443",
+ "version": "0.1.444",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/llm-providers": "file:../packages/llm-providers",
diff --git a/control-ui/package.json b/control-ui/package.json
index 930743b63..e63ae6c3c 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.443",
+ "version": "0.1.444",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",
diff --git a/desktop-app/test/e2e-playwright/gfs-upload-v2.test.ts b/desktop-app/test/e2e-playwright/gfs-upload-v2.test.ts
index 486f4354b..039a39fc1 100644
--- a/desktop-app/test/e2e-playwright/gfs-upload-v2.test.ts
+++ b/desktop-app/test/e2e-playwright/gfs-upload-v2.test.ts
@@ -296,10 +296,14 @@ async function grantFolderToE2eUser(resourceId: string): Promise<void> {
async function exerciseCreate(page: Page, byteLength: number): Promise<void> {
const fixtureName = uniqueGfsFixtureName(`e2e-gfs-desktop-v2-create-${byteLength}`)
- const fixture = seedGfsDirectoryFixture(fixtureName)
- await grantFolderToE2eUser(fixture.resourceId)
- const source = await createDiskUploadFixture(byteLength, '.parquet', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsDirectoryFixture(fixtureName)
+ cleanupFixture = fixture
+ await grantFolderToE2eUser(fixture.resourceId)
+ const source = await createDiskUploadFixture(byteLength, '.parquet', fixtureName)
+ cleanupSource = source
const { browser, manageDialog } = await openFolder(page, fixture.name)
await selectFileThroughVisibleAction(
page,
@@ -333,18 +337,24 @@ async function exerciseCreate(page: Page, byteLength: number): Promise<void> {
sha256: source.sha256,
})
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
}
async function exerciseReplace(page: Page, byteLength: number): Promise<void> {
const fixtureName = uniqueGfsFixtureName(`e2e-gfs-desktop-v2-replace-${byteLength}`)
- const fixture = seedGfsFileFixture(fixtureName)
- await grantFolderToE2eUser(fixture.resourceId)
- const source = await createDiskUploadFixture(byteLength, '.parquet', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsFileFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsFileFixture(fixtureName)
+ cleanupFixture = fixture
+ await grantFolderToE2eUser(fixture.resourceId)
+ const source = await createDiskUploadFixture(byteLength, '.parquet', fixtureName)
+ cleanupSource = source
const { browser } = await openFolder(page, fixture.name)
const before = await getGfsChildResourceSummary({
parentResourceId: fixture.resourceId,
@@ -398,9 +408,11 @@ async function exerciseReplace(page: Page, byteLength: number): Promise<void> {
sha256: source.sha256,
})
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
}
@@ -438,17 +450,25 @@ test.describe('GFS Upload v2 — packaged Desktop runtime product policy', () =>
const lowerMax = 100 * 1024 * 1024
const raisedMax = 300 * 1024 * 1024
const fixtureName = uniqueGfsFixtureName('e2e-gfs-v2-runtime-cap-desktop')
- const fixture = seedGfsDirectoryFixture(fixtureName)
- await seedGfsGrant({
- resourceId: fixture.resourceId,
- subjectType: 'user',
- subjectId: getE2EUserId(),
- permissions: ['read', 'write', 'delete'],
- inherit: true,
- grantedBy: 'e2e:gfs-upload-v2-runtime-cap',
- })
- const rejectedSource = await createOversizedDiskUploadFixture('.parquet', fixtureName, lowerMax)
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createOversizedDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsDirectoryFixture(fixtureName)
+ cleanupFixture = fixture
+ await seedGfsGrant({
+ resourceId: fixture.resourceId,
+ subjectType: 'user',
+ subjectId: getE2EUserId(),
+ permissions: ['read', 'write', 'delete'],
+ inherit: true,
+ grantedBy: 'e2e:gfs-upload-v2-runtime-cap',
+ })
+ const rejectedSource = await createOversizedDiskUploadFixture(
+ '.parquet',
+ fixtureName,
+ lowerMax
+ )
+ cleanupSource = rejectedSource
await setGfsUploadProductMaxBytes(lowerMax)
await exerciseCreate(appPage, lowerMax)
@@ -475,9 +495,11 @@ test.describe('GFS Upload v2 — packaged Desktop runtime product policy', () =>
try {
await setGfsUploadProductMaxBytes(previous)
} finally {
- await removeDiskUploadFixture(rejectedSource)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
}
})
@@ -492,17 +514,21 @@ test.describe('GFS Upload v2 — approved negative Desktop journeys', () => {
test('rejects a 209715201-byte file through the visible Desktop action', async ({ appPage }) => {
const fixtureName = uniqueGfsFixtureName('e2e-gfs-v2-negative-oversize-desktop')
- const fixture = seedGfsDirectoryFixture(fixtureName)
- await seedGfsGrant({
- resourceId: fixture.resourceId,
- subjectType: 'user',
- subjectId: getE2EUserId(),
- permissions: ['read', 'write', 'delete'],
- inherit: true,
- grantedBy: 'e2e:gfs-upload-v2-negative',
- })
- const source = await createOversizedDiskUploadFixture('.parquet', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createOversizedDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsDirectoryFixture(fixtureName)
+ cleanupFixture = fixture
+ await seedGfsGrant({
+ resourceId: fixture.resourceId,
+ subjectType: 'user',
+ subjectId: getE2EUserId(),
+ permissions: ['read', 'write', 'delete'],
+ inherit: true,
+ grantedBy: 'e2e:gfs-upload-v2-negative',
+ })
+ const source = await createOversizedDiskUploadFixture('.parquet', fixtureName)
+ cleanupSource = source
const { browser, manageDialog } = await openFolder(appPage, fixture.name)
await selectFileThroughVisibleAction(
appPage,
@@ -526,26 +552,32 @@ test.describe('GFS Upload v2 — approved negative Desktop journeys', () => {
0
)
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
})
test('falls back to the legacy path when v2 is disabled', async ({ appPage }) => {
const previous = await readGfsUploadV2Enabled()
const fixtureName = uniqueGfsFixtureName('e2e-gfs-v2-negative-legacy-desktop')
- const fixture = seedGfsDirectoryFixture(fixtureName)
- await seedGfsGrant({
- resourceId: fixture.resourceId,
- subjectType: 'user',
- subjectId: getE2EUserId(),
- permissions: ['read', 'write', 'delete'],
- inherit: true,
- grantedBy: 'e2e:gfs-upload-v2-negative',
- })
- const source = await createDiskUploadFixture(2 * 1024 * 1024, '.bin', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsDirectoryFixture(fixtureName)
+ cleanupFixture = fixture
+ await seedGfsGrant({
+ resourceId: fixture.resourceId,
+ subjectType: 'user',
+ subjectId: getE2EUserId(),
+ permissions: ['read', 'write', 'delete'],
+ inherit: true,
+ grantedBy: 'e2e:gfs-upload-v2-negative',
+ })
+ const source = await createDiskUploadFixture(2 * 1024 * 1024, '.bin', fixtureName)
+ cleanupSource = source
await setGfsUploadV2Enabled(false)
const { browser, manageDialog } = await openFolder(appPage, fixture.name)
await selectFileThroughVisibleAction(
@@ -574,26 +606,32 @@ test.describe('GFS Upload v2 — approved negative Desktop journeys', () => {
try {
await setGfsUploadV2Enabled(previous)
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
}
})
test('recovers a visible upload after the writer deployment restarts', async ({ appPage }) => {
const fixtureName = uniqueGfsFixtureName('e2e-gfs-v2-negative-restart-desktop')
- const fixture = seedGfsDirectoryFixture(fixtureName)
- await seedGfsGrant({
- resourceId: fixture.resourceId,
- subjectType: 'user',
- subjectId: getE2EUserId(),
- permissions: ['read', 'write', 'delete'],
- inherit: true,
- grantedBy: 'e2e:gfs-upload-v2-negative',
- })
- const source = await createDiskUploadFixture(64 * 1024 * 1024, '.bin', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsDirectoryFixture(fixtureName)
+ cleanupFixture = fixture
+ await seedGfsGrant({
+ resourceId: fixture.resourceId,
+ subjectType: 'user',
+ subjectId: getE2EUserId(),
+ permissions: ['read', 'write', 'delete'],
+ inherit: true,
+ grantedBy: 'e2e:gfs-upload-v2-negative',
+ })
+ const source = await createDiskUploadFixture(64 * 1024 * 1024, '.bin', fixtureName)
+ cleanupSource = source
const { browser, manageDialog } = await openFolder(appPage, fixture.name)
await selectFileThroughVisibleAction(
appPage,
@@ -619,26 +657,32 @@ test.describe('GFS Upload v2 — approved negative Desktop journeys', () => {
)
.toMatchObject({ kind: 'file', bytes: source.byteLength, deleted: false })
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
})
test('fails visibly when the user grant is revoked during an upload', async ({ appPage }) => {
const fixtureName = uniqueGfsFixtureName('e2e-gfs-v2-negative-revoke-desktop')
- const fixture = seedGfsDirectoryFixture(fixtureName)
- const userId = getE2EUserId()
- seedGfsGrant({
- resourceId: fixture.resourceId,
- subjectType: 'user',
- subjectId: userId,
- permissions: ['read', 'write', 'delete'],
- inherit: true,
- grantedBy: 'e2e:gfs-upload-v2-negative',
- })
- const source = await createDiskUploadFixture(64 * 1024 * 1024, '.bin', fixtureName)
+ let cleanupFixture: ReturnType<typeof seedGfsDirectoryFixture> | undefined
+ let cleanupSource: Awaited<ReturnType<typeof createDiskUploadFixture>> | undefined
try {
+ const fixture = seedGfsDirectoryFixture(fixtureName)
+ cleanupFixture = fixture
+ const userId = getE2EUserId()
+ seedGfsGrant({
+ resourceId: fixture.resourceId,
+ subjectType: 'user',
+ subjectId: userId,
+ permissions: ['read', 'write', 'delete'],
+ inherit: true,
+ grantedBy: 'e2e:gfs-upload-v2-negative',
+ })
+ const source = await createDiskUploadFixture(64 * 1024 * 1024, '.bin', fixtureName)
+ cleanupSource = source
const { browser, manageDialog } = await openFolder(appPage, fixture.name)
await selectFileThroughVisibleAction(
appPage,
@@ -664,9 +708,11 @@ test.describe('GFS Upload v2 — approved negative Desktop journeys', () => {
)
.toBeNull()
} finally {
- await removeDiskUploadFixture(source)
- cleanupGfsFixture(fixtureName)
- assertGfsFixtureCleaned(fixtureName)
+ if (cleanupSource) await removeDiskUploadFixture(cleanupSource)
+ if (cleanupFixture) {
+ cleanupGfsFixture(fixtureName)
+ assertGfsFixtureCleaned(fixtureName)
+ }
}
})
})