From 0f63122a274aecc9e8cde82a3c5ac3618f3743bf Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Wed, 24 Apr 2019 20:24:55 +0100
Subject: [PATCH] fix new merged process list selection test

---
 .../process-list-selection-cloud.e2e.ts          | 16 ++++++++--------
 .../lib/core/pages/data-table-component.page.ts  |  9 +++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts b/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts
index 96cf93c843..858f857e08 100644
--- a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts
+++ b/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts
@@ -26,7 +26,7 @@ import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tas
 import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing';
 import { ProcessInstancesService } from '@alfresco/adf-testing';
 
-import { browser } from 'protractor';
+import resources = require('../util/resources');
 
 describe('Process list cloud', () => {
 
@@ -41,17 +41,14 @@ describe('Process list cloud', () => {
         let processDefinitionService: ProcessDefinitionsService;
         let processInstancesService: ProcessInstancesService;
 
-        let silentLogin;
-        const simpleApp = 'simple-app';
+        const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
         const noOfProcesses = 3;
         let response;
         const processInstances = [];
 
         beforeAll(async (done) => {
-            silentLogin = false;
-            settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin);
+            settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false);
             loginSSOPage.clickOnSSOButton();
-            browser.ignoreSynchronization = true;
             loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
 
             const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
@@ -66,6 +63,10 @@ describe('Process list cloud', () => {
                 processInstances.push(response.entry.id);
             }
 
+            done();
+        });
+
+        beforeEach(async (done) => {
             navigationBarPage.navigateToProcessServicesCloudPage();
             appListCloudComponent.checkApsContainer();
             appListCloudComponent.goToApp(simpleApp);
@@ -75,7 +76,6 @@ describe('Process list cloud', () => {
             tasksCloudDemoPage.clickSettingsButton().disableDisplayProcessDetails();
             tasksCloudDemoPage.clickAppButton();
             done();
-
         });
 
         it('[C297469] Should NOT be able to select a process when settings are set to None', () => {
@@ -139,7 +139,7 @@ describe('Process list cloud', () => {
             processCloudDemoPage.processListCloudComponent().checkRowIsCheckedById(processInstances[1]);
             processCloudDemoPage.processListCloudComponent().checkRowIsCheckedById(processInstances[2]);
 
-            processCloudDemoPage.processListCloudComponent().getDataTable().checkAllRowsButtonIsDisplayed().checkAllRows();
+            processCloudDemoPage.processListCloudComponent().getDataTable().checkAllRowsButtonIsDisplayed().uncheckAllRows();
             processCloudDemoPage.processListCloudComponent().checkRowIsNotCheckedById(processInstances[0]);
             processCloudDemoPage.processListCloudComponent().checkRowIsNotCheckedById(processInstances[1]);
             processCloudDemoPage.processListCloudComponent().checkRowIsNotCheckedById(processInstances[2]);
diff --git a/lib/testing/src/lib/core/pages/data-table-component.page.ts b/lib/testing/src/lib/core/pages/data-table-component.page.ts
index 1e13586516..1381589c07 100644
--- a/lib/testing/src/lib/core/pages/data-table-component.page.ts
+++ b/lib/testing/src/lib/core/pages/data-table-component.page.ts
@@ -60,6 +60,15 @@ export class DataTableComponentPage {
         return this;
     }
 
+    uncheckAllRows() {
+        BrowserVisibility.waitUntilElementIsVisible(this.selectAll);
+        BrowserVisibility.waitUntilElementIsClickable(this.selectAll).then(() => {
+            this.selectAll.click();
+            BrowserVisibility.waitUntilElementIsNotOnPage(this.selectAll.element(by.css('input[aria-checked="true"]')));
+        });
+        return this;
+    }
+
     clickCheckbox(columnName, columnValue) {
         const checkbox = this.getRowCheckbox(columnName, columnValue);
         BrowserVisibility.waitUntilElementIsClickable(checkbox);