Skip to content

Commit

Permalink
fix: tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@eirikhaugstulen
eirikhaugstulen committed Nov 12, 2024
1 parent c1bf06d commit 09882a2
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 39 deletions.
14 changes: 6 additions & 8 deletions cypress/e2e/WorkingLists/TeiWorkingLists/TeiBulkActions/TeiBulkActions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,22 @@ Feature: User facing tests for bulk actions on Tracked Entity working lists
Then the filters should be disabled

Scenario: The user should see an error message when trying to bulk complete enrollments with errors
Given you open the main page with Ngelehun and Malaria Case diagnosis context
And you select the first 5 rows
Given you open the main page with Ngelehun and Malaria focus investigation context
And you select the first 3 rows
And you click the bulk complete enrollments button
And the bulk complete enrollments modal should open
And the modal content should say: This action will complete 4 active enrollments in your selection. 1 enrollment already marked as completed will not be changed.
And the modal content should say: This action will complete 2 active enrollments in your selection. 1 enrollment already marked as completed will not be changed.
When you confirm 2 active enrollments with errors
Then an error dialog will be displayed to the user
And you close the error dialog
And the unsuccessful enrollments should still be selected

Scenario: the user should be able to bulk complete enrollments and events
Given you open the main page with Ngelehun and Malaria Case diagnosis context
And you select row number 7
And you select row number 8
And you select row number 10
Given you open the main page with Ngelehun and Malaria focus investigation context
And you select the first 4 rows
And you click the bulk complete enrollments button
And the bulk complete enrollments modal should open
And the modal content should say: This action will complete 3 active enrollments in your selection.
And the modal content should say: This action will complete 3 active enrollments in your selection. 1 enrollment already marked as completed will not be changed.
When you confirm 3 active enrollments successfully
Then the bulk complete enrollments modal should close

Expand Down
51 changes: 22 additions & 29 deletions cypress/e2e/WorkingLists/TeiWorkingLists/TeiBulkActions/TeiBulkActions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ Given('you open the main page with Ngelehun and Malaria Case diagnosis context',
cy.visit('#/?programId=qDkgAbB5Jlk&orgUnitId=DiszpKrYNg8');
});

Given('you open the main page with Ngelehun and Malaria focus investigation context', () => {
cy.visit('#/?programId=M3xtLkYBlKI&orgUnitId=DiszpKrYNg8');
});

Given('you open the main page with Ngelehun and WHO RMNCH Tracker context', () => {
cy.visit('#/?programId=WSGAb5XwJ3Y&orgUnitId=DiszpKrYNg8');
});
Expand All @@ -34,6 +38,9 @@ Then('you confirm 3 active enrollments successfully', () => {
cy.intercept({
method: 'POST',
url: '**/tracker?async=false&importStrategy=UPDATE&importMode=VALIDATE',
}, {
statusCode: 200,
body: {},
}).as('completeEnrollmentsDryRun');

cy.intercept({
Expand All @@ -60,22 +67,14 @@ Then('you confirm 3 active enrollments successfully', () => {
// Should be 3 enrollments
expect(enrollments).to.have.length(3);

// The enrollment with id 'xlLV3hNvsIb' should be completed with no events
const enrollment = enrollments.find(e => e.enrollment === 'xlLV3hNvsIb');
expect(enrollment).to.include({ enrollment: 'xlLV3hNvsIb', status: 'COMPLETED' });
expect(enrollment.events).to.have.length(0);

// The enrollment with id 'h4W0ax873Zq' should be completed with one completed event
const enrollment2 = enrollments.find(e => e.enrollment === 'h4W0ax873Zq');
expect(enrollment2).to.include({ enrollment: 'h4W0ax873Zq', status: 'COMPLETED' });
expect(enrollment2.events).to.have.length(1);
expect(enrollment2.events[0]).to.include({ event: 'WSBZ189OfQd', status: 'COMPLETED' });

// The enrollment with id 'YBXMrojc2Wn' should be completed with one completed event
const enrollment3 = enrollments.find(e => e.enrollment === 'vky6UDe2QEG');
expect(enrollment3).to.include({ enrollment: 'vky6UDe2QEG', status: 'COMPLETED' });
expect(enrollment3.events).to.have.length(1);
expect(enrollment3.events[0]).to.include({ event: 'gIuo0V0CTj5', status: 'COMPLETED' });
// Assert that all enrollments are completed
enrollments.forEach((enrollment) => {
expect(enrollment).to.include({ status: 'COMPLETED' });

enrollment.events.forEach((event) => {
expect(event).to.include({ status: 'COMPLETED' });
});
});
});
});

Expand Down Expand Up @@ -134,7 +133,7 @@ When('you confirm 1 active enrollment without completing events successfully', (
expect(enrollments).to.have.length(1);

// Assert that first enrollment is completed with one completed event
expect(enrollments[0]).to.include({ enrollment: 'Rkx1QOZeBra', status: 'COMPLETED' });
expect(enrollments[0]).to.include({ status: 'COMPLETED' });
expect(enrollments[0].events).to.have.length(0);
});
});
Expand All @@ -160,23 +159,17 @@ When('you confirm 2 active enrollments with errors', () => {
cy.wait('@completeEnrollmentsDryRun')
.then((interception) => {
expect(interception.response.statusCode).to.eq(409);
expect(interception.request.body.enrollments).to.have.length(4);
expect(interception.request.body.enrollments).to.have.length(2);
});

cy.wait('@completeEnrollments')
.its('request.body')
.should(({ enrollments }) => {
// The bad data should be filtered out and not sent to the server
expect(enrollments).to.have.length(2);

const enrollment1 = enrollments.find(e => e.enrollment === 'Rkx1QOZeBra');
expect(enrollment1).to.include({ enrollment: 'Rkx1QOZeBra', status: 'COMPLETED' });
expect(enrollment1.events).to.have.length(1);
expect(enrollment1.events[0]).to.include({ event: 'TIU452W5bI1', status: 'COMPLETED' });
expect(enrollments).to.have.length(1);

const enrollment2 = enrollments.find(e => e.enrollment === 'JAfTBlr2Cj2');
expect(enrollment2).to.include({ enrollment: 'JAfTBlr2Cj2', status: 'COMPLETED' });
expect(enrollment2.events).to.have.length(0);
const enrollment = enrollments[0];
expect(enrollment).to.include({ enrollment: 'MqSC9Vuckeh', status: 'COMPLETED' });
});
});

Expand All @@ -193,11 +186,11 @@ Then('an error dialog will be displayed to the user', () => {

cy.get('[data-test="bulk-complete-enrollments-dialog"]')
.find('li')
.should('have.length', 5);
.should('have.length', 2);

cy.get('[data-test="bulk-complete-enrollments-dialog"]')
.find('li')
.contains('Mandatory DataElement `f9xYwUwrHq9` is not present');
.contains('Mandatory DataElement `fjdU9F6EngS` is not present');
});

When('you close the error dialog', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...WorkingListsCommon/EventBulkActions/Actions/CompleteAction/hooks/useBulkCompleteEvents.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const useBulkCompleteEvents = ({
const filterQueryParam: string = supportForFeature ? 'events' : 'event';

return ({
fields: '*,!dataValues,!relationships',
fields: '*,!completedAt,!completedBy,!dataValues,!relationships',
[filterQueryParam]: Object.keys(selectedRows).join(supportForFeature ? ',' : ';'),
});
},
Expand Down
2 changes: 1 addition & 1 deletion ...Lists/TrackedEntityBulkActions/Actions/CompleteAction/hooks/useCompleteBulkEnrollments.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export const useCompleteBulkEnrollments = ({

return ({
program: programId,
fields: 'trackedEntity,enrollments[*,!attributes,!relationships,events[*,!dataValues,!relationships]]',
fields: 'trackedEntity,enrollments[*,!attributes,!completedBy,!completedAt,!relationships,events[*,!dataValues,!completedAt,!completedBy,!relationships]]',
[filterQueryParam]: Object.keys(selectedRows).join(supportForFeature ? ',' : ';'),
});
},
Expand Down

0 comments on commit 09882a2

Please sign in to comment.