From eac44141e165cff4b1d98fb02e950ba509fd7fbf Mon Sep 17 00:00:00 2001 From: ANSINGH Date: Fri, 25 Aug 2023 10:21:59 -0700 Subject: [PATCH 1/2] AT fixes and addition of edx-1251 --- .../stepThreeVerifyData/DetailComponent.vue | 5 +- tests-e2e/cypress.config.ts | 3 +- .../sdcSchoolCollectionStepFive.cy.ts | 47 ++++ .../sdcSchoolCollectionStepFour.cy.ts | 46 +++ .../sdcSchoolCollectionStepThree.cy.ts | 52 ++++ .../sdcSchoolCollectionStepTwo.cy.ts | 3 +- .../sdcSchoolCollectionView.cy.ts | 70 +---- .../services/sdc-collection-api-service.ts | 265 ++++++++++++++---- tests-e2e/cypress/support/selectors.ts | 19 +- 9 files changed, 380 insertions(+), 130 deletions(-) create mode 100644 tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepFive.cy.ts create mode 100644 tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepFour.cy.ts create mode 100644 tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepThree.cy.ts diff --git a/frontend/src/components/sdcCollection/stepThreeVerifyData/DetailComponent.vue b/frontend/src/components/sdcCollection/stepThreeVerifyData/DetailComponent.vue index 92a8a61b1..871cf3c01 100644 --- a/frontend/src/components/sdcCollection/stepThreeVerifyData/DetailComponent.vue +++ b/frontend/src/components/sdcCollection/stepThreeVerifyData/DetailComponent.vue @@ -73,7 +73,10 @@ - Students Found: {{ totalElements }} + Students Found: {{ totalElements }} { diff --git a/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepFive.cy.ts b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepFive.cy.ts new file mode 100644 index 000000000..63894ce7c --- /dev/null +++ b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepFive.cy.ts @@ -0,0 +1,47 @@ +import selectors from "../../support/selectors"; +import { AppSetupData } from '../../../cypress.config'; +import { SchoolCollection } from "tests-e2e/cypress/services/sdc-collection-api-service"; + +describe('SDC School Collection View', () => { + context('As an EDX School User', () => { + before(() => { + cy.task('dataLoad').then(res => { + cy.task('setup-collections', { + school: res.school, + loadWithStudentAndValidations: true, + seedData: 'stepThreeSeedData' + }); + cy.task('setup-schoolUser', { schoolCodes: ['99998'] }); + }); + }); + after(() => cy.logout()); + beforeEach(() => cy.login()); + + it('can load dashboard & click data collection card & process collection', () => { + cy.visit('/'); + cy.get(selectors.dashboard.title).contains('Dashboard | EDX Automation Testing School'); + cy.get(selectors.dashboard.dataCollectionsTileTitle).contains('Data Collections'); + cy.get(selectors.dashboard.dataCollectionsTile).click(); + cy.get(selectors.dataCollectionsLanding.title).should('exist').contains('Student Level Data (1701) | EDX Automation Testing School'); + cy.get(selectors.dataCollectionsLanding.continue).contains('Continue').click(); + cy.get(selectors.studentLevelData.nextButton).click(); + cy.get(selectors.studentLevelData.nextButton).click(); + cy.get(selectors.studentLevelData.nextButton).click(); + cy.get(selectors.studentLevelData.nextButton).click(); + + // Step five of collection - school contacts + cy.get(selectors.schoolContacts.subjectHeading).contains('99899998 - EDX Automation Testing School'); + cy.get(selectors.schoolContacts.newContactButton).click(); + cy.get(selectors.schoolContacts.newContactTypeDropdown).parent().click(); + cy.get(selectors.schoolContacts.listItem).contains('Principal').click(); + cy.get(selectors.schoolContacts.newContactLastNameInput).type('Fake Principal'); + cy.get(selectors.schoolContacts.newContactEmailInput).type('fake@gmail.com'); + cy.get(selectors.schoolContacts.newContactPhoneNumberInput).type('1231231234'); + cy.get(selectors.schoolContacts.newContactEffectiveDateTextField).click(); + cy.get(selectors.schoolContacts.newContactCalendar).contains('Select').click(); + cy.get(selectors.schoolContacts.newContactPostBtn).click(); + cy.get(selectors.snackbar.mainSnackBar).should('contain', 'Success! The school contact has been created.'); + }); + + }); +}); diff --git a/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepFour.cy.ts b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepFour.cy.ts new file mode 100644 index 000000000..4f9811018 --- /dev/null +++ b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepFour.cy.ts @@ -0,0 +1,46 @@ +import selectors from "../../support/selectors"; +import { AppSetupData } from '../../../cypress.config'; +import { SchoolCollection } from "tests-e2e/cypress/services/sdc-collection-api-service"; + +describe('SDC School Collection View', () => { + context('As an EDX School User', () => { + before(() => { + cy.task('dataLoad').then(res => { + cy.task('setup-collections', { + school: res.school, + loadWithStudentAndValidations: true, + seedData: 'stepThreeSeedData' + }); + cy.task('setup-schoolUser', { schoolCodes: ['99998'] }); + }); + }); + after(() => cy.logout()); + beforeEach(() => cy.login()); + + it('can load dashboard & click data collection card & process collection', () => { + cy.visit('/'); + cy.get(selectors.dashboard.title).contains('Dashboard | EDX Automation Testing School'); + cy.get(selectors.dashboard.dataCollectionsTileTitle).contains('Data Collections'); + cy.get(selectors.dashboard.dataCollectionsTile).click(); + cy.get(selectors.dataCollectionsLanding.title).should('exist').contains('Student Level Data (1701) | EDX Automation Testing School'); + cy.get(selectors.dataCollectionsLanding.continue).contains('Continue').click(); + cy.get(selectors.studentLevelData.nextButton).click(); + cy.get(selectors.studentLevelData.nextButton).click(); + + // Step four of collection - school details + cy.get(selectors.studentLevelData.nextButton).click(); + cy.get(selectors.schoolDetails.schoolMincodeTitle).contains('99899998'); + cy.get(selectors.schoolDetails.schoolDisplayNameTitle).contains('EDX Automation Testing School'); + cy.get(selectors.schoolDetails.editButton).click(); + cy.get(selectors.schoolDetails.schoolDetailsEmail).clear(); + cy.get(selectors.schoolDetails.schoolDetailsPhoneNumber).clear(); + cy.get(selectors.studentLevelData.formHint).contains('Address, phone, and/or email must be added'); + cy.get(selectors.studentLevelData.nextButton).should('be.disabled'); + cy.get(selectors.schoolDetails.schoolDetailsEmail).type('fake@gmail.com'); + cy.get(selectors.schoolDetails.schoolDetailsPhoneNumber).type('1234567890'); + cy.get(selectors.schoolDetails.saveButton).click(); + cy.get(selectors.schoolDetails.resolveBtn).click(); + }); + + }); +}); diff --git a/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepThree.cy.ts b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepThree.cy.ts new file mode 100644 index 000000000..d56bc3328 --- /dev/null +++ b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepThree.cy.ts @@ -0,0 +1,52 @@ +import selectors from "../../support/selectors"; +import { AppSetupData } from '../../../cypress.config'; +import { SchoolCollection } from "tests-e2e/cypress/services/sdc-collection-api-service"; + +describe('SDC School Collection View', () => { + context('As an EDX School User', () => { + before(() => { + cy.task('dataLoad').then(res => { + cy.task('setup-collections', { + school: res.school, + loadWithStudentAndValidations: true, + seedData: 'stepThreeSeedData' + }); + cy.task('setup-schoolUser', { schoolCodes: ['99998'] }); + }); + }); + after(() => cy.logout()); + beforeEach(() => cy.login()); + + it('can load dashboard & click data collection card & process collection', () => { + cy.intercept(Cypress.env('interceptors').collection_students_pagination).as('pagination'); + + cy.visit('/'); + cy.get(selectors.dashboard.title).contains('Dashboard | EDX Automation Testing School'); + cy.get(selectors.dashboard.dataCollectionsTileTitle).contains('Data Collections'); + cy.get(selectors.dashboard.dataCollectionsTile).click(); + cy.get(selectors.dataCollectionsLanding.title).should('exist').contains('Student Level Data (1701) | EDX Automation Testing School'); + cy.get(selectors.dataCollectionsLanding.continue).contains('Continue').click(); + + // Step three of collection - edit/verify data + cy.get(selectors.studentLevelData.nextButton).click(); + }); + + it.only('verifies FTE for Reported Students', () => { + cy.intercept(Cypress.env('interceptors').collection_students_pagination).as('pagination'); + cy.visit('/'); + cy.get(selectors.dashboard.dataCollectionsTile).click(); + cy.get(selectors.dataCollectionsLanding.continue).contains('Continue').click(); + + // Step three of collection - edit/verify data + cy.get(selectors.studentLevelData.nextButton).click(); + cy.get(selectors.studentLevelData.studentsFound).should('exist').contains(2); + + cy.get('.td-data').each(cell => { + const cellText = cell.text() + if (cellText === '1' || cellText === '0.875') { + cy.log('Correct fte value expected') + } + }); + }); + }); +}); diff --git a/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepTwo.cy.ts b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepTwo.cy.ts index 2a7b4f97b..3e09f1013 100644 --- a/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepTwo.cy.ts +++ b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepTwo.cy.ts @@ -8,7 +8,8 @@ describe('SDC School Collection View', () => { cy.task('dataLoad').then(res => { cy.task('setup-collections', { school: res.school, - loadWithStudentAndValidations: true + loadWithStudentAndValidations: true, + seedData: 'stepTwoSeedData' }); cy.task('setup-schoolUser', { schoolCodes: ['99998'] }); }); diff --git a/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionView.cy.ts b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionView.cy.ts index d3bc5530f..0906b684c 100644 --- a/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionView.cy.ts +++ b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionView.cy.ts @@ -6,16 +6,18 @@ describe('SDC School Collection View', () => { context('As an EDX School User', () => { before(() => { cy.task('dataLoad').then(res => { - cy.task('setup-collections',{ + cy.task('setup-collections', { school: res.school, - loadWithStudentAndValidations: false} ); + loadWithStudentAndValidations: true, + seedData: 'stepThreeSeedData' + }); cy.task('setup-schoolUser', { schoolCodes: ['99998'] }); }); }); after(() => cy.logout()); beforeEach(() => cy.login()); - it('can load dashboard & click data collection card & process collection', () => { + it('can return to previous step in collection', () => { cy.visit('/'); cy.get(selectors.dashboard.title).contains('Dashboard | EDX Automation Testing School'); cy.get(selectors.dashboard.dataCollectionsTileTitle).contains('Data Collections'); @@ -23,61 +25,6 @@ describe('SDC School Collection View', () => { cy.get(selectors.dataCollectionsLanding.title).should('exist').contains('Student Level Data (1701) | EDX Automation Testing School'); cy.get(selectors.dataCollectionsLanding.continue).contains('Continue').click(); - //step one of collection - cy.get(selectors.studentLevelData.documentUploadButton).click(); - cy.get(selectors.documentUpload.selectFileInput).selectFile('./cypress/uploads/sample-2-student-fnchars.std', {force: true}); - cy.get(selectors.dataCollectionsLanding.title).should('exist').contains('Student Level Data (1701) | EDX Automation Testing School'); - - // Timeout exception made since time to upload is variable depending on the file size and format. - cy.get(selectors.snackbar.mainSnackBar, {timeout: 10000}).contains('Your document was uploaded successfully.'); - cy.get(selectors.studentLevelData.nextButton, {timeout: 15000}).should('exist').click(); - - // step two of collection - review and fix data - cy.get(selectors.studentLevelData.nextButton).click(); - - //step three of collection - edit/verify data - cy.get(selectors.studentLevelData.nextButton).click(); - - // step four of collection - cy.get(selectors.schoolDetails.schoolMincodeTitle).contains('99899998'); - cy.get(selectors.schoolDetails.schoolDisplayNameTitle).contains('EDX Automation Testing School'); - cy.get(selectors.schoolDetails.editButton).click(); - cy.get(selectors.schoolDetails.schoolDetailsEmail).clear(); - cy.get(selectors.schoolDetails.schoolDetailsPhoneNumber).clear(); - cy.get(selectors.studentLevelData.formHint).contains('Address, phone, and/or email must be added'); - cy.get(selectors.studentLevelData.nextButton).should('be.disabled'); - cy.get(selectors.schoolDetails.schoolDetailsEmail).type('fake@gmail.com'); - cy.get(selectors.schoolDetails.schoolDetailsPhoneNumber).type('1234567890'); - cy.get(selectors.schoolDetails.saveButton).click(); - cy.get(selectors.schoolDetails.resolveBtn).click(); - cy.get(selectors.studentLevelData.nextButton).click(); - - //step five of collection - cy.get(selectors.schoolContacts.subjectHeading).contains('99899998 - EDX Automation Testing School'); - cy.get(selectors.schoolContacts.newContactButton).click(); - cy.get(selectors.schoolContacts.newContactTypeDropdown).parent().click(); - cy.get(selectors.schoolContacts.listItem).contains('Principal').click(); - cy.get(selectors.schoolContacts.newContactLastNameInput).type('Fake Principal'); - cy.get(selectors.schoolContacts.newContactEmailInput).type('fake@gmail.com'); - cy.get(selectors.schoolContacts.newContactPhoneNumberInput).type('1231231234'); - cy.get(selectors.schoolContacts.newContactEffectiveDateTextField).click(); - cy.get(selectors.schoolContacts.newContactCalendar).contains('Select').click(); - cy.get(selectors.schoolContacts.newContactPostBtn).click(); - cy.get(selectors.studentLevelData.nextButton).click(); - - }); - - it('can return to previous step in collection', () => { - cy.visit('/'); - cy.get(selectors.dashboard.dataCollectionsTile).click(); - cy.get(selectors.dataCollectionsLanding.continue).contains('Continue').click(); - - //step one of collection - upload file - cy.get(selectors.studentLevelData.documentUploadButton).click(); - cy.get(selectors.documentUpload.selectFileInput).selectFile('./cypress/uploads/sample-2-student-fnchars.std', {force: true}); - cy.get(selectors.dataCollectionsLanding.title).should('exist').contains('Student Level Data (1701) | EDX Automation Testing School'); - cy.get(selectors.studentLevelData.nextButton, {timeout: 15000}).should('exist').should('be.enabled').click(); - // step two of collection - review and fix data cy.get(selectors.studentLevelData.nextButton).should('exist').should('be.enabled').click(); @@ -85,13 +32,14 @@ describe('SDC School Collection View', () => { cy.get(selectors.studentLevelData.nextButton).should('exist').should('be.enabled').click(); // checking if the previous button is clickable and the user is taken to the previous step; brings to step 2 - cy.get(selectors.studentLevelData.stepTwo).should('exist').should('be.enabled').click(); + cy.get(selectors.studentLevelData.stepTwo).should('exist').click(); // Step three should be disabled - cy.get(selectors.studentLevelData.stepThree).should('exist').should('be.disabled'); + cy.get(selectors.studentLevelData.stepThree).should('exist').should('not.be.enabled'); // User moved to next step by clicking next button - cy.get(selectors.studentLevelData.nextButton).should('exist').should('be.enabled').click(); + cy.get(selectors.studentLevelData.nextButton).should('exist').should('be.enabled'); + cy.get(selectors.studentLevelData.nextButton).click(); }); }); diff --git a/tests-e2e/cypress/services/sdc-collection-api-service.ts b/tests-e2e/cypress/services/sdc-collection-api-service.ts index 77ee27c3a..adb325a00 100644 --- a/tests-e2e/cypress/services/sdc-collection-api-service.ts +++ b/tests-e2e/cypress/services/sdc-collection-api-service.ts @@ -5,6 +5,7 @@ import {RestUtils} from "../helpers/rest-utils-ts"; export interface SchoolCollection { school: SchoolEntity, loadWithStudentAndValidations: boolean + seedData?: string } const COLLECTION_ENDPOINT = '/api/v1/student-data-collection/collection'; @@ -63,63 +64,213 @@ export class SdcCollectionApiService { let sdcSchoolCollectionPayload = {}; if(schoolCollection?.loadWithStudentAndValidations) { - sdcSchoolCollectionPayload = { - "createUser": "EDXAT", - "updateUser": null, - "createDate": null, - "updateDate": null, - "sdcSchoolCollectionID": null, - "collectionID": newCollection.collectionID, - "schoolID": schoolCollection?.school.schoolId, - "districtID": schoolCollection?.school.districtId, - "uploadDate": "20230822", - "uploadFileName": "EDX-AT-FILE.std", - "sdcSchoolCollectionStatusCode": "LOADED", - "collectionTypeCode": "SEPTEMBER", - "collectionOpenDate": curDate, - "collectionCloseDate": curCloseDate, - "students": [ - { - "createUser": "EDXAT", - "sdcSchoolCollectionStudentEnrolledPrograms": null, - "localID": "12345", - "studentPen": "101932770", - "legalFirstName": "LEGALFIRST", - "legalMiddleNames": "LEGALMIDDLE", - "legalLastName": null, - "usualFirstName": "USUALFIRST", - "usualMiddleNames": "USUALMIDDLE", - "usualLastName": "USUALLAST", - "dob": "20100630", - "gender": "M", - "specialEducationCategoryCode": null, - "schoolFundingCode": "20", - "nativeAncestryInd": "N", - "homeLanguageSpokenCode": "943", - "otherCourses": "0", - "supportBlocks": null, - "enrolledGradeCode": "11", - "careerProgramCode": "XH", - "numberOfCourses": "0700", - "bandCode": "0684", - "enrolledProgramCodes": "40", - "sdcSchoolCollectionStudentStatusCode": "ERROR", - "sdcSchoolCollectionStudentValidationIssues": [ - { - "createUser": "EDXAT", - "validationIssueSeverityCode": "ERROR", - "validationIssueCode": "LEGALLASTNAMEBLANK", - "validationIssueFieldCode": "LEGAL_LAST_NAME" - }, - { - "createUser": "EDXAT", - "validationIssueSeverityCode": "INFO_WARNING", - "validationIssueCode": "MISSINGPOSTALCODE", - "validationIssueFieldCode": "POSTAL_CODE" - } - ] - } - ] + if (schoolCollection.seedData === 'stepTwoSeedData') { + sdcSchoolCollectionPayload = { + "createUser": "EDXAT", + "updateUser": null, + "createDate": null, + "updateDate": null, + "sdcSchoolCollectionID": null, + "collectionID": newCollection.collectionID, + "schoolID": schoolCollection?.school.schoolId, + "districtID": schoolCollection?.school.districtId, + "uploadDate": "20230822", + "uploadFileName": "EDX-AT-FILE.std", + "sdcSchoolCollectionStatusCode": "LOADED", + "collectionTypeCode": "SEPTEMBER", + "collectionOpenDate": curDate, + "collectionCloseDate": curCloseDate, + "students": [ + { + "createUser": "EDXAT", + "sdcSchoolCollectionStudentEnrolledPrograms": null, + "localID": "12345", + "studentPen": "101932770", + "legalFirstName": "LEGALFIRST", + "legalMiddleNames": "LEGALMIDDLE", + "legalLastName": null, + "usualFirstName": "USUALFIRST", + "usualMiddleNames": "USUALMIDDLE", + "usualLastName": "USUALLAST", + "dob": "20100630", + "gender": "M", + "specialEducationCategoryCode": null, + "schoolFundingCode": "20", + "nativeAncestryInd": "N", + "homeLanguageSpokenCode": "943", + "otherCourses": "0", + "supportBlocks": null, + "enrolledGradeCode": "11", + "careerProgramCode": "XH", + "numberOfCourses": "0700", + "bandCode": "0684", + "enrolledProgramCodes": "40", + "isAdult": "false", + "isSchoolAged": "true", + "sdcSchoolCollectionStudentStatusCode": "ERROR", + "sdcSchoolCollectionStudentValidationIssues": [ + { + "createUser": "EDXAT", + "validationIssueSeverityCode": "ERROR", + "validationIssueCode": "LEGALLASTNAMEBLANK", + "validationIssueFieldCode": "LEGAL_LAST_NAME" + }, + { + "createUser": "EDXAT", + "validationIssueSeverityCode": "INFO_WARNING", + "validationIssueCode": "MISSINGPOSTALCODE", + "validationIssueFieldCode": "POSTAL_CODE" + } + ] + } + + + ] + } + } else if (schoolCollection.seedData === 'stepThreeSeedData') { + sdcSchoolCollectionPayload = { + "createUser": "EDXAT", + "updateUser": null, + "createDate": null, + "updateDate": null, + "sdcSchoolCollectionID": null, + "collectionID": newCollection.collectionID, + "schoolID": schoolCollection?.school.schoolId, + "districtID": schoolCollection?.school.districtId, + "uploadDate": "20230822", + "uploadFileName": "EDX-AT-FILE.std", + "sdcSchoolCollectionStatusCode": "LOADED", + "collectionTypeCode": "SEPTEMBER", + "collectionOpenDate": curDate, + "collectionCloseDate": curCloseDate, + "students": [ + { + "createUser": "EDXAT", + "localID": "12345", + "studentPen": "101932770", + "legalFirstName": "LEGALFIRST", + "legalMiddleNames": null, + "legalLastName": "LEGALLAST", + "usualFirstName": "USUALFIRST", + "usualMiddleNames": "USUALMIDDLE", + "usualLastName": "USUALLAST", + "dob": "20090630", + "gender": "M", + "specialEducationCategoryCode": null, + "schoolFundingCode": "20", + "nativeAncestryInd": "N", + "homeLanguageSpokenCode": "943", + "otherCourses": "0", + "supportBlocks": null, + "enrolledGradeCode": "07", + "careerProgramCode": null, + "numberOfCourses": "0700", + "bandCode": "0684", + "enrolledProgramCodes": "40", + "sdcSchoolCollectionStudentStatusCode": "FIXABLE", + "isAdult": "false", + "isSchoolAged": "true", + "fte": 1, + "postalCode": "V8R2Y9", + "fteZeroReasonCode": null, + "frenchProgramNonEligReasonCode": null, + "ellNonEligReasonCode": "NTENRELL", + "indigenousSupportProgramNonEligReasonCode": "NTENRINDIG", + "careerProgramNonEligReasonCode": "NTENRCAREE", + "specialEducationNonEligReasonCode": "NOSPECIAL", + "isGraduated": "false", + "assignedStudentId": null, + "assignedPen": null, + "sdcSchoolCollectionStudentValidationIssues": [], + "sdcSchoolCollectionStudentEnrolledPrograms": [ + { + "createUser": "EDXAT", + "updateUser": null, + "createDate": null, + "updateDate": null, + "enrolledProgramCode": "14" + }, + { + "createUser": "EDXAT", + "updateUser": null, + "createDate": null, + "updateDate": null, + "enrolledProgramCode": "14" + } + ] + }, + { + "createUser": "EDXAT", + "localID": "12345", + "studentPen": "102866365", + "legalFirstName": "LEGALFIRST", + "legalMiddleNames": null, + "legalLastName": "LEGALLAST", + "usualFirstName": "USUALFIRST", + "usualMiddleNames": "USUALMIDDLE", + "usualLastName": "USUALLAST", + "dob": "20070702", + "gender": "F", + "specialEducationCategoryCode": null, + "schoolFundingCode": "20", + "nativeAncestryInd": "N", + "homeLanguageSpokenCode": "943", + "otherCourses": "0", + "supportBlocks": null, + "enrolledGradeCode": "07", + "careerProgramCode": null, + "numberOfCourses": "0700", + "bandCode": "0684", + "postalCode": "V8R2Y9", + "enrolledProgramCodes": "40", + "sdcSchoolCollectionStudentStatusCode": "FIXABLE", + "isAdult": "false", + "isSchoolAged": "true", + "fte": 0.875, + "fteZeroReasonCode": null, + "frenchProgramNonEligReasonCode": null, + "ellNonEligReasonCode": "NTENRELL", + "indigenousSupportProgramNonEligReasonCode": "NTENRINDIG", + "careerProgramNonEligReasonCode": "NTENRCAREE", + "specialEducationNonEligReasonCode": "NOSPECIAL", + "isGraduated": "false", + "assignedStudentId": null, + "assignedPen": null, + "sdcSchoolCollectionStudentValidationIssues": [], + "sdcSchoolCollectionStudentEnrolledPrograms": [ + { + "createUser": "EDXAT", + "updateUser": null, + "createDate": null, + "updateDate": null, + "enrolledProgramCode": "40" + }, + { + "createUser": "EDXAT", + "updateUser": null, + "createDate": null, + "updateDate": null, + "enrolledProgramCode": "40" + }, + { + "createUser": "EDXAT", + "updateUser": null, + "createDate": null, + "updateDate": null, + "enrolledProgramCode": "08" + }, + { + "createUser": "EDXAT", + "updateUser": null, + "createDate": null, + "updateDate": null, + "enrolledProgramCode": "08" + } + ] + }, + ] + } + } } else { diff --git a/tests-e2e/cypress/support/selectors.ts b/tests-e2e/cypress/support/selectors.ts index ed2ea308b..fa1a68b58 100644 --- a/tests-e2e/cypress/support/selectors.ts +++ b/tests-e2e/cypress/support/selectors.ts @@ -199,19 +199,20 @@ export default { mainSnackBar: '#mainSnackBar' }, studentLevelData: { - formHint: 'p.form-hint', - nextButton: '#nextButton', documentUploadButton: '#uploadButton', - stepOne:'#step-1', - stepTwo:'#step-2', - stepThree:'#step-3', - stepFour:'#step-4', - stepFive:'#step-5', - stepSix:'#step-6', + formHint: 'p.form-hint', legalLastNameValidationTextInput: '#legalLastNameValidationTextInput', + nextButton: '#nextButton', postalCodeValidationTextInput: '#postalCodeValidationTextInput', removeRecord: '#removeRecord', - saveAndRefreshButton: '#saveAndRefreshButton' + saveAndRefreshButton: '#saveAndRefreshButton', + stepFive:'#step-5', + stepFour:'#step-4', + stepOne:'#step-1', + stepSix:'#step-6', + stepThree:'#step-3', + stepTwo:'#step-2', + studentsFound: '#studentsFound', }, userActivationPage: { mincodeInput: '#instituteIdentifierTextField', From 37088314b661a1288c79a13aaa502e633c7b9181 Mon Sep 17 00:00:00 2001 From: ANSINGH Date: Fri, 25 Aug 2023 10:26:16 -0700 Subject: [PATCH 2/2] minor bug fix; code clean --- tests-e2e/cypress.config.ts | 3 +-- .../e2e/sdc-collection/sdcSchoolCollectionStepThree.cy.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests-e2e/cypress.config.ts b/tests-e2e/cypress.config.ts index a977e4774..2528343b6 100644 --- a/tests-e2e/cypress.config.ts +++ b/tests-e2e/cypress.config.ts @@ -47,8 +47,7 @@ export default defineConfig({ viewportWidth: 1920, defaultCommandTimeout: 5000, e2e: { - // baseUrl: 'https://dev.educationdataexchange.gov.bc.ca', - baseUrl: 'http://localhost:8081', + baseUrl: 'https://dev.educationdataexchange.gov.bc.ca', setupNodeEvents(on, config) { on('task', { 'dataLoad': async (options: InstituteOptions) => { diff --git a/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepThree.cy.ts b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepThree.cy.ts index d56bc3328..755d06492 100644 --- a/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepThree.cy.ts +++ b/tests-e2e/cypress/e2e/sdc-collection/sdcSchoolCollectionStepThree.cy.ts @@ -31,7 +31,7 @@ describe('SDC School Collection View', () => { cy.get(selectors.studentLevelData.nextButton).click(); }); - it.only('verifies FTE for Reported Students', () => { + it('verifies FTE for Reported Students', () => { cy.intercept(Cypress.env('interceptors').collection_students_pagination).as('pagination'); cy.visit('/'); cy.get(selectors.dashboard.dataCollectionsTile).click();