Move process cloud page int @alfresco/adf-testing (#4540)

Move datatable @alfresco/adf-testing

e2e/core/datatable/data-table-component-selection.e2e.ts

@@ -17,7 +17,7 @@
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage';
-import { DataTableComponentPage } from '../../pages/adf/dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import TestConfig = require('../../test.config');
 
 import { AcsUserModel } from '../../models/ACS/acsUserModel';

e2e/core/datatable/data-table-component.e2e.ts

@@ -17,7 +17,7 @@
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage';
-import { DataTableComponentPage } from '../../pages/adf/dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { AcsUserModel } from '../../models/ACS/acsUserModel';
 import TestConfig = require('../../test.config');
 

e2e/core/viewer/viewer-properties.e2e.ts

@@ -21,7 +21,7 @@ import { LoginPage } from '../../pages/adf/loginPage';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
 import { ViewerPage } from '../../pages/adf/viewerPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
-import { DataTableComponentPage } from '../../pages/adf/dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 
 import resources = require('../../util/resources');
 

e2e/pages/adf/content-services/documentListPage.ts

@@ -16,7 +16,7 @@
  */
 
 import { by, element, ElementFinder, browser } from 'protractor';
-import { DataTableComponentPage } from '../dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { BrowserVisibility } from '@alfresco/adf-testing';
 
 export class DocumentListPage {

e2e/pages/adf/demo-shell/customSourcesPage.ts

@@ -17,7 +17,7 @@
 
 import { BrowserVisibility } from '@alfresco/adf-testing';
 import { element, by } from 'protractor';
-import { DataTableComponentPage } from '../dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../navigationBarPage';
 
 const source = {

e2e/pages/adf/demo-shell/dataTablePage.ts

@@ -16,7 +16,7 @@
  */
 
 import { browser, by, element, protractor } from 'protractor';
-import { DataTableComponentPage } from '../dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { BrowserVisibility } from '@alfresco/adf-testing';
 
 export class DataTablePage {

e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts

@@ -15,11 +15,9 @@
  * limitations under the License.
  */
 
-import { ProcessFiltersCloudComponent } from '../../process-cloud/processFiltersCloudComponent';
-import { ProcessListCloudComponent } from '../../process-cloud/processListCloudComponent';
-import { EditProcessFilterCloudComponent } from '../../process-cloud/editProcessFilterCloudComponent';
 import { element, by } from 'protractor';
 import { BrowserVisibility } from '@alfresco/adf-testing';
+import { ProcessFiltersCloudComponentPage, EditProcessFilterCloudComponentPage, ProcessListCloudComponentPage } from '@alfresco/adf-testing';
 
 export class ProcessCloudDemoPage {
 
@@ -32,11 +30,11 @@ export class ProcessCloudDemoPage {
     createButton = element(by.css('button[data-automation-id="create-button"'));
     newProcessButton = element(by.css('button[data-automation-id="btn-start-process"]'));
 
-    processListCloud = new ProcessListCloudComponent();
+    processListCloud = new ProcessListCloudComponentPage();
-    editProcessFilterCloud = new EditProcessFilterCloudComponent();
+    editProcessFilterCloud = new EditProcessFilterCloudComponentPage();
 
     processFiltersCloudComponent(filter) {
-        return new ProcessFiltersCloudComponent(filter);
+        return new ProcessFiltersCloudComponentPage(filter);
     }
 
     editProcessFilterCloudComponent() {
@@ -52,19 +50,19 @@ export class ProcessCloudDemoPage {
     }
 
     allProcessesFilter() {
-        return new ProcessFiltersCloudComponent(this.allProcesses);
+        return new ProcessFiltersCloudComponentPage(this.allProcesses);
     }
 
     runningProcessesFilter() {
-        return new ProcessFiltersCloudComponent(this.runningProcesses);
+        return new ProcessFiltersCloudComponentPage(this.runningProcesses);
     }
 
     completedProcessesFilter() {
-        return new ProcessFiltersCloudComponent(this.completedProcesses);
+        return new ProcessFiltersCloudComponentPage(this.completedProcesses);
     }
 
     customProcessFilter(filterName) {
-        return new ProcessFiltersCloudComponent(element(by.css(`span[data-automation-id="${filterName}_filter"]`)));
+        return new ProcessFiltersCloudComponentPage(element(by.css(`span[data-automation-id="${filterName}_filter"]`)));
     }
 
     getActiveFilterName() {

e2e/pages/adf/demo-shell/process-services/processListDemoPage.ts

@@ -16,7 +16,7 @@
  */
 
 import { BrowserVisibility } from '@alfresco/adf-testing';
-import { DataTableComponentPage } from '../../dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { element, by, protractor } from 'protractor';
 
 export class ProcessListDemoPage {

e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts

@@ -15,13 +15,11 @@
  * limitations under the License.
  */
 
-import { TaskFiltersCloudComponent } from '../../process-cloud/taskFiltersCloudComponent';
+import { EditTaskFilterCloudComponentPage, TaskFiltersCloudComponentPage } from '@alfresco/adf-testing';
-import { TaskListCloudComponent } from '../../process-cloud/taskListCloudComponent';
-import { EditTaskFilterCloudComponent } from '../../process-cloud/editTaskFilterCloudComponent';
 import { FormControllersPage } from '../../material/formControllersPage';
 
 import { element, by, browser } from 'protractor';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility, TaskListCloudComponentPage } from '@alfresco/adf-testing';
 
 export class TasksCloudDemoPage {
 
@@ -43,7 +41,7 @@ export class TasksCloudDemoPage {
 
     formControllersPage = new FormControllersPage();
 
-    editTaskFilterCloud = new EditTaskFilterCloudComponent();
+    editTaskFilterCloud = new EditTaskFilterCloudComponentPage();
 
     disableDisplayTaskDetails() {
         this.formControllersPage.disableToggle(this.displayTaskDetailsToggle);
@@ -56,11 +54,11 @@ export class TasksCloudDemoPage {
     }
 
     taskFiltersCloudComponent(filter) {
-        return new TaskFiltersCloudComponent(filter);
+        return new TaskFiltersCloudComponentPage(filter);
     }
 
     taskListCloudComponent() {
-        return new TaskListCloudComponent();
+        return new TaskListCloudComponentPage();
     }
 
     editTaskFilterCloudComponent() {
@@ -68,15 +66,15 @@ export class TasksCloudDemoPage {
     }
 
     myTasksFilter() {
-        return new TaskFiltersCloudComponent(this.myTasks);
+        return new TaskFiltersCloudComponentPage(this.myTasks);
     }
 
     completedTasksFilter() {
-        return new TaskFiltersCloudComponent(this.completedTasks);
+        return new TaskFiltersCloudComponentPage(this.completedTasks);
     }
 
     customTaskFilter(filterName) {
-        return new TaskFiltersCloudComponent(element(by.css(`span[data-automation-id="${filterName}-filter"]`)));
+        return new TaskFiltersCloudComponentPage(element(by.css(`span[data-automation-id="${filterName}-filter"]`)));
     }
 
     getActiveFilterName() {
@@ -85,11 +83,11 @@ export class TasksCloudDemoPage {
     }
 
     getAllRowsByIdColumn() {
-        return new TaskListCloudComponent().getAllRowsByColumn('Id');
+        return new TaskListCloudComponentPage().getAllRowsByColumn('Id');
     }
 
     getAllRowsByProcessDefIdColumn() {
-        return new TaskListCloudComponent().getAllRowsByColumn('Process Definition Id');
+        return new TaskListCloudComponentPage().getAllRowsByColumn('Process Definition Id');
     }
 
     clickOnTaskFilters() {

e2e/pages/adf/permissionsPage.ts

@@ -17,7 +17,7 @@
 
 import { element, by } from 'protractor';
 
-import { DataTableComponentPage } from './dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { BrowserVisibility } from '@alfresco/adf-testing';
 
 const column = {

e2e/pages/adf/process-services/filtersPage.ts

@@ -16,7 +16,7 @@
  */
 
 import { by, element } from 'protractor';
-import { DataTableComponentPage } from '../dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { BrowserVisibility } from '@alfresco/adf-testing';
 
 export class FiltersPage {

e2e/pages/adf/process-services/processFiltersPage.ts

@@ -17,7 +17,7 @@
 
 import { element, by } from 'protractor';
 import { StartProcessPage } from './startProcessPage';
-import { DataTableComponentPage } from '../dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { BrowserVisibility } from '@alfresco/adf-testing';
 
 export class ProcessFiltersPage {

e2e/pages/adf/process-services/tasksListPage.ts

@@ -16,7 +16,7 @@
  */
 
 import { BrowserVisibility } from '@alfresco/adf-testing';
-import { DataTableComponentPage } from '../dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { by, element } from 'protractor';
 
 export class TasksListPage {

e2e/pages/adf/process_cloud/editTaskFilterCloudComponent.ts

@@ -1,150 +0,0 @@
-/*!
- * @license
- * Copyright 2019 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { by, element, protractor } from 'protractor';
-import { EditTaskFilterDialog } from '../dialog/editTaskFilterDialog';
-import { BrowserVisibility } from '@alfresco/adf-testing';
-
-export class EditTaskFilterCloudComponent {
-
-    customiseFilter = element(by.id('adf-edit-task-filter-title-id'));
-    selectedOption = element.all(by.css('mat-option[class*="mat-selected"]')).first();
-    assignment = element(by.css('mat-form-field[data-automation-id="assignment"] input'));
-    saveButton = element(by.css('button[data-automation-id="Save"]'));
-    saveAsButton = element(by.css('button[data-automation-id="Save as"]'));
-    deleteButton = element(by.css('button[data-automation-id="Delete"]'));
-
-    editTaskFilter = new EditTaskFilterDialog();
-
-    editTaskFilterDialog() {
-        return this.editTaskFilter;
-    }
-
-    clickCustomiseFilterHeader() {
-        BrowserVisibility.waitUntilElementIsVisible(this.customiseFilter);
-        this.customiseFilter.click();
-        return this;
-    }
-
-    setStateFilterDropDown(option) {
-        this.clickOnDropDownArrow('status');
-
-        const stateElement = element.all(by.cssContainingText('mat-option span', option)).first();
-        BrowserVisibility.waitUntilElementIsClickable(stateElement);
-        BrowserVisibility.waitUntilElementIsVisible(stateElement);
-        stateElement.click();
-        return this;
-    }
-
-    getStateFilterDropDownValue() {
-        return element(by.css("mat-form-field[data-automation-id='status'] span")).getText();
-    }
-
-    setSortFilterDropDown(option) {
-        this.clickOnDropDownArrow('sort');
-
-        const sortElement = element.all(by.cssContainingText('mat-option span', option)).first();
-        BrowserVisibility.waitUntilElementIsClickable(sortElement);
-        BrowserVisibility.waitUntilElementIsVisible(sortElement);
-        sortElement.click();
-        return this;
-    }
-
-    getSortFilterDropDownValue() {
-        return element(by.css("mat-form-field[data-automation-id='sort'] span")).getText();
-    }
-
-    setOrderFilterDropDown(option) {
-        this.clickOnDropDownArrow('order');
-
-        const orderElement = element.all(by.cssContainingText('mat-option span', option)).first();
-        BrowserVisibility.waitUntilElementIsClickable(orderElement);
-        BrowserVisibility.waitUntilElementIsVisible(orderElement);
-        orderElement.click();
-        return this;
-    }
-
-    getOrderFilterDropDownValue() {
-        return element(by.css("mat-form-field[data-automation-id='order'] span")).getText();
-    }
-
-    clickOnDropDownArrow(option) {
-        const dropDownArrow = element(by.css("mat-form-field[data-automation-id='" + option + "'] div[class*='arrow']"));
-        BrowserVisibility.waitUntilElementIsVisible(dropDownArrow);
-        dropDownArrow.click();
-        BrowserVisibility.waitUntilElementIsVisible(this.selectedOption);
-    }
-
-    setAssignment(option) {
-        BrowserVisibility.waitUntilElementIsVisible(this.assignment);
-        this.assignment.clear();
-        this.assignment.sendKeys(option);
-        this.assignment.sendKeys(protractor.Key.ENTER);
-        return this;
-    }
-
-    getAssignment() {
-        return this.assignment.getText();
-    }
-
-    checkSaveButtonIsDisplayed() {
-        BrowserVisibility.waitUntilElementIsVisible(this.saveButton);
-        return this;
-    }
-
-    checkSaveAsButtonIsDisplayed() {
-        BrowserVisibility.waitUntilElementIsVisible(this.saveAsButton);
-        return this;
-    }
-
-    checkDeleteButtonIsDisplayed() {
-        BrowserVisibility.waitUntilElementIsVisible(this.deleteButton);
-        return this;
-    }
-
-    checkSaveButtonIsEnabled() {
-        return this.saveButton.isEnabled();
-    }
-
-    checkSaveAsButtonIsEnabled() {
-        return this.saveAsButton.isEnabled();
-    }
-
-    checkDeleteButtonIsEnabled() {
-        return this.deleteButton.isEnabled();
-    }
-
-    clickSaveAsButton() {
-        BrowserVisibility.waitUntilElementIsClickable(this.saveAsButton);
-        BrowserVisibility.waitUntilElementIsVisible(this.saveAsButton);
-        this.saveAsButton.click();
-        return this.editTaskFilter;
-    }
-
-    clickDeleteButton() {
-        BrowserVisibility.waitUntilElementIsVisible(this.deleteButton);
-        this.deleteButton.click();
-        return this;
-    }
-
-    clickSaveButton() {
-        BrowserVisibility.waitUntilElementIsVisible(this.saveButton);
-        this.saveButton.click();
-        return this;
-    }
-
-}

e2e/pages/adf/searchResultsPage.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { DataTableComponentPage } from './dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { SearchSortingPickerPage } from './content-services/search/components/search-sortingPicker.page';
 import { element, by } from 'protractor';
 import { ContentServicesPage } from './contentServicesPage';

e2e/process-services-cloud/people-group-cloud-component.e2e.ts

@@ -20,8 +20,7 @@ import TestConfig = require('../test.config');
 import { SettingsPage } from '../pages/adf/settingsPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage';
-import { PeopleCloudComponent } from '../pages/adf/process-cloud/peopleCloudComponent';
+import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
-import { GroupCloudComponent } from '../pages/adf/process-cloud/groupCloudComponent';
 import { browser } from 'protractor';
 import { LoginSSOPage, IdentityService, GroupIdentityService, RolesService, ApiService } from '@alfresco/adf-testing';
 import CONSTANTS = require('../util/constants');
@@ -33,8 +32,8 @@ describe('People Groups Cloud Component', () => {
         const loginSSOPage = new LoginSSOPage();
         const navigationBarPage = new NavigationBarPage();
         const peopleGroupCloudComponentPage = new PeopleGroupCloudComponentPage();
-        const peopleCloudComponent = new PeopleCloudComponent();
+        const peopleCloudComponent = new PeopleCloudComponentPage();
-        const groupCloudComponent = new GroupCloudComponent();
+        const groupCloudComponentPage = new GroupCloudComponentPage();
         let identityService: IdentityService;
         let groupIdentityService: GroupIdentityService;
         let rolesService: RolesService;
@@ -139,36 +138,36 @@ describe('People Groups Cloud Component', () => {
             peopleGroupCloudComponentPage.clickGroupCloudMultipleSelection();
             peopleGroupCloudComponentPage.clickGroupCloudFilterRole();
             peopleGroupCloudComponentPage.enterGroupRoles(`["${CONSTANTS.ROLES.APS_ADMIN}"]`);
-            groupCloudComponent.searchGroups('TestGroup');
+            groupCloudComponentPage.searchGroups('TestGroup');
-            groupCloudComponent.checkGroupIsDisplayed(`${groupAps.name}`);
+            groupCloudComponentPage.checkGroupIsDisplayed(`${groupAps.name}`);
-            groupCloudComponent.checkGroupIsNotDisplayed(`${groupActiviti.name}`);
+            groupCloudComponentPage.checkGroupIsNotDisplayed(`${groupActiviti.name}`);
-            groupCloudComponent.checkGroupIsNotDisplayed(`${groupNoRole.name}`);
+            groupCloudComponentPage.checkGroupIsNotDisplayed(`${groupNoRole.name}`);
-            groupCloudComponent.selectGroupFromList(`${groupAps.name}`);
+            groupCloudComponentPage.selectGroupFromList(`${groupAps.name}`);
-            groupCloudComponent.checkSelectedGroup(`${groupAps.name}`);
+            groupCloudComponentPage.checkSelectedGroup(`${groupAps.name}`);
         });
 
         it('[C297674] Add more than one role filtering to GroupCloudComponent', () => {
             peopleGroupCloudComponentPage.clickGroupCloudMultipleSelection();
             peopleGroupCloudComponentPage.clickGroupCloudFilterRole();
             peopleGroupCloudComponentPage.enterGroupRoles(`["${CONSTANTS.ROLES.APS_ADMIN}", "${CONSTANTS.ROLES.ACTIVITI_ADMIN}"]`);
-            groupCloudComponent.searchGroups('TestGroup');
+            groupCloudComponentPage.searchGroups('TestGroup');
-            groupCloudComponent.checkGroupIsDisplayed(`${groupActiviti.name}`);
+            groupCloudComponentPage.checkGroupIsDisplayed(`${groupActiviti.name}`);
-            groupCloudComponent.checkGroupIsDisplayed(`${groupAps.name}`);
+            groupCloudComponentPage.checkGroupIsDisplayed(`${groupAps.name}`);
-            groupCloudComponent.checkGroupIsNotDisplayed(`${groupNoRole.name}`);
+            groupCloudComponentPage.checkGroupIsNotDisplayed(`${groupNoRole.name}`);
-            groupCloudComponent.selectGroupFromList(`${groupActiviti.name}`);
+            groupCloudComponentPage.selectGroupFromList(`${groupActiviti.name}`);
-            groupCloudComponent.checkSelectedGroup(`${groupActiviti.name}`);
+            groupCloudComponentPage.checkSelectedGroup(`${groupActiviti.name}`);
         });
 
         it('[C297674] Add no role filters to GroupCloudComponent', () => {
             peopleGroupCloudComponentPage.clickGroupCloudMultipleSelection();
             peopleGroupCloudComponentPage.clickGroupCloudFilterRole();
             peopleGroupCloudComponentPage.clearField(peopleGroupCloudComponentPage.groupRoleInput);
-            groupCloudComponent.searchGroups('TestGroup');
+            groupCloudComponentPage.searchGroups('TestGroup');
-            groupCloudComponent.checkGroupIsDisplayed(`${groupNoRole.name}`);
+            groupCloudComponentPage.checkGroupIsDisplayed(`${groupNoRole.name}`);
-            groupCloudComponent.checkGroupIsDisplayed(`${groupActiviti.name}`);
+            groupCloudComponentPage.checkGroupIsDisplayed(`${groupActiviti.name}`);
-            groupCloudComponent.checkGroupIsDisplayed(`${groupAps.name}`);
+            groupCloudComponentPage.checkGroupIsDisplayed(`${groupAps.name}`);
-            groupCloudComponent.selectGroupFromList(`${groupNoRole.name}`);
+            groupCloudComponentPage.selectGroupFromList(`${groupNoRole.name}`);
-            groupCloudComponent.checkSelectedGroup(`${groupNoRole.name}`);
+            groupCloudComponentPage.checkSelectedGroup(`${groupNoRole.name}`);
         });
 
     });

e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts

@@ -15,16 +15,12 @@
  * limitations under the License.
  */
 
-import { LoginSSOPage } from '@alfresco/adf-testing';
 import { SettingsPage } from '../pages/adf/settingsPage';
-import { AppListCloudPage } from '@alfresco/adf-testing';
 import TestConfig = require('../test.config');
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
-import { StartTasksCloudPage } from '@alfresco/adf-testing';
+import { LoginSSOPage, AppListCloudPage, StringUtil, TaskHeaderCloudPage,
-import { StringUtil } from '@alfresco/adf-testing';
+    StartTasksCloudPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
-import { PeopleCloudComponent } from '../pages/adf/process-cloud/peopleCloudComponent';
-import { TaskHeaderCloudPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 
 describe('Start Task', () => {
@@ -36,7 +32,7 @@ describe('Start Task', () => {
     const appListCloudComponent = new AppListCloudPage();
     const tasksCloudDemoPage = new TasksCloudDemoPage();
     const startTask = new StartTasksCloudPage();
-    const peopleCloudComponent = new PeopleCloudComponent();
+    const peopleCloudComponent = new PeopleCloudComponentPage();
     const standaloneTaskName = StringUtil.generateRandomString(5);
     const unassignedTaskName = StringUtil.generateRandomString(5);
     const taskName255Characters = StringUtil.generateRandomString(255);

e2e/search/components/search-date-range.e2e.ts

@@ -17,7 +17,7 @@
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
-import { DataTableComponentPage } from '../../pages/adf/dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
 import { DatePickerPage } from '../../pages/adf/material/datePickerPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';

e2e/search/components/search-number-range.e2e.ts

@@ -17,7 +17,7 @@
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
-import { DataTableComponentPage } from '../../pages/adf/dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 import { ConfigEditorPage } from '../../pages/adf/configEditorPage';

e2e/search/components/search-slider.e2e.ts

@@ -17,7 +17,7 @@
 
 import { LoginPage } from '../../pages/adf/loginPage';
 import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
-import { DataTableComponentPage } from '../../pages/adf/dataTableComponentPage';
+import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 import { ConfigEditorPage } from '../../pages/adf/configEditorPage';

lib/testing/src/lib/core/pages/data-table-component.page.ts

@@ -17,7 +17,7 @@
 
 import { browser, by, element, protractor } from 'protractor';
 import { ElementFinder, ElementArrayFinder } from 'protractor/built/element';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility } from '../browser-visibility';
 
 export class DataTableComponentPage {
 

lib/testing/src/lib/core/pages/public-api.ts

@@ -17,3 +17,5 @@
 
 export * from './header.page';
 export * from './user-info.page';
+export * from './login-sso.page';
+export * from './data-table-component.page';

lib/testing/src/lib/core/pages/user-info.page.ts

@@ -17,7 +17,7 @@
 
 import { element, by, browser, protractor } from 'protractor';
 import { BrowserVisibility } from '../browser-visibility';
-import { TabsPage } from '../material/tabs.page';
+import { TabsPage } from '../../material/pages/tabs.page';
 
 export class UserInfoPage {
 

lib/testing/src/lib/core/public-api.ts

@@ -18,6 +18,5 @@
 export * from './browser-visibility';
 export * from './actions/public-api';
 export * from './pages/public-api';
-export * from './material/public-api';
 export * from './models/public-api';
 export * from './string.util';

lib/testing/src/lib/material/pages/tabs.page.ts

@@ -16,7 +16,7 @@
  */
 
 import { element, by } from 'protractor';
-import { BrowserVisibility } from '../browser-visibility';
+import { BrowserVisibility } from '../../core/browser-visibility';
 
 export class TabsPage {
 

lib/testing/src/lib/material/public-api.ts

@@ -15,4 +15,4 @@
  * limitations under the License.
  */
 
-export * from './tabs.page';
+export * from './pages/public-api';

lib/testing/src/lib/process-services-cloud/pages/dialog/edit-process-filter-dialog.page.ts

@@ -16,9 +16,9 @@
  */
 
 import { by, element, protractor } from 'protractor';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility } from '../../../core/browser-visibility';
 
-export class EditProcessFilterDialog {
+export class EditProcessFilterDialogPage {
 
     componentElement = element(by.css('adf-cloud-process-filter-dialog-cloud'));
     title = element(by.id('adf-process-filter-dialog-title'));

lib/testing/src/lib/process-services-cloud/pages/dialog/edit-task-filter-dialog.page.ts

@@ -16,9 +16,9 @@
  */
 
 import { by, element, protractor } from 'protractor';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility } from '../../../core/browser-visibility';
 
-export class EditTaskFilterDialog {
+export class EditTaskFilterDialogPage {
 
     componentElement = element(by.css('adf-cloud-task-filter-dialog'));
     title = element(by.id('adf-task-filter-dialog-title'));

lib/testing/src/lib/process-services-cloud/pages/dialog/public-api.ts

@@ -0,0 +1,19 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './edit-process-filter-dialog.page';
+export * from './edit-task-filter-dialog.page';

lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 import { by, element, protractor } from 'protractor';
-import { EditProcessFilterDialog } from '../dialog/editProcessFilterDialog';
+import { EditProcessFilterDialogPage } from './dialog/edit-process-filter-dialog.page';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility } from '../../core/browser-visibility';
 
-export class EditProcessFilterCloudComponent {
+export class EditProcessFilterCloudComponentPage {
 
     customiseFilter = element(by.id('adf-edit-process-filter-title-id'));
     selectedOption = element.all(by.css('mat-option[class*="mat-selected"]')).first();
@@ -26,10 +26,10 @@ export class EditProcessFilterCloudComponent {
     saveAsButton = element(by.css('button[data-automation-id="adf-filter-action-saveAs"]'));
     deleteButton = element(by.css('button[data-automation-id="adf-filter-action-delete"]'));
 
-    editProcessFilter = new EditProcessFilterDialog();
+    editProcessFilterDialogPage = new EditProcessFilterDialogPage();
 
     editProcessFilterDialog() {
-        return this.editProcessFilter;
+        return this.editProcessFilterDialogPage;
     }
 
     clickCustomiseFilterHeader() {
@@ -183,7 +183,7 @@ export class EditProcessFilterCloudComponent {
         BrowserVisibility.waitUntilElementIsVisible(this.saveAsButton);
         BrowserVisibility.waitUntilElementIsNotVisible(disabledButton);
         this.saveAsButton.click();
-        return this.editProcessFilter;
+        return this.editProcessFilterDialogPage;
     }
 
     clickDeleteButton() {

lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts

@@ -16,10 +16,10 @@
  */
 
 import { by, element, protractor } from 'protractor';
-import { EditTaskFilterDialog } from '../dialog/editTaskFilterDialog';
+import { EditTaskFilterDialogPage } from './dialog/edit-task-filter-dialog.page';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility } from '../../core/browser-visibility';
 
-export class EditTaskFilterCloudComponent {
+export class EditTaskFilterCloudComponentPage {
 
     customiseFilter = element(by.id('adf-edit-task-filter-title-id'));
     selectedOption = element.all(by.css('mat-option[class*="mat-selected"]')).first();
@@ -36,10 +36,10 @@ export class EditTaskFilterCloudComponent {
     saveAsButton = element(by.css('[data-automation-id="adf-filter-action-saveAs"]'));
     deleteButton = element(by.css('[data-automation-id="adf-filter-action-delete"]'));
 
-    editTaskFilter = new EditTaskFilterDialog();
+    editTaskFilterDialogPage = new EditTaskFilterDialogPage();
 
     editTaskFilterDialog() {
-        return this.editTaskFilter;
+        return this.editTaskFilterDialogPage;
     }
 
     clickCustomiseFilterHeader() {
@@ -185,7 +185,7 @@ export class EditTaskFilterCloudComponent {
         BrowserVisibility.waitUntilElementIsVisible(this.saveAsButton);
         BrowserVisibility.waitUntilElementIsNotVisible(disabledButton);
         this.saveAsButton.click();
-        return this.editTaskFilter;
+        return this.editTaskFilterDialogPage;
     }
 
     clickDeleteButton() {

lib/testing/src/lib/process-services-cloud/pages/group-cloud-component.page.ts

@@ -16,9 +16,9 @@
  */
 
 import { by, element, protractor } from 'protractor';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility } from '../../core/browser-visibility';
 
-export class GroupCloudComponent {
+export class GroupCloudComponentPage {
 
     groupCloudSearch = element(by.css('input[data-automation-id="adf-cloud-group-search-input"]'));
 

lib/testing/src/lib/process-services-cloud/pages/people-cloud-component.page.ts

@@ -16,9 +16,9 @@
  */
 
 import { by, element, protractor } from 'protractor';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility } from '../../core/browser-visibility';
 
-export class PeopleCloudComponent {
+export class PeopleCloudComponentPage {
 
     peopleCloudSearch = element(by.css('input[data-automation-id="adf-people-cloud-search-input"]'));
 

lib/testing/src/lib/process-services-cloud/pages/process-filters-cloud-component.page.ts

@@ -16,9 +16,9 @@
  */
 
 import { by } from 'protractor';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility } from '../../core/browser-visibility';
 
-export class ProcessFiltersCloudComponent {
+export class ProcessFiltersCloudComponentPage {
 
     filter;
     filterIcon = by.xpath("ancestor::div[@class='mat-list-item-content']/mat-icon");

lib/testing/src/lib/process-services-cloud/pages/process-list-cloud-component.page.ts

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility } from '../../core/browser-visibility';
-import { DataTableComponentPage } from '../dataTableComponentPage';
+import { DataTableComponentPage } from '../../core/pages/data-table-component.page';
 import { element, by } from 'protractor';
 
-export class ProcessListCloudComponent {
+export class ProcessListCloudComponentPage {
 
     processList = element(by.css('adf-cloud-process-list'));
     noProcessFound = element.all(by.css("div[class='adf-empty-content__title']")).first();

lib/testing/src/lib/process-services-cloud/pages/public-api.ts

@@ -15,7 +15,16 @@
  * limitations under the License.
  */
 
-export * from './login-sso.page';
 export * from './start-tasks-cloud-component.page';
 export * from './task-header-cloud-component.page';
 export * from './process-header-cloud-component.page';
+export * from './edit-process-filter-cloud-component.page';
+export * from './edit-task-filter-cloud-component.page';
+export * from './group-cloud-component.page';
+export * from './people-cloud-component.page';
+export * from './process-filters-cloud-component.page';
+export * from './process-list-cloud-component.page';
+export * from './task-filters-cloud-component.page';
+export * from './task-list-cloud-component.page';
+
+export * from './dialog/public-api';

lib/testing/src/lib/process-services-cloud/pages/task-filters-cloud-component.page.ts

@@ -16,9 +16,9 @@
  */
 
 import { by } from 'protractor';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility } from '../../core/browser-visibility';
 
-export class TaskFiltersCloudComponent {
+export class TaskFiltersCloudComponentPage {
 
     filter;
     taskIcon = by.xpath("ancestor::div[@class='mat-list-item-content']/mat-icon");

lib/testing/src/lib/process-services-cloud/pages/task-list-cloud-component.page.ts

@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility } from '../../core/browser-visibility';
-import { DataTableComponentPage } from '../dataTableComponentPage';
+import { DataTableComponentPage } from '../../core/pages/data-table-component.page';
 import { element, by } from 'protractor';
 
 const column = {
     id: 'Id'
 };
 
-export class TaskListCloudComponent {
+export class TaskListCloudComponentPage {
 
     taskList = element(by.css('adf-cloud-task-list'));
     noTasksFound = element.all(by.css("div[class='adf-empty-content__title']")).first();

lib/testing/src/public-api.ts

@@ -16,8 +16,9 @@
  */
 
 export * from './lib/core/public-api';
-export * from './lib/core/material/public-api';
+export * from './lib/material/public-api';
 export * from './lib/content-services/public-api';
+export * from './lib/material/public-api';
 export * from './lib/process-services/public-api';
 export * from './lib/process-services-cloud/public-api';
 export * from './lib/testing.module';