Merge branch 'master' into dev

Author: drasticdpk

.circleci/config.yml

@@ -166,6 +166,13 @@ jobs:
       LOGICAL_ENV: "dev"
     steps: *smoke_testing
 
+  smoke-testing-prod:
+    <<: *test_defaults
+    environment:
+      DEPLOY_ENV: "PROD"
+      LOGICAL_ENV: "prod"
+    steps: *smoke_testing
+
 workflows:
   version: 2
   build:
@@ -202,7 +209,7 @@ workflows:
           context : org-global
           requires:
             - build-prod
-          filters:
+          filters: &filters-prod
             branches:
               only: master
 
@@ -217,3 +224,9 @@ workflows:
             - Hold [Smoke-Testing]
           filters:
             <<: *filters-dev
+      - smoke-testing-prod:
+          context : org-global
+          requires:
+            - Hold [Smoke-Testing]
+          filters:
+            <<: *filters-prod

connect-automation/page-objects/project-creation-flow/projects/projects.po.ts

@@ -85,6 +85,7 @@ export class ProjectsPageObject {
     await this.searchButton.click();
 
     await BrowserHelper.sleep(4000);
+ 
   }
 
   /**

connect-automation/page-objects/project-milestone/project-milestone.helper.ts

@@ -347,9 +347,11 @@ export class ProjectMilestonePageHelper {
 		await this.projectMilestonePageObject.yesButton.click();
 		logger.info('Clicked Yes button');
 
+
 		const milestoneBulkDeletionMessage = await CommonHelper.getAlertMessageAndClosePopup();
 		expect(milestoneBulkDeletionMessage).toEqual(projectMilestones.milestoneBulkDeletionMessage);
 		logger.info(`Verified Delete Milestone Message ${milestoneBulkDeletionMessage}`);
+
 	}
 
 	/**
@@ -438,10 +440,12 @@ export class ProjectMilestonePageHelper {
 			await this.projectMilestonePageObject.yesButton.click();
 			logger.info('Clicked Yes button');
 
+
 			const milestoneBulkDeletionMessage = await CommonHelper.getAlertMessageAndClosePopup();
 			expect(milestoneBulkDeletionMessage).toEqual(projectMilestones.milestoneBulkDeletionMessage);
 			logger.info(`Verified Delete Milestone Message ${milestoneBulkDeletionMessage}`);
 
+
 			await BrowserHelper.waitUntilClickableOf(
 				this.projectMilestonePageObject.getAddButton(),
 				config.Timeout.ElementClickable,

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;

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",
@@ -95,6 +96,8 @@
         "inReview": "In Review",
         "actionOnMilestoneApprove": "approve",
         "milestoneApprovedMessageStr": "APPROVED MILESTONES SUCCESSFULLY.",
+
         "allMilestoneApprovedNotificationStr": "The following milestone(s) has been approved"
+
     }
 }

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);

connect-automation/test-suites/project-settings-flow/project-settings.spec.ts

@@ -44,18 +44,21 @@ describe('Connect App - Project Settings Tests:', () => {
   it('[TC_003] Should verify user can Add/Edit/Delete/Download Files', async () => {
     await CommonHelper.goToRecentlyCreatedProject();
     await BrowserHelper.sleep(5000);
+    await CommonHelper.waitForAddNewMilestones();
     await ProjectSettingsPageHelper.verifyUserCanAddEditDeleteDownloadFiles(testData.projectSettings);
   });
 
   it('[TC_004] Should verify user can Add/Edit/Delete/Download Links', async () => {
     await CommonHelper.goToRecentlyCreatedProject();
     await BrowserHelper.sleep(5000);
+    await CommonHelper.waitForAddNewMilestones();
     await ProjectSettingsPageHelper.verifyUserCanAddEditDeleteDownloadLinks(testData.projectSettings);
   });
 
   it('[TC_005] Should verify user can Add Message with Files Attachment', async () => {
     await CommonHelper.goToRecentlyCreatedProject();
     await BrowserHelper.sleep(5000);
+    await CommonHelper.waitForAddNewMilestones();
     await ProjectSettingsPageHelper.verifyUserCanAddMessageWithFileAttachment(testData.projectSettings);
   });
 });