From 9a07b641ec32e1cff869cd834b7193b611e22ae9 Mon Sep 17 00:00:00 2001 From: Nursoltan Saipolda Date: Tue, 28 Sep 2021 23:47:58 +0800 Subject: [PATCH 1/2] update e2e tests --- .../project-milestone/project-milestone.helper.ts | 6 +++--- .../project-milestone/project-milestone.model.ts | 1 + .../project-settings/project-settings.helper.ts | 2 +- connect-automation/test-data/test-data.json | 3 ++- .../test-suites/milestone-flow/create-new-milestone.spec.ts | 1 + .../project-settings-flow/project-settings.spec.ts | 6 +++--- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/connect-automation/page-objects/project-milestone/project-milestone.helper.ts b/connect-automation/page-objects/project-milestone/project-milestone.helper.ts index 9448d9d24..e9bd7de56 100644 --- a/connect-automation/page-objects/project-milestone/project-milestone.helper.ts +++ b/connect-automation/page-objects/project-milestone/project-milestone.helper.ts @@ -347,9 +347,9 @@ export class ProjectMilestonePageHelper { await this.projectMilestonePageObject.yesButton.click(); logger.info('Clicked Yes button'); - const milestoneDeletionMessage = await CommonHelper.getAlertMessageAndClosePopup(); - expect(milestoneDeletionMessage).toEqual(projectMilestones.milestoneDeletionMessage); - logger.info(`Verified Delete Milestone Message ${milestoneDeletionMessage}`); + const milestoneBulkDeletionMessage = await CommonHelper.getAlertMessageAndClosePopup(); + expect(milestoneBulkDeletionMessage).toEqual(projectMilestones.milestoneBulkDeletionMessage); + logger.info(`Verified Delete Milestone Message ${milestoneBulkDeletionMessage}`); } /** diff --git a/connect-automation/page-objects/project-milestone/project-milestone.model.ts b/connect-automation/page-objects/project-milestone/project-milestone.model.ts index 515f41cbc..feba02595 100644 --- a/connect-automation/page-objects/project-milestone/project-milestone.model.ts +++ b/connect-automation/page-objects/project-milestone/project-milestone.model.ts @@ -7,6 +7,7 @@ export interface IProjectMilestone { deleteConfirmation: string; deletePopupMessage: string; milestoneDeletionMessage: string; + milestoneBulkDeletionMessage: string; copilot: string; copilotName: string; moveMilestoneDatesTitle: string; diff --git a/connect-automation/page-objects/project-settings/project-settings.helper.ts b/connect-automation/page-objects/project-settings/project-settings.helper.ts index 141990168..511a692e5 100644 --- a/connect-automation/page-objects/project-settings/project-settings.helper.ts +++ b/connect-automation/page-objects/project-settings/project-settings.helper.ts @@ -425,7 +425,7 @@ export class ProjectSettingsPageHelper { public static async specifyUploadFilePathAndClickUploadButton() { // Specify the File Upload Path const fileToUploadElement = this.projectSettingsPageObject.selectFileToUploadButton; - const fileToUpload = '../../sample.pdf'; + const fileToUpload = '../../../sample.pdf'; let absolutePath = path.resolve(__dirname, fileToUpload); absolutePath = absolutePath.replace('/temp/', '/'); await fileToUploadElement.sendKeys(absolutePath); diff --git a/connect-automation/test-data/test-data.json b/connect-automation/test-data/test-data.json index 9f0be18a7..474686854 100644 --- a/connect-automation/test-data/test-data.json +++ b/connect-automation/test-data/test-data.json @@ -83,6 +83,7 @@ "deleteConfirmation": "Deletion Confirmation", "deletePopupMessage": "Are you sure you want to delete the selected Milestone (s)?", "milestoneDeletionMessage": "PROJECT MILESTONE DELETED.", + "milestoneBulkDeletionMessage": "PROJECT MILESTONES DELETED.", "copilot": "Copilot", "copilotName": "TCConnCopilot", "moveMilestoneDatesTitle": "Move Milestone Dates", @@ -94,6 +95,6 @@ "inReview": "In Review", "actionOnMilestoneApprove": "approve", "milestoneApprovedMessageStr": "APPROVED MILESTONES SUCCESSFULLY.", - "allMilestoneApprovedNotificationStr": "All the milestone(s) has been approved by the customer" + "allMilestoneApprovedNotificationStr": "The following milestone(s) has been approved" } } \ No newline at end of file diff --git a/connect-automation/test-suites/milestone-flow/create-new-milestone.spec.ts b/connect-automation/test-suites/milestone-flow/create-new-milestone.spec.ts index 4e79a6dfd..45a028787 100644 --- a/connect-automation/test-suites/milestone-flow/create-new-milestone.spec.ts +++ b/connect-automation/test-suites/milestone-flow/create-new-milestone.spec.ts @@ -35,6 +35,7 @@ describe('Connect App - Create New Milestone Tests:', () => { it('[TC_003] Should verify user can bulk update the milestone.', async () => { await ProjectMilestonePageHelper.deleteAllMilestones(testData.projectMilestone); + await CommonHelper.waitForAddNewMilestones(); const milestoneNames = await ProjectMilestonePageHelper.addMilestones(testData.projectMilestone, 2, testData.projectMilestone.active); await ProjectMilestonePageHelper.verifyUserCanBulkUpdateTheMilestone(testData.projectMilestone); }); diff --git a/connect-automation/test-suites/project-settings-flow/project-settings.spec.ts b/connect-automation/test-suites/project-settings-flow/project-settings.spec.ts index ed30ac073..c2b035b29 100644 --- a/connect-automation/test-suites/project-settings-flow/project-settings.spec.ts +++ b/connect-automation/test-suites/project-settings-flow/project-settings.spec.ts @@ -42,19 +42,19 @@ describe('Connect App - Project Settings Tests:', () => { it('[TC_003] Should verify user can Add/Edit/Delete/Download Files', async () => { await CommonHelper.goToRecentlyCreatedProject(); - await CommonHelper.waitForAddNewMilestones(); + await CommonHelper.waitForMilestones(); await ProjectSettingsPageHelper.verifyUserCanAddEditDeleteDownloadFiles(testData.projectSettings); }); it('[TC_004] Should verify user can Add/Edit/Delete/Download Links', async () => { await CommonHelper.goToRecentlyCreatedProject(); - await CommonHelper.waitForAddNewMilestones(); + await CommonHelper.waitForMilestones(); await ProjectSettingsPageHelper.verifyUserCanAddEditDeleteDownloadLinks(testData.projectSettings); }); it('[TC_005] Should verify user can Add Message with Files Attachment', async () => { await CommonHelper.goToRecentlyCreatedProject(); - await CommonHelper.waitForAddNewMilestones(); + await CommonHelper.waitForMilestones(); await ProjectSettingsPageHelper.verifyUserCanAddMessageWithFileAttachment(testData.projectSettings); }); }); From 0920ec725a5c71df96f68c53f450f4707fedd7e6 Mon Sep 17 00:00:00 2001 From: Nursoltan Saipolda Date: Wed, 29 Sep 2021 08:45:06 +0800 Subject: [PATCH 2/2] fixed failing e2e tests --- .../project-creation-flow/projects/projects.po.ts | 2 +- .../project-milestone/project-milestone.helper.ts | 6 +++--- .../project-settings-flow/project-settings.spec.ts | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/connect-automation/page-objects/project-creation-flow/projects/projects.po.ts b/connect-automation/page-objects/project-creation-flow/projects/projects.po.ts index 795241608..773c75e80 100644 --- a/connect-automation/page-objects/project-creation-flow/projects/projects.po.ts +++ b/connect-automation/page-objects/project-creation-flow/projects/projects.po.ts @@ -84,7 +84,7 @@ export class ProjectsPageObject { await CommonHelper.fillInputField(searchInput, inputText); await this.searchButton.click(); - await BrowserHelper.sleep(2000); + await BrowserHelper.sleep(4000); } /** diff --git a/connect-automation/page-objects/project-milestone/project-milestone.helper.ts b/connect-automation/page-objects/project-milestone/project-milestone.helper.ts index e9bd7de56..2f1d2ff74 100644 --- a/connect-automation/page-objects/project-milestone/project-milestone.helper.ts +++ b/connect-automation/page-objects/project-milestone/project-milestone.helper.ts @@ -438,9 +438,9 @@ export class ProjectMilestonePageHelper { await this.projectMilestonePageObject.yesButton.click(); logger.info('Clicked Yes button'); - const milestoneDeletionMessage = await CommonHelper.getAlertMessageAndClosePopup(); - expect(milestoneDeletionMessage).toEqual(projectMilestones.milestoneDeletionMessage); - logger.info(`Verified Delete Milestone Message ${milestoneDeletionMessage}`); + const milestoneBulkDeletionMessage = await CommonHelper.getAlertMessageAndClosePopup(); + expect(milestoneBulkDeletionMessage).toEqual(projectMilestones.milestoneBulkDeletionMessage); + logger.info(`Verified Delete Milestone Message ${milestoneBulkDeletionMessage}`); await BrowserHelper.waitUntilClickableOf( this.projectMilestonePageObject.getAddButton(), diff --git a/connect-automation/test-suites/project-settings-flow/project-settings.spec.ts b/connect-automation/test-suites/project-settings-flow/project-settings.spec.ts index c2b035b29..8da9612fa 100644 --- a/connect-automation/test-suites/project-settings-flow/project-settings.spec.ts +++ b/connect-automation/test-suites/project-settings-flow/project-settings.spec.ts @@ -1,3 +1,4 @@ +import { BrowserHelper } from 'topcoder-testing-lib'; import { CommonHelper } from '../../page-objects/common-page/common.helper'; import { ProjectSettingsPageHelper } from '../../page-objects/project-settings/project-settings.helper' import * as testData from '../../test-data/test-data.json'; @@ -42,19 +43,19 @@ describe('Connect App - Project Settings Tests:', () => { it('[TC_003] Should verify user can Add/Edit/Delete/Download Files', async () => { await CommonHelper.goToRecentlyCreatedProject(); - await CommonHelper.waitForMilestones(); + await BrowserHelper.sleep(5000); await ProjectSettingsPageHelper.verifyUserCanAddEditDeleteDownloadFiles(testData.projectSettings); }); it('[TC_004] Should verify user can Add/Edit/Delete/Download Links', async () => { await CommonHelper.goToRecentlyCreatedProject(); - await CommonHelper.waitForMilestones(); + await BrowserHelper.sleep(5000); await ProjectSettingsPageHelper.verifyUserCanAddEditDeleteDownloadLinks(testData.projectSettings); }); it('[TC_005] Should verify user can Add Message with Files Attachment', async () => { await CommonHelper.goToRecentlyCreatedProject(); - await CommonHelper.waitForMilestones(); + await BrowserHelper.sleep(5000); await ProjectSettingsPageHelper.verifyUserCanAddMessageWithFileAttachment(testData.projectSettings); }); });