diff --git a/connect-automation/page-objects/common-page/common.helper.ts b/connect-automation/page-objects/common-page/common.helper.ts index b33938637..09842d546 100644 --- a/connect-automation/page-objects/common-page/common.helper.ts +++ b/connect-automation/page-objects/common-page/common.helper.ts @@ -367,4 +367,11 @@ export const CommonHelper = { } return isElementPresent; }, + + /** + * Get Join Project Button + */ + get joinProjectButton() { + return ElementHelper.getElementByButtonText('Join project'); + }, }; diff --git a/connect-automation/page-objects/phase-creation-flow/create-new-phase/create-new-phase.helper.ts b/connect-automation/page-objects/phase-creation-flow/create-new-phase/create-new-phase.helper.ts index 9bde263fb..29717ffd2 100644 --- a/connect-automation/page-objects/phase-creation-flow/create-new-phase/create-new-phase.helper.ts +++ b/connect-automation/page-objects/phase-creation-flow/create-new-phase/create-new-phase.helper.ts @@ -19,6 +19,12 @@ export class CreateNewPhaseHelper { * @param formData phase creation form data defined in test data */ public static async verifyCreateNewPhase(formData: IPhaseCreationData) { + // If user is invited to project, click on "Join Project" to proceed. + await BrowserHelper.sleep(4000); + if (await CommonHelper.joinProjectButton.isPresent()) { + await CommonHelper.joinProjectButton.click(); + } + await this.clickOnAddNewPhaseButton(); await this.fillCreatePhaseForm(formData.title, formData.daysBetweenStartAndEndDate); diff --git a/connect-automation/page-objects/project-creation-flow/projects/projects.helper.ts b/connect-automation/page-objects/project-creation-flow/projects/projects.helper.ts index 8fa8b8e62..417fbddb5 100644 --- a/connect-automation/page-objects/project-creation-flow/projects/projects.helper.ts +++ b/connect-automation/page-objects/project-creation-flow/projects/projects.helper.ts @@ -30,7 +30,7 @@ export class ProjectsHelper { await BrowserHelper.sleep(4000); // Click on Join Project button - await this.projectsPageObject.joinProjectButton.click(); + await CommonHelper.joinProjectButton.click(); const alertElement = CommonHelper.alertBox(); await CommonHelper.waitForSuccessAlert(alertElement); 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 704fc65a8..442e4e4f4 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 @@ -12,13 +12,6 @@ export class ProjectsPageObject { logger.info('User navigated to Home Page'); } - /** - * Get Join Project Button - */ - public get joinProjectButton() { - return ElementHelper.getElementByButtonText('Join project'); - } - /** * Get Search Input */ diff --git a/connect-automation/test-suites/project-creation-flow/create-project.spec.ts b/connect-automation/test-suites/project-creation-flow/create-project.spec.ts index aa39a65f5..0c0a284d4 100644 --- a/connect-automation/test-suites/project-creation-flow/create-project.spec.ts +++ b/connect-automation/test-suites/project-creation-flow/create-project.spec.ts @@ -26,11 +26,11 @@ describe('Connect App - Create Project Tests:', () => { await CreateProjectPageHelper.open(); }); - it('[TC_001] should verify whether the current user can create a Design, Development & Deployment project', async () => { - await CreateProjectPageHelper.verifyProjectCreation(testData.projectData); - }); - it('[TC_006] should verify whether the current user can create a TAAS project', async () => { await CreateProjectPageHelper.verifyTaasProject(testData.taas); }); + + it('[TC_001] should verify whether the current user can create a Design, Development & Deployment project', async () => { + await CreateProjectPageHelper.verifyProjectCreation(testData.projectData); + }); });