diff --git a/e2e/core/datatable/data-table-component-selection.e2e.ts b/e2e/core/datatable/data-table-component-selection.e2e.ts index 6539cfd321..72f2710573 100644 --- a/e2e/core/datatable/data-table-component-selection.e2e.ts +++ b/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'; diff --git a/e2e/core/datatable/data-table-component.e2e.ts b/e2e/core/datatable/data-table-component.e2e.ts index 91f9f1ff18..3a8df28acd 100644 --- a/e2e/core/datatable/data-table-component.e2e.ts +++ b/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'); diff --git a/e2e/core/viewer/viewer-properties.e2e.ts b/e2e/core/viewer/viewer-properties.e2e.ts index 3ffe8a94e3..0dcf410121 100644 --- a/e2e/core/viewer/viewer-properties.e2e.ts +++ b/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'); diff --git a/e2e/pages/adf/content-services/documentListPage.ts b/e2e/pages/adf/content-services/documentListPage.ts index 034930ec6d..47ec567c99 100644 --- a/e2e/pages/adf/content-services/documentListPage.ts +++ b/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 { diff --git a/e2e/pages/adf/demo-shell/customSourcesPage.ts b/e2e/pages/adf/demo-shell/customSourcesPage.ts index fbaf9e7393..95b4db8895 100644 --- a/e2e/pages/adf/demo-shell/customSourcesPage.ts +++ b/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 = { diff --git a/e2e/pages/adf/demo-shell/dataTablePage.ts b/e2e/pages/adf/demo-shell/dataTablePage.ts index a6ff81141d..63328fc3ca 100644 --- a/e2e/pages/adf/demo-shell/dataTablePage.ts +++ b/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 { diff --git a/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts index a84fb3444d..afb1f7f51e 100644 --- a/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts +++ b/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(); - editProcessFilterCloud = new EditProcessFilterCloudComponent(); + processListCloud = new ProcessListCloudComponentPage(); + 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() { diff --git a/e2e/pages/adf/demo-shell/process-services/processListDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/processListDemoPage.ts index 99b7e97d31..5b6bd1230d 100644 --- a/e2e/pages/adf/demo-shell/process-services/processListDemoPage.ts +++ b/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 { diff --git a/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts index 51b591a609..248d546f39 100644 --- a/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts +++ b/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts @@ -15,13 +15,11 @@ * limitations under the License. */ -import { TaskFiltersCloudComponent } from '../../process-cloud/taskFiltersCloudComponent'; -import { TaskListCloudComponent } from '../../process-cloud/taskListCloudComponent'; -import { EditTaskFilterCloudComponent } from '../../process-cloud/editTaskFilterCloudComponent'; +import { EditTaskFilterCloudComponentPage, TaskFiltersCloudComponentPage } from '@alfresco/adf-testing'; 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() { diff --git a/e2e/pages/adf/permissionsPage.ts b/e2e/pages/adf/permissionsPage.ts index 830a60bca0..f83c766852 100644 --- a/e2e/pages/adf/permissionsPage.ts +++ b/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 = { diff --git a/e2e/pages/adf/process-services/filtersPage.ts b/e2e/pages/adf/process-services/filtersPage.ts index fc41f71501..8fdccef5ee 100644 --- a/e2e/pages/adf/process-services/filtersPage.ts +++ b/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 { diff --git a/e2e/pages/adf/process-services/processFiltersPage.ts b/e2e/pages/adf/process-services/processFiltersPage.ts index 5681ef3623..ad27a7eb66 100644 --- a/e2e/pages/adf/process-services/processFiltersPage.ts +++ b/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 { diff --git a/e2e/pages/adf/process-services/tasksListPage.ts b/e2e/pages/adf/process-services/tasksListPage.ts index 4faaa94eb8..70b9f76f74 100644 --- a/e2e/pages/adf/process-services/tasksListPage.ts +++ b/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 { diff --git a/e2e/pages/adf/process_cloud/editTaskFilterCloudComponent.ts b/e2e/pages/adf/process_cloud/editTaskFilterCloudComponent.ts deleted file mode 100644 index f202cf108b..0000000000 --- a/e2e/pages/adf/process_cloud/editTaskFilterCloudComponent.ts +++ /dev/null @@ -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; - } - -} diff --git a/e2e/pages/adf/searchResultsPage.ts b/e2e/pages/adf/searchResultsPage.ts index c36305d517..93c01bef87 100644 --- a/e2e/pages/adf/searchResultsPage.ts +++ b/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'; diff --git a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts index 7994a8a053..82f22adcf5 100644 --- a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts +++ b/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 { GroupCloudComponent } from '../pages/adf/process-cloud/groupCloudComponent'; +import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing'; 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 groupCloudComponent = new GroupCloudComponent(); + const peopleCloudComponent = new PeopleCloudComponentPage(); + 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'); - groupCloudComponent.checkGroupIsDisplayed(`${groupAps.name}`); - groupCloudComponent.checkGroupIsNotDisplayed(`${groupActiviti.name}`); - groupCloudComponent.checkGroupIsNotDisplayed(`${groupNoRole.name}`); - groupCloudComponent.selectGroupFromList(`${groupAps.name}`); - groupCloudComponent.checkSelectedGroup(`${groupAps.name}`); + groupCloudComponentPage.searchGroups('TestGroup'); + groupCloudComponentPage.checkGroupIsDisplayed(`${groupAps.name}`); + groupCloudComponentPage.checkGroupIsNotDisplayed(`${groupActiviti.name}`); + groupCloudComponentPage.checkGroupIsNotDisplayed(`${groupNoRole.name}`); + groupCloudComponentPage.selectGroupFromList(`${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'); - groupCloudComponent.checkGroupIsDisplayed(`${groupActiviti.name}`); - groupCloudComponent.checkGroupIsDisplayed(`${groupAps.name}`); - groupCloudComponent.checkGroupIsNotDisplayed(`${groupNoRole.name}`); - groupCloudComponent.selectGroupFromList(`${groupActiviti.name}`); - groupCloudComponent.checkSelectedGroup(`${groupActiviti.name}`); + groupCloudComponentPage.searchGroups('TestGroup'); + groupCloudComponentPage.checkGroupIsDisplayed(`${groupActiviti.name}`); + groupCloudComponentPage.checkGroupIsDisplayed(`${groupAps.name}`); + groupCloudComponentPage.checkGroupIsNotDisplayed(`${groupNoRole.name}`); + groupCloudComponentPage.selectGroupFromList(`${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'); - groupCloudComponent.checkGroupIsDisplayed(`${groupNoRole.name}`); - groupCloudComponent.checkGroupIsDisplayed(`${groupActiviti.name}`); - groupCloudComponent.checkGroupIsDisplayed(`${groupAps.name}`); - groupCloudComponent.selectGroupFromList(`${groupNoRole.name}`); - groupCloudComponent.checkSelectedGroup(`${groupNoRole.name}`); + groupCloudComponentPage.searchGroups('TestGroup'); + groupCloudComponentPage.checkGroupIsDisplayed(`${groupNoRole.name}`); + groupCloudComponentPage.checkGroupIsDisplayed(`${groupActiviti.name}`); + groupCloudComponentPage.checkGroupIsDisplayed(`${groupAps.name}`); + groupCloudComponentPage.selectGroupFromList(`${groupNoRole.name}`); + groupCloudComponentPage.checkSelectedGroup(`${groupNoRole.name}`); }); }); diff --git a/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts b/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts index 19aac34cb4..98ac96b848 100644 --- a/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts +++ b/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 { StringUtil } from '@alfresco/adf-testing'; -import { PeopleCloudComponent } from '../pages/adf/process-cloud/peopleCloudComponent'; -import { TaskHeaderCloudPage } from '@alfresco/adf-testing'; +import { LoginSSOPage, AppListCloudPage, StringUtil, TaskHeaderCloudPage, + StartTasksCloudPage, PeopleCloudComponentPage } 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); diff --git a/e2e/search/components/search-date-range.e2e.ts b/e2e/search/components/search-date-range.e2e.ts index 5751f72eca..60f8da3ea1 100644 --- a/e2e/search/components/search-date-range.e2e.ts +++ b/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'; diff --git a/e2e/search/components/search-number-range.e2e.ts b/e2e/search/components/search-number-range.e2e.ts index dd6426da91..91fbc0174e 100644 --- a/e2e/search/components/search-number-range.e2e.ts +++ b/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'; diff --git a/e2e/search/components/search-slider.e2e.ts b/e2e/search/components/search-slider.e2e.ts index edad2a798f..e1e5178d4e 100644 --- a/e2e/search/components/search-slider.e2e.ts +++ b/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'; diff --git a/e2e/pages/adf/dataTableComponentPage.ts b/lib/testing/src/lib/core/pages/data-table-component.page.ts similarity index 99% rename from e2e/pages/adf/dataTableComponentPage.ts rename to lib/testing/src/lib/core/pages/data-table-component.page.ts index f072c9b179..97b7851d25 100644 --- a/e2e/pages/adf/dataTableComponentPage.ts +++ b/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 { diff --git a/lib/testing/src/lib/process-services-cloud/pages/login-sso.page.ts b/lib/testing/src/lib/core/pages/login-sso.page.ts similarity index 100% rename from lib/testing/src/lib/process-services-cloud/pages/login-sso.page.ts rename to lib/testing/src/lib/core/pages/login-sso.page.ts diff --git a/lib/testing/src/lib/core/pages/public-api.ts b/lib/testing/src/lib/core/pages/public-api.ts index a1a7936cb0..53994f015b 100644 --- a/lib/testing/src/lib/core/pages/public-api.ts +++ b/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'; diff --git a/lib/testing/src/lib/core/pages/user-info.page.ts b/lib/testing/src/lib/core/pages/user-info.page.ts index 582b0d1307..ebd92363ce 100644 --- a/lib/testing/src/lib/core/pages/user-info.page.ts +++ b/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 { diff --git a/lib/testing/src/lib/core/public-api.ts b/lib/testing/src/lib/core/public-api.ts index a81925d1f1..7b19468b7b 100644 --- a/lib/testing/src/lib/core/public-api.ts +++ b/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'; diff --git a/lib/testing/src/lib/core/material/public-api.ts b/lib/testing/src/lib/material/pages/public-api.ts similarity index 100% rename from lib/testing/src/lib/core/material/public-api.ts rename to lib/testing/src/lib/material/pages/public-api.ts diff --git a/lib/testing/src/lib/core/material/tabs.page.ts b/lib/testing/src/lib/material/pages/tabs.page.ts similarity index 94% rename from lib/testing/src/lib/core/material/tabs.page.ts rename to lib/testing/src/lib/material/pages/tabs.page.ts index 12ae7bb8a2..b903167882 100644 --- a/lib/testing/src/lib/core/material/tabs.page.ts +++ b/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 { diff --git a/lib/testing/src/lib/material/public-api.ts b/lib/testing/src/lib/material/public-api.ts index 5e77b5653c..4143973c23 100644 --- a/lib/testing/src/lib/material/public-api.ts +++ b/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'; diff --git a/e2e/pages/adf/dialog/editProcessFilterDialog.ts b/lib/testing/src/lib/process-services-cloud/pages/dialog/edit-process-filter-dialog.page.ts similarity index 96% rename from e2e/pages/adf/dialog/editProcessFilterDialog.ts rename to lib/testing/src/lib/process-services-cloud/pages/dialog/edit-process-filter-dialog.page.ts index 34eae03507..9cd5c77568 100644 --- a/e2e/pages/adf/dialog/editProcessFilterDialog.ts +++ b/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')); diff --git a/e2e/pages/adf/dialog/editTaskFilterDialog.ts b/lib/testing/src/lib/process-services-cloud/pages/dialog/edit-task-filter-dialog.page.ts similarity index 96% rename from e2e/pages/adf/dialog/editTaskFilterDialog.ts rename to lib/testing/src/lib/process-services-cloud/pages/dialog/edit-task-filter-dialog.page.ts index e4b91fb3c9..c86977900d 100644 --- a/e2e/pages/adf/dialog/editTaskFilterDialog.ts +++ b/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')); diff --git a/lib/testing/src/lib/process-services-cloud/pages/dialog/public-api.ts b/lib/testing/src/lib/process-services-cloud/pages/dialog/public-api.ts new file mode 100644 index 0000000000..098d588160 --- /dev/null +++ b/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'; diff --git a/e2e/pages/adf/process-cloud/editProcessFilterCloudComponent.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts similarity index 95% rename from e2e/pages/adf/process-cloud/editProcessFilterCloudComponent.ts rename to lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts index 741b8cfaab..b683c0ddf2 100644 --- a/e2e/pages/adf/process-cloud/editProcessFilterCloudComponent.ts +++ b/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 { BrowserVisibility } from '@alfresco/adf-testing'; +import { EditProcessFilterDialogPage } from './dialog/edit-process-filter-dialog.page'; +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() { diff --git a/e2e/pages/adf/process-cloud/editTaskFilterCloudComponent.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts similarity index 96% rename from e2e/pages/adf/process-cloud/editTaskFilterCloudComponent.ts rename to lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts index 988da9d5e8..10f35c6b55 100644 --- a/e2e/pages/adf/process-cloud/editTaskFilterCloudComponent.ts +++ b/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 { BrowserVisibility } from '@alfresco/adf-testing'; +import { EditTaskFilterDialogPage } from './dialog/edit-task-filter-dialog.page'; +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() { diff --git a/e2e/pages/adf/process-cloud/groupCloudComponent.ts b/lib/testing/src/lib/process-services-cloud/pages/group-cloud-component.page.ts similarity index 95% rename from e2e/pages/adf/process-cloud/groupCloudComponent.ts rename to lib/testing/src/lib/process-services-cloud/pages/group-cloud-component.page.ts index 8552a82d34..67c0320e67 100644 --- a/e2e/pages/adf/process-cloud/groupCloudComponent.ts +++ b/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"]')); diff --git a/e2e/pages/adf/process-cloud/peopleCloudComponent.ts b/lib/testing/src/lib/process-services-cloud/pages/people-cloud-component.page.ts similarity index 96% rename from e2e/pages/adf/process-cloud/peopleCloudComponent.ts rename to lib/testing/src/lib/process-services-cloud/pages/people-cloud-component.page.ts index 85f7f7c109..428dfeceb0 100644 --- a/e2e/pages/adf/process-cloud/peopleCloudComponent.ts +++ b/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"]')); diff --git a/e2e/pages/adf/process-cloud/processFiltersCloudComponent.ts b/lib/testing/src/lib/process-services-cloud/pages/process-filters-cloud-component.page.ts similarity index 93% rename from e2e/pages/adf/process-cloud/processFiltersCloudComponent.ts rename to lib/testing/src/lib/process-services-cloud/pages/process-filters-cloud-component.page.ts index 194b98bb8b..757f435948 100644 --- a/e2e/pages/adf/process-cloud/processFiltersCloudComponent.ts +++ b/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"); diff --git a/e2e/pages/adf/process-cloud/processListCloudComponent.ts b/lib/testing/src/lib/process-services-cloud/pages/process-list-cloud-component.page.ts similarity index 91% rename from e2e/pages/adf/process-cloud/processListCloudComponent.ts rename to lib/testing/src/lib/process-services-cloud/pages/process-list-cloud-component.page.ts index 6107cb6e82..122b2ec6c7 100644 --- a/e2e/pages/adf/process-cloud/processListCloudComponent.ts +++ b/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 { DataTableComponentPage } from '../dataTableComponentPage'; +import { BrowserVisibility } from '../../core/browser-visibility'; +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(); diff --git a/lib/testing/src/lib/process-services-cloud/pages/public-api.ts b/lib/testing/src/lib/process-services-cloud/pages/public-api.ts index 09b6aca866..fc6d7d8bc3 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/public-api.ts +++ b/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'; diff --git a/e2e/pages/adf/process-cloud/taskFiltersCloudComponent.ts b/lib/testing/src/lib/process-services-cloud/pages/task-filters-cloud-component.page.ts similarity index 93% rename from e2e/pages/adf/process-cloud/taskFiltersCloudComponent.ts rename to lib/testing/src/lib/process-services-cloud/pages/task-filters-cloud-component.page.ts index 2bca03e1bc..74708b8fac 100644 --- a/e2e/pages/adf/process-cloud/taskFiltersCloudComponent.ts +++ b/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"); diff --git a/e2e/pages/adf/process-cloud/taskListCloudComponent.ts b/lib/testing/src/lib/process-services-cloud/pages/task-list-cloud-component.page.ts similarity index 94% rename from e2e/pages/adf/process-cloud/taskListCloudComponent.ts rename to lib/testing/src/lib/process-services-cloud/pages/task-list-cloud-component.page.ts index db2b09186e..2f63478a6d 100644 --- a/e2e/pages/adf/process-cloud/taskListCloudComponent.ts +++ b/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 { DataTableComponentPage } from '../dataTableComponentPage'; +import { BrowserVisibility } from '../../core/browser-visibility'; +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(); diff --git a/lib/testing/src/public-api.ts b/lib/testing/src/public-api.ts index 9b42b1066f..c5dd2500ac 100644 --- a/lib/testing/src/public-api.ts +++ b/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';