From ef8e15ff60560719bbef824ce8d91617adb89e93 Mon Sep 17 00:00:00 2001 From: rgherghelas <39947234+rgherghelas@users.noreply.github.com> Date: Thu, 20 Dec 2018 15:44:39 +0200 Subject: [PATCH] [ADF-3739] Fix task_filters_cloud.e2e.ts tests (#4030) * Fix task_filters_cloud.e2e.ts tests * fix locators * fix protractor import * update tests and delete the duplicated test * update selectors * move methods and update methods for custom filters * remove comments * change user for apps_section_cloud.e2e.ts * remove user * delete old dataTablePage.js file * update selectors * remove unused methods * add variable for user and password --- e2e/pages/adf/dataTablePage.ts | 6 ++-- .../adf/demo-shell/tasksCloudDemoPage.ts | 1 + .../apps_section_cloud.e2e.ts | 3 -- .../task_filters_cloud.e2e.ts | 32 ++++++++----------- 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/e2e/pages/adf/dataTablePage.ts b/e2e/pages/adf/dataTablePage.ts index ea943acfb9..f810eb3ec2 100644 --- a/e2e/pages/adf/dataTablePage.ts +++ b/e2e/pages/adf/dataTablePage.ts @@ -216,19 +216,19 @@ export class DataTablePage { } checkContentIsDisplayed(content) { - let row = by.cssContainingText(`span`, content); + let row = by.cssContainingText(`[data-automation-id*="${content}"]`, content); Util.waitUntilElementIsVisible(this.tableBody.all(row).first()); return this; } checkContentIsNotDisplayed(content) { - let row = by.cssContainingText(`span`, content); + let row = by.cssContainingText(`[data-automation-id*="${content}"]`, content); Util.waitUntilElementIsNotOnPage(this.tableBody.all(row).first()); return this; } selectRowByContentName(content) { - let row = by.cssContainingText(`span`, content); + let row = by.cssContainingText(`[data-automation-id*="${content}"]`, content); Util.waitUntilElementIsVisible(this.tableBody.element(row)); this.tableBody.element(row).click(); return this; diff --git a/e2e/pages/adf/demo-shell/tasksCloudDemoPage.ts b/e2e/pages/adf/demo-shell/tasksCloudDemoPage.ts index df35ed4025..0d07519ae9 100644 --- a/e2e/pages/adf/demo-shell/tasksCloudDemoPage.ts +++ b/e2e/pages/adf/demo-shell/tasksCloudDemoPage.ts @@ -51,4 +51,5 @@ export class TasksCloudDemoPage { Util.waitUntilElementIsVisible(this.activeFilter); return this.activeFilter.getText(); } + } diff --git a/e2e/process-services-cloud/apps_section_cloud.e2e.ts b/e2e/process-services-cloud/apps_section_cloud.e2e.ts index 0c759a1ff4..9a52076ebc 100644 --- a/e2e/process-services-cloud/apps_section_cloud.e2e.ts +++ b/e2e/process-services-cloud/apps_section_cloud.e2e.ts @@ -34,11 +34,8 @@ describe('Applications list', () => { settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path); loginSSOPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); - navigationBarPage.navigateToProcessServicesCloudPage(); - appListCloudComponent.checkApsContainer(); - appListCloudComponent.checkAppIsDisplayed(appName); appListCloudComponent.goToApp(appName); diff --git a/e2e/process-services-cloud/task_filters_cloud.e2e.ts b/e2e/process-services-cloud/task_filters_cloud.e2e.ts index 8888a5418e..14ca3c44e9 100644 --- a/e2e/process-services-cloud/task_filters_cloud.e2e.ts +++ b/e2e/process-services-cloud/task_filters_cloud.e2e.ts @@ -22,7 +22,6 @@ import { SettingsPage } from '../pages/adf/settingsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/tasksCloudDemoPage'; import { AppListCloudComponent } from '../pages/adf/process_cloud/appListCloudComponent'; - import { Tasks } from '../actions/APS-cloud/tasks'; describe('Task filters cloud', () => { @@ -34,17 +33,18 @@ describe('Task filters cloud', () => { let appListCloudComponent = new AppListCloudComponent(); let tasksCloudDemoPage = new TasksCloudDemoPage(); const tasksService: Tasks = new Tasks(); + const user = TestConfig.adf.adminEmail, password = TestConfig.adf.adminPassword; const path = '/auth/realms/springboot'; let silentLogin; - const newTask = 'newTask', completedTask = 'completedTask1', myTask = 'myTask'; - const simpleApp = 'simple-app'; + const newTask = 'newTask', completedTask = 'completedTask1'; + const simpleApp = 'task-app'; beforeAll(() => { silentLogin = false; settingsPage.setProviderBpmSso(TestConfig.adf.hostSso, TestConfig.adf.hostSso + path, silentLogin); loginSSOPage.clickOnSSOButton(); - loginSSOPage.loginAPS(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + loginSSOPage.loginAPS(user, password); }); beforeEach((done) => { @@ -59,9 +59,10 @@ describe('Task filters cloud', () => { tasksCloudDemoPage.completedTasksFilter().checkTaskFilterIsDisplayed(); }); - xit('[C290009] Should display default filters and created task', () => { - tasksService.init(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); - tasksService.createStandaloneTask(newTask, simpleApp); + it('[C290009] Should display default filters and created task', async() => { + await tasksService.init(user, password); + let task = await tasksService.createStandaloneTask(newTask, simpleApp); + await tasksService.claimTask(task.entry.id, simpleApp); tasksCloudDemoPage.completedTasksFilter().clickTaskFilter(); expect(tasksCloudDemoPage.checkActiveFilterActive()).toBe('Completed Tasks'); @@ -69,13 +70,13 @@ describe('Task filters cloud', () => { tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); expect(tasksCloudDemoPage.checkActiveFilterActive()).toBe('My Tasks'); + tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkContentIsDisplayed(newTask); }); - // failing due to ACTIVITI-2463 - xit('[C289955] Should display task in Complete Tasks List when task is completed', () => { - tasksService.init(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); - let task = tasksService.createStandaloneTask(completedTask, simpleApp); + it('[C289955] Should display task in Complete Tasks List when task is completed', async() => { + await tasksService.init(user, password); + let task = await tasksService.createStandaloneTask(completedTask, simpleApp); tasksService.claimTask(task.entry.id, simpleApp); tasksService.completeTask(task.entry.id, simpleApp); @@ -86,17 +87,10 @@ describe('Task filters cloud', () => { tasksCloudDemoPage.completedTasksFilter().clickTaskFilter(); expect(tasksCloudDemoPage.checkActiveFilterActive()).toBe('Completed Tasks'); + tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkContentIsDisplayed(completedTask); }); - xit('[C289957] Should display task filter results when task filter is selected', () => { - tasksService.init(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); - let task = tasksService.createStandaloneTask(myTask, simpleApp); - - tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - expect(tasksCloudDemoPage.checkActiveFilterActive()).toBe('My Tasks'); - tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkContentIsDisplayed(myTask); - }); }); });