diff --git a/experiment/src/client/test/integration/AssayImportRunAction.ispec.ts b/experiment/src/client/test/integration/AssayImportRunAction.ispec.ts index 93f2fc05ec5..6cb47738cd0 100644 --- a/experiment/src/client/test/integration/AssayImportRunAction.ispec.ts +++ b/experiment/src/client/test/integration/AssayImportRunAction.ispec.ts @@ -221,9 +221,9 @@ describe('assay-importRun.api', () => { const run = await getRunQueryRow(server, ASSAY_A_NAME, runId, topFolderOptions); const expectedUrl = `/${encodeURIComponent(PROJECT_NAME)}/core-downloadFileLink.view?propertyId=`; const runBatchField = `Batch/${BATCH_FILE_FIELD_NAME}`; - expect(run[runBatchField].value).toEqual(`assaydata/${batchFileName}`); + expect(run[runBatchField].value.replaceAll('\\', '/')).toEqual(`assaydata/${batchFileName}`); expect(run[runBatchField].url).toContain(expectedUrl); - expect(run[RUN_FILE_FIELD_NAME].value).toEqual(`assaydata/${runFileName}`); + expect(run[RUN_FILE_FIELD_NAME].value.replaceAll('\\', '/')).toEqual(`assaydata/${runFileName}`); expect(run[RUN_FILE_FIELD_NAME].url).toContain(expectedUrl); // Verify audit log @@ -504,9 +504,9 @@ describe('assay-importRun.api', () => { const run = await getRunQueryRow(server, ASSAY_A_NAME, runId, topFolderOptions); const expectedUrl = `/${encodeURIComponent(PROJECT_NAME)}/core-downloadFileLink.view?propertyId=`; const runBatchField = `Batch/${BATCH_FILE_FIELD_TWO_NAME}`; - expect(run[runBatchField].value).toEqual(`assaydata/${batchFileName}`); + expect(run[runBatchField].value.replaceAll('\\', '/')).toEqual(`assaydata/${batchFileName}`); expect(run[runBatchField].url).toContain(expectedUrl); - expect(run[RUN_FILE_FIELD_NAME].value).toEqual(`assaydata/${runFileName}`); + expect(run[RUN_FILE_FIELD_NAME].value.replaceAll('\\', '/')).toEqual(`assaydata/${runFileName}`); expect(run[RUN_FILE_FIELD_NAME].url).toContain(expectedUrl); // Verify audit log diff --git a/experiment/src/client/test/integration/utils.ts b/experiment/src/client/test/integration/utils.ts index 29afefd71d8..fc49ebb52a8 100644 --- a/experiment/src/client/test/integration/utils.ts +++ b/experiment/src/client/test/integration/utils.ts @@ -463,7 +463,7 @@ async function verifyDomainCreateFailure(server: IntegrationTestServer, domainTy }, {...folderOptions, ...userOptions}); expect(badDomainNameResp['body']['success']).toBeFalsy(); - expect(badDomainNameResp['body']['exception']).toBe(error.replace('REPLACE', badDomainName)); + expect(badDomainNameResp['body']['exception']).toBe(error.replace('REPLACE', () => badDomainName)); } async function verifyDomainUpdateFailure(server: IntegrationTestServer, domainId: number, domainURI: string, dataTypeRowId/*needed for updating dataclass*/: number, badDomainName: string, error: string, folderOptions: RequestOptions, userOptions: RequestOptions, domainFields?: any[]) { @@ -488,7 +488,7 @@ async function verifyDomainUpdateFailure(server: IntegrationTestServer, domainId const badDomainNameResp = await server.post('property', 'saveDomain', updatedDomainPayload, {...folderOptions, ...userOptions}); expect(badDomainNameResp['body']['success']).toBeFalsy(); - expect(badDomainNameResp['body']['exception']).toBe(error.replace('REPLACE', badDomainName)); + expect(badDomainNameResp['body']['exception']).toBe(error.replace('REPLACE', () => badDomainName)); } async function verifyDomainCreateSuccess(server: IntegrationTestServer, domainType: string, domainName: string, folderOptions: RequestOptions, userOptions: RequestOptions) { @@ -502,6 +502,8 @@ async function verifyDomainCreateSuccess(server: IntegrationTestServer, domainTy } }, {...folderOptions, ...userOptions}).expect((result) => { const domain = JSON.parse(result.text); + expect(domain).toHaveProperty('domainId'); + expect(domain).toHaveProperty('domainURI'); domainId = domain.domainId; domainURI = domain.domainURI; return true; @@ -626,6 +628,8 @@ export async function verifyRequiredLineageInsertUpdate(server: IntegrationTestS } }, {...topFolderOptions, ...designerReaderOptions}).expect((result) => { const domain = JSON.parse(result.text); + expect(domain).toHaveProperty('domainId'); + expect(domain).toHaveProperty('domainURI'); childDomainId = domain.domainId; childDomainURI = domain.domainURI; return true;