Skip to content

Commit f8fe2e0

Browse files
committed
Update jest integration tests
1 parent c5c1723 commit f8fe2e0

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

experiment/src/client/test/integration/MoveSamplesAction.ispec.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -478,13 +478,14 @@ describe('Move Samples', () => {
478478
schemaName: 'samples',
479479
queryName: SAMPLE_TYPE_NAME_1,
480480
rows: [{ rowId: sampleRowId }],
481+
auditBehavior: "NONE", // sample default audit level is DETAILS, api override have no effect
481482
}, {...topFolderOptions, ...editorUserOptions}).expect(200);
482483

483484
// Assert
484485
const {updateCounts} = response.body;
485486
expect(updateCounts.samples).toBe(1);
486487
expect(updateCounts.sampleAliases).toBe(0);
487-
expect(updateCounts.sampleAuditEvents).toBe(0);
488+
expect(updateCounts.sampleAuditEvents).toBe(1);
488489

489490
const sampleExistsInTop = await sampleExists(server, sampleRowId, topFolderOptions, editorUserOptions, SAMPLE_TYPE_NAME_1);
490491
expect(sampleExistsInTop).toBe(false);
@@ -496,7 +497,9 @@ describe('Move Samples', () => {
496497
const sampleEventsInTop = await getSampleTimelineAuditLogs(sampleRowId, topFolderOptions);
497498
expect(sampleEventsInTop).toHaveLength(0);
498499
const sampleEventsInSub1 = await getSampleTimelineAuditLogs(sampleRowId, subfolder1Options);
499-
expect(sampleEventsInSub1).toHaveLength(0);
500+
expect(sampleEventsInSub1).toHaveLength(2);
501+
expect(caseInsensitive(sampleEventsInSub1[0], 'Comment')).toEqual("Sample folder was updated.");
502+
expect(caseInsensitive(sampleEventsInSub1[1], 'Comment')).toEqual("Sample was registered.");
500503
});
501504

502505
it('success, move sample from parent project to subfolder, detailed audit logging', async () => {
@@ -567,7 +570,7 @@ describe('Move Samples', () => {
567570
schemaName: 'samples',
568571
queryName: SAMPLE_TYPE_NAME_1,
569572
rows: [{ rowId: sampleRowId }],
570-
auditBehavior: 'SUMMARY',
573+
auditBehavior: 'SUMMARY', // sample default audit level is DETAILS, api override of 'SUMMARY' have no effect
571574
auditUserComment: userComment,
572575
}, {...topFolderOptions, ...editorUserOptions}).expect(200);
573576

@@ -587,8 +590,9 @@ describe('Move Samples', () => {
587590
const sampleEventsInTop = await getSampleTimelineAuditLogs(sampleRowId, topFolderOptions);
588591
expect(sampleEventsInTop).toHaveLength(0);
589592
const sampleEventsInSub1 = await getSampleTimelineAuditLogs(sampleRowId, subfolder1Options);
590-
expect(sampleEventsInSub1).toHaveLength(1);
591-
expect(caseInsensitive(sampleEventsInSub1[0], 'Comment')).toEqual("Sample was registered.");
593+
expect(sampleEventsInSub1).toHaveLength(2);
594+
expect(caseInsensitive(sampleEventsInSub1[0], 'Comment')).toEqual("Sample folder was updated.");
595+
expect(caseInsensitive(sampleEventsInSub1[1], 'Comment')).toEqual("Sample was registered.");
592596
});
593597

594598
it('success, move sample from subfolder to parent project', async () => {

experiment/src/client/test/integration/MoveSourcesAction.ispec.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ describe('Move Sources', () => {
469469
expect(success).toBe(true);
470470
expect(updateCounts.sources).toBe(1);
471471
expect(updateCounts.sourceAliases).toBe(0);
472-
expect(updateCounts.sourceAuditEvents).toBe(0);
472+
expect(updateCounts.sourceAuditEvents).toBe(1);
473473

474474
const existsInTop = await _sourceExists(sourceRowId, topFolderOptions);
475475
expect(existsInTop).toBe(false);
@@ -481,7 +481,9 @@ describe('Move Sources', () => {
481481
const eventsInTop = await getDetailedQueryUpdateAuditLogs(sourceRowId, topFolderOptions);
482482
expect(eventsInTop).toHaveLength(0);
483483
const eventsInSub1 = await getDetailedQueryUpdateAuditLogs(sourceRowId, subfolder1Options);
484-
expect(eventsInSub1).toHaveLength(0);
484+
expect(eventsInSub1).toHaveLength(2);
485+
expect(caseInsensitive(eventsInSub1[0], 'Comment')).toEqual("A row was updated.");
486+
expect(caseInsensitive(eventsInSub1[1], 'Comment')).toEqual("A row was inserted.");
485487
});
486488

487489
it('success, move from parent project to subfolder, detailed audit logging', async () => {
@@ -554,7 +556,7 @@ describe('Move Sources', () => {
554556
schemaName: 'exp.data',
555557
queryName: SOURCE_TYPE_NAME_1,
556558
rows: [{ RowId: sourceRowId }],
557-
auditBehavior: 'SUMMARY',
559+
auditBehavior: 'SUMMARY', // sample default audit level is DETAILS, api override have no effect
558560
auditUserComment: userComment,
559561
}, { ...topFolderOptions, ...editorUserOptions }).expect(200);
560562

@@ -575,8 +577,9 @@ describe('Move Sources', () => {
575577
const eventsInTop = await getDetailedQueryUpdateAuditLogs(sourceRowId, topFolderOptions);
576578
expect(eventsInTop).toHaveLength(0);
577579
const eventsInSub1 = await getDetailedQueryUpdateAuditLogs(sourceRowId, subfolder1Options);
578-
expect(eventsInSub1).toHaveLength(1);
579-
expect(caseInsensitive(eventsInSub1[0], 'Comment')).toEqual("A row was inserted.");
580+
expect(eventsInSub1).toHaveLength(2);
581+
expect(caseInsensitive(eventsInSub1[0], 'Comment')).toEqual("A row was updated.");
582+
expect(caseInsensitive(eventsInSub1[1], 'Comment')).toEqual("A row was inserted.");
580583
});
581584

582585
it('success, move from subfolder to parent project', async () => {

0 commit comments

Comments
 (0)