From 867ca8c39d7dfa6aae717df6de0b0adaf60ac1b6 Mon Sep 17 00:00:00 2001 From: cristinaj Date: Wed, 14 Nov 2018 15:23:35 +0200 Subject: [PATCH] [ADF-3747]Refactor app list component. (#3962) * Refactor app list component. * Fix lint errors. * Renamed clickProcessServicesButton() to navigateToProcessServicesPage() * Renamed a test --- .../document_list_component.e2e.ts | 2 +- e2e/core/login/login_component.e2e.ts | 6 +- e2e/core/login/redirection.e2e.ts | 6 +- e2e/insights/analytics-component.e2e.ts | 2 +- e2e/pages/adf/navigationBarPage.ts | 4 +- .../adf/process_services/processListPage.ts | 5 ++ .../process_services/processServicesPage.ts | 13 ---- .../Task_details_no_form.e2e.ts | 6 +- e2e/process-services/apps-section.e2e.ts | 10 +-- .../attach-file-widget.e2e.ts | 6 +- .../attach_form_component.e2e.ts | 10 +-- .../checklist_component.e2e.ts | 18 ++--- .../comment_component_processes.e2e.ts | 10 +-- .../comment_component_tasks.e2e.ts | 10 +-- .../custom_process_filters.e2e.ts | 23 +++--- .../custom_process_filters_sorting.e2e.ts | 72 +++++++++---------- .../dynamic_table_date_picker.e2e.ts | 8 +-- .../empty_process_list_component.e2e.ts | 4 +- .../form_people_widget.e2e.ts | 5 +- .../form_widgets_component.e2e.ts | 3 +- ...ination_processlist_addingProcesses.e2e.ts | 5 +- .../pagination_tasklist_addingTasks.e2e.ts | 5 +- e2e/process-services/people_component.e2e.ts | 24 +++---- .../process_attachmentList_actionMenu.e2e.ts | 12 ++-- .../process_filters_component.e2e.ts | 10 +-- .../processlist_pagination.e2e.ts | 32 ++++----- .../sort_tasklist_pagination.e2e.ts | 3 +- e2e/process-services/standalone_task.e2e.ts | 12 ++-- .../start_process_component.e2e.ts | 6 +- .../start_task_custom_app.e2e.ts | 24 +++---- .../start_task_task_app.e2e.ts | 21 +++--- e2e/process-services/task-audit.e2e.ts | 12 ++-- .../task_attachmentList_actionMenu.e2e.ts | 16 ++--- e2e/process-services/task_details.e2e.ts | 18 ++--- e2e/process-services/task_details_form.e2e.ts | 7 +- .../task_filters_component.e2e.ts | 4 +- .../task_filters_sorting.e2e.ts | 2 +- .../task_list_pagination.e2e.ts | 22 +++--- 38 files changed, 222 insertions(+), 236 deletions(-) diff --git a/e2e/content-services/document-list/document_list_component.e2e.ts b/e2e/content-services/document-list/document_list_component.e2e.ts index 44030e82a4..a6c875398b 100644 --- a/e2e/content-services/document-list/document_list_component.e2e.ts +++ b/e2e/content-services/document-list/document_list_component.e2e.ts @@ -381,7 +381,7 @@ describe('Document List Component', () => { done(); }); - it('[C279970] Should display "Islocked" field for folders', async (done) => { + it('[C279970] Should display Islocked field for folders', async (done) => { acsUser = new AcsUserModel(); let folderNameA = `MEESEEKS_${Util.generateRandomString(5)}_LOOK_AT_ME`; let folderNameB = `MEESEEKS_${Util.generateRandomString(5)}_LOOK_AT_ME`; diff --git a/e2e/core/login/login_component.e2e.ts b/e2e/core/login/login_component.e2e.ts index ac562348fb..19f1386591 100644 --- a/e2e/core/login/login_component.e2e.ts +++ b/e2e/core/login/login_component.e2e.ts @@ -155,7 +155,7 @@ describe('Login component', () => { loginPage.checkSignInButtonIsDisabled(); settingsPage.setProviderBpm(); loginPage.login(adminUserModel.id, adminUserModel.password); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); navigationBarPage.clickContentServicesButton(); loginPage.waitForElements(); @@ -168,7 +168,7 @@ describe('Login component', () => { loginPage.login(TestConfig.adf.adminUser, TestConfig.adf.adminPassword); navigationBarPage.clickContentServicesButton(); contentServicesPage.checkAcsContainer(); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); loginPage.waitForElements(); }); @@ -177,7 +177,7 @@ describe('Login component', () => { loginPage.checkSignInButtonIsDisabled(); settingsPage.setProviderEcmBpm(); loginPage.login(adminUserModel.id, adminUserModel.password); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); navigationBarPage.clickContentServicesButton(); contentServicesPage.checkAcsContainer(); diff --git a/e2e/core/login/redirection.e2e.ts b/e2e/core/login/redirection.e2e.ts index 93ff8a3c1e..aecabc674d 100644 --- a/e2e/core/login/redirection.e2e.ts +++ b/e2e/core/login/redirection.e2e.ts @@ -66,7 +66,7 @@ describe('Login component - Redirect', () => { navigationBarPage.clickContentServicesButton(); contentServicesPage.checkAcsContainer(); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); loginPage.waitForElements(); }); @@ -79,7 +79,7 @@ describe('Login component - Redirect', () => { loginPage.login(adminUserModel.id, adminUserModel.password); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); navigationBarPage.clickContentServicesButton(); @@ -92,7 +92,7 @@ describe('Login component - Redirect', () => { loginPage.login(adminUserModel.id, adminUserModel.password); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); navigationBarPage.clickContentServicesButton(); diff --git a/e2e/insights/analytics-component.e2e.ts b/e2e/insights/analytics-component.e2e.ts index b37fda8e2e..b4c287478e 100644 --- a/e2e/insights/analytics-component.e2e.ts +++ b/e2e/insights/analytics-component.e2e.ts @@ -62,7 +62,7 @@ describe('Analytics Smoke Test', () => { }); it('[C260346] Should be able to change title of a report', () => { - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); processServicesPage.goToApp('Task App'); appNavigationBarPage.clickReportsButton(); diff --git a/e2e/pages/adf/navigationBarPage.ts b/e2e/pages/adf/navigationBarPage.ts index e5f953e156..904dd396a6 100644 --- a/e2e/pages/adf/navigationBarPage.ts +++ b/e2e/pages/adf/navigationBarPage.ts @@ -18,6 +18,7 @@ import Util = require('../../util/util'); import TestConfig = require('../../test.config'); import { element, by } from 'protractor'; +import { ProcessServicesPage } from './process_services/processServicesPage'; export class NavigationBarPage { @@ -47,9 +48,10 @@ export class NavigationBarPage { this.configEditorButton.click(); } - clickProcessServicesButton() { + navigateToProcessServicesPage() { Util.waitUntilElementIsVisible(this.processServicesButton); this.processServicesButton.click(); + return new ProcessServicesPage(); } clickLoginButton() { diff --git a/e2e/pages/adf/process_services/processListPage.ts b/e2e/pages/adf/process_services/processListPage.ts index 3ba75c3fac..e6ca377420 100644 --- a/e2e/pages/adf/process_services/processListPage.ts +++ b/e2e/pages/adf/process_services/processListPage.ts @@ -26,6 +26,7 @@ export class ProcessListPage { openProcessDropdownElement = element(by.id('adf-select-process-dropdown')); selectProcessDropdownElement = element.all(by.css('span[class="mat-option-text"]')); startProcessButton = element(by.css('button[data-automation-id="btn-start"]')); + processInstanceList = element(by.css('adf-process-instance-list')); checkProcessListTitleIsDisplayed() { Util.waitUntilElementIsVisible(this.processListTitle); @@ -52,4 +53,8 @@ export class ProcessListPage { return this.startProcessButton.click(); } + checkProcessListIsDisplayed() { + Util.waitUntilElementIsVisible(this.processInstanceList); + } + } diff --git a/e2e/pages/adf/process_services/processServicesPage.ts b/e2e/pages/adf/process_services/processServicesPage.ts index ed0bbe0678..157d561629 100644 --- a/e2e/pages/adf/process_services/processServicesPage.ts +++ b/e2e/pages/adf/process_services/processServicesPage.ts @@ -23,23 +23,14 @@ import { element, by } from 'protractor'; export class ProcessServicesPage { apsAppsContainer = element(by.css('div[class="adf-app-listgrid ng-star-inserted"]')); - processServices = element(by.css('a[data-automation-id="Process Services"]')); taskApp = element(by.css('mat-card[title="Task App"]')); iconTypeLocator = by.css('mat-icon[class*="card-logo-icon"]'); descriptionLocator = by.css('mat-card-subtitle[class*="subtitle"]'); - processInstanceList = element(by.css('adf-process-instance-list')); checkApsContainer() { Util.waitUntilElementIsVisible(this.apsAppsContainer); } - goToProcessServices() { - Util.waitUntilElementIsVisible(this.processServices); - this.processServices.click(); - this.checkApsContainer(); - return this; - } - goToApp(applicationName) { let app = element(by.css('mat-card[title="' + applicationName + '"]')); Util.waitUntilElementIsVisible(app); @@ -85,8 +76,4 @@ export class ProcessServicesPage { return Util.waitUntilElementIsVisible(app); } - checkProcessListIsDisplayed() { - Util.waitUntilElementIsVisible(this.processInstanceList); - } - } diff --git a/e2e/process-services/Task_details_no_form.e2e.ts b/e2e/process-services/Task_details_no_form.e2e.ts index 8656871eab..0f5babb10e 100644 --- a/e2e/process-services/Task_details_no_form.e2e.ts +++ b/e2e/process-services/Task_details_no_form.e2e.ts @@ -16,7 +16,7 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; import CONSTANTS = require('../util/constants'); @@ -34,7 +34,7 @@ import { AppsActions } from '../actions/APS/apps.actions'; describe('Task Details - No form', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let processUserModel; let app = resources.Files.NO_FORM_APP; let taskPage = new TasksPage(); @@ -68,7 +68,7 @@ describe('Task Details - No form', () => { }); it('[C289311] Should attach form and complete buttons to be displayed when no form is attached', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(app.taskName); diff --git a/e2e/process-services/apps-section.e2e.ts b/e2e/process-services/apps-section.e2e.ts index 42075936e7..b70bf061aa 100644 --- a/e2e/process-services/apps-section.e2e.ts +++ b/e2e/process-services/apps-section.e2e.ts @@ -66,7 +66,7 @@ describe('Modify applications', () => { }); it('[C260198] Should the app be displayed on dashboard when is deployed on APS', () => { - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); @@ -76,7 +76,7 @@ describe('Modify applications', () => { }); it('[C260213] Should a new version of the app be displayed on dashboard when is replaced by importing another app in APS', async () => { - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); @@ -98,7 +98,7 @@ describe('Modify applications', () => { }); it('[C260220] Should the app not be displayed on dashboard after it was deleted in APS', async () => { - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); @@ -115,7 +115,7 @@ describe('Modify applications', () => { }); it('[C260215] Should the penultimate version of an app be displayed on dashboard when the last version is deleted in APS', async () => { - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); @@ -148,7 +148,7 @@ describe('Modify applications', () => { it('[C260207] Should the app be updated when is edited in APS', async () => { let newDescription = 'new description'; - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); expect(processServicesPage.getAppIconType(appToBeDeleted.title)).toEqual(CONSTANTS.APP_ICON.USER); diff --git a/e2e/process-services/attach-file-widget.e2e.ts b/e2e/process-services/attach-file-widget.e2e.ts index 615151838c..3210c653b6 100644 --- a/e2e/process-services/attach-file-widget.e2e.ts +++ b/e2e/process-services/attach-file-widget.e2e.ts @@ -18,7 +18,6 @@ import { LoginPage } from '../pages/adf/loginPage'; import { Widget } from '../pages/adf/process_services/widgets/widget'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; import CONSTANTS = require('../util/constants'); @@ -30,6 +29,7 @@ import resources = require('../util/resources'); import { ViewerPage } from '../pages/adf/viewerPage'; import { AppsActions } from '../actions/APS/apps.actions'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import AlfrescoApi = require('alfresco-js-api-node'); import { UsersActions } from '../actions/users.actions'; @@ -38,8 +38,8 @@ describe('Start Task - Task App', () => { let loginPage = new LoginPage(); let viewerPage = new ViewerPage(); let widget = new Widget(); - let processServicesPage = new ProcessServicesPage(); let taskPage = new TasksPage(); + let navigationBarPage = new NavigationBarPage(); let processUserModel; let app = resources.Files.WIDGETS_SMOKE_TEST; @@ -82,7 +82,7 @@ describe('Start Task - Task App', () => { }); it('[C274690] Should be able to open a file attached to a start form', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); diff --git a/e2e/process-services/attach_form_component.e2e.ts b/e2e/process-services/attach_form_component.e2e.ts index 8e447c6b96..5a74a0daf5 100644 --- a/e2e/process-services/attach_form_component.e2e.ts +++ b/e2e/process-services/attach_form_component.e2e.ts @@ -16,9 +16,9 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; import { AttachFormPage } from '../pages/adf/process_services/attachFormPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import FormFields = require('../pages/adf/process_services/formFields'); import CONSTANTS = require('../util/constants'); @@ -34,10 +34,10 @@ import { by } from 'protractor'; describe('Attach Form Component', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); let taskPage = new TasksPage(); let attachFormPage = new AttachFormPage(); let formFields = new FormFields(); + let navigationBarPage = new NavigationBarPage(); let app = resources.Files.SIMPLE_APP_WITH_USER_FORM; let formTextField = app.form_fields.form_fieldId; @@ -95,7 +95,7 @@ describe('Attach Form Component', () => { }); it('[C280047] Should be able to view the attach-form component after creating a standalone task', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().selectRowByContentName(testNames.taskName); @@ -106,7 +106,7 @@ describe('Attach Form Component', () => { }); it('[C280048] Should be able to view the attach-form component after clicking cancel button', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().selectRowByContentName(testNames.taskName); @@ -126,7 +126,7 @@ describe('Attach Form Component', () => { }); it('[C280017] Should be able to attach a form on a standalone task and complete', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().selectRowByContentName(testNames.taskName); diff --git a/e2e/process-services/checklist_component.e2e.ts b/e2e/process-services/checklist_component.e2e.ts index b1813a7991..6992077edb 100644 --- a/e2e/process-services/checklist_component.e2e.ts +++ b/e2e/process-services/checklist_component.e2e.ts @@ -16,8 +16,8 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); @@ -34,7 +34,7 @@ import path = require('path'); describe('Checklist component', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let processUserModel; let app = resources.Files.SIMPLE_APP_WITH_USER_FORM; let taskPage = new TasksPage(); @@ -75,7 +75,7 @@ describe('Checklist component', () => { }); it('[C279976] Should no checklist be created when no title is typed', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); @@ -85,7 +85,7 @@ describe('Checklist component', () => { }); it('[C279975] Should no checklist be created when clicking on Cancel button on checklist dialog', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); @@ -95,7 +95,7 @@ describe('Checklist component', () => { }); it('[C261025] Should Checklist dialog be displayed when clicking on add checklist button', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); @@ -108,7 +108,7 @@ describe('Checklist component', () => { }); it('[C261026] Should Checklist number increase when a new checklist is added', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[1]).selectRowByContentName(tasks[1]); @@ -123,7 +123,7 @@ describe('Checklist component', () => { }); it('[C279980] Should checklist be removed when clicking on remove button', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[2]).selectRowByContentName(tasks[2]); @@ -139,7 +139,7 @@ describe('Checklist component', () => { }); it('[C261027] Should not be able to remove a completed Checklist when clicking on remove button', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[3]).selectRowByContentName(tasks[3]); @@ -161,7 +161,7 @@ describe('Checklist component', () => { }); it('[C261028] Should all checklists of a task be completed when the task is completed', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[4]).selectRowByContentName(tasks[4]); diff --git a/e2e/process-services/comment_component_processes.e2e.ts b/e2e/process-services/comment_component_processes.e2e.ts index 831cd615b9..f320e6dd7a 100644 --- a/e2e/process-services/comment_component_processes.e2e.ts +++ b/e2e/process-services/comment_component_processes.e2e.ts @@ -17,9 +17,9 @@ import { browser } from 'protractor'; import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); import { CommentsPage } from '../pages/adf/commentsPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import TestConfig = require('../test.config'); import resources = require('../util/resources'); @@ -31,9 +31,9 @@ import { AppsActions } from '../actions/APS/apps.actions'; describe('Comment component for Processes', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); let processFiltersPage = new ProcessFiltersPage(); let commentsPage = new CommentsPage(); + let navigationBarPage = new NavigationBarPage(); let app = resources.Files.SIMPLE_APP_WITH_USER_FORM; let user, tenantId, appId, processInstanceId, comment, taskComment, addedComment; @@ -83,7 +83,7 @@ describe('Comment component for Processes', () => { await this.alfrescoJsApi.activiti.commentsApi.addProcessInstanceComment(comment, processInstanceId); }); - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.selectFromProcessList('Comment APS'); @@ -107,7 +107,7 @@ describe('Comment component for Processes', () => { await this.alfrescoJsApi.activiti.commentsApi.addProcessInstanceComment(comment, processInstanceId); }); - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.selectFromProcessList('Comment APS'); @@ -133,7 +133,7 @@ describe('Comment component for Processes', () => { await this.alfrescoJsApi.activiti.taskApi.addTaskComment(taskComment, taskId); }); - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.selectFromProcessList('Comment APS'); diff --git a/e2e/process-services/comment_component_tasks.e2e.ts b/e2e/process-services/comment_component_tasks.e2e.ts index 51e5714989..2824cff3d0 100644 --- a/e2e/process-services/comment_component_tasks.e2e.ts +++ b/e2e/process-services/comment_component_tasks.e2e.ts @@ -18,9 +18,9 @@ import { browser } from 'protractor'; import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; import { CommentsPage } from '../pages/adf/commentsPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); @@ -34,7 +34,7 @@ import { AppsActions } from '../actions/APS/apps.actions'; describe('Comment component for Processes', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let taskPage = new TasksPage(); let commentsPage = new CommentsPage(); @@ -93,7 +93,7 @@ describe('Comment component for Processes', () => { this.alfrescoJsApi.activiti.taskActionsApi.completeTask(taskId); }); - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); taskPage.tasksListPage().getDataTable().selectRowByContentName(taskName.completed_task); @@ -116,7 +116,7 @@ describe('Comment component for Processes', () => { await this.alfrescoJsApi.activiti.taskApi.addTaskComment(secondTaskComment, newTaskId); }); - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().selectRowByContentName(taskName.multiple_users); @@ -146,7 +146,7 @@ describe('Comment component for Processes', () => { await this.alfrescoJsApi.activiti.taskApi.addTaskComment(thirdTaskComment, newTaskId); }); - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); taskPage.tasksListPage().getDataTable().selectRowByContentName(taskName.multiple_users); diff --git a/e2e/process-services/custom_process_filters.e2e.ts b/e2e/process-services/custom_process_filters.e2e.ts index c7a816c2f8..b8dfe08b9a 100644 --- a/e2e/process-services/custom_process_filters.e2e.ts +++ b/e2e/process-services/custom_process_filters.e2e.ts @@ -18,10 +18,10 @@ import { browser } from 'protractor'; import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage'; import { AppSettingsToggles } from '../pages/adf/process_services/dialog/appSettingsToggles'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import TestConfig = require('../test.config'); @@ -31,10 +31,10 @@ import { UsersActions } from '../actions/users.actions'; describe('New Process Filters', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); let processFiltersPage = new ProcessFiltersPage(); let appNavigationBarPage = new AppNavigationBarPage(); let appSettingsToggles = new AppSettingsToggles(); + let navigationBarPage = new NavigationBarPage(); let tenantId, user, filterId, customProcessFilter; @@ -77,8 +77,7 @@ describe('New Process Filters', () => { it('[C279965] Should be able to view default filters on ADF', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage - .goToProcessServices() + navigationBarPage.navigateToProcessServicesPage() .goToTaskApp() .clickProcessButton(); @@ -103,8 +102,7 @@ describe('New Process Filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage - .goToProcessServices() + navigationBarPage.navigateToProcessServicesPage() .goToTaskApp() .clickProcessButton(); @@ -126,7 +124,7 @@ describe('New Process Filters', () => { }); loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.checkFilterIsDisplayed(processFilter.new_icon); @@ -150,8 +148,7 @@ describe('New Process Filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage - .goToProcessServices() + navigationBarPage.navigateToProcessServicesPage() .goToTaskApp() .clickProcessButton(); @@ -173,7 +170,7 @@ describe('New Process Filters', () => { }); loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.checkFilterIsDisplayed(processFilter.edit_icon); @@ -188,7 +185,7 @@ describe('New Process Filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.checkFilterIsDisplayed(processFilter.edit_icon); @@ -202,7 +199,7 @@ describe('New Process Filters', () => { it('[C286452] Should display process filter icons only when showIcon property is set on true', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.checkFilterHasNoIcon(processFilter.all); appNavigationBarPage.clickSettingsButton(); @@ -233,7 +230,7 @@ describe('New Process Filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.checkFilterIsNotDisplayed(processFilter.deleted); }); diff --git a/e2e/process-services/custom_process_filters_sorting.e2e.ts b/e2e/process-services/custom_process_filters_sorting.e2e.ts index d5b11a2086..37f7d01f0d 100644 --- a/e2e/process-services/custom_process_filters_sorting.e2e.ts +++ b/e2e/process-services/custom_process_filters_sorting.e2e.ts @@ -18,7 +18,7 @@ import { browser } from 'protractor'; import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); import FiltersPage = require('../pages/adf/process_services/filtersPage'); @@ -32,7 +32,7 @@ import { AppsActions } from '../actions/APS/apps.actions'; describe('Sorting for process filters', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let processFiltersPage = new ProcessFiltersPage(); let filtersPage = new FiltersPage(); @@ -76,8 +76,8 @@ describe('Sorting for process filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage - .goToProcessServices() + navigationBarPage + .navigateToProcessServicesPage() .goToTaskApp() .clickProcessButton(); @@ -95,18 +95,18 @@ describe('Sorting for process filters', () => { }); it('[C260476] Should be able to create a filter on APS for running processes - Oldest first and check on ADF', () => { - browser.controlFlow().execute(async () => {
 + browser.controlFlow().execute(async () => { await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({ -
'appId': null,
 'name': processFilter.running_old_first,
 'icon': 'glyphicon-random',
 - 'filter': {'sort': 'created-asc', 'name': '', 'state': 'running'}
 - });
 - await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 1');
 - await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 2');
 - await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 3');
 - });

 loginPage.loginToProcessServicesUsingUserModel(user);

 processServicesPage
 - .goToProcessServices()
 - .goToTaskApp()
 - .clickProcessButton();

 processFiltersPage.checkFilterIsDisplayed(processFilter.running_old_first);

 filtersPage.goToFilter(processFilter.running_old_first);

 browser.controlFlow().execute(async () => {
 + 'appId': null,
 'name': processFilter.running_old_first,
 'icon': 'glyphicon-random', + 'filter': {'sort': 'created-asc', 'name': '', 'state': 'running'} + }); + await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 1'); + await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 2'); + await apps.startProcess(this.alfrescoJsApi, 'Task App', 'Process 3'); + });

 loginPage.loginToProcessServicesUsingUserModel(user);

 navigationBarPage + .navigateToProcessServicesPage() + .goToTaskApp() + .clickProcessButton();

 processFiltersPage.checkFilterIsDisplayed(processFilter.running_old_first);

 filtersPage.goToFilter(processFilter.running_old_first);

 browser.controlFlow().execute(async () => { processesQuery = await this.alfrescoJsApi.activiti.processApi.getProcessInstances({ 'processDefinitionId': null, 'appDefinitionId': null, 'state': 'running', 'sort': 'created-asc' }); @@ -118,7 +118,7 @@ describe('Sorting for process filters', () => { it('[C260477] Should be able to create a filter on APS for completed processes - Oldest first and check on ADF', () => { browser.controlFlow().execute(async () => { await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({ -
'appId': null,
 'name': processFilter.completed_old_first,
 'icon': 'glyphicon-random', + 'appId': null,
 'name': processFilter.completed_old_first,
 'icon': 'glyphicon-random', 'filter': {'sort': 'created-asc', 'name': '', 'state': 'completed'} }); @@ -133,8 +133,8 @@ describe('Sorting for process filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage - .goToProcessServices() + navigationBarPage + .navigateToProcessServicesPage() .goToTaskApp() .clickProcessButton(); @@ -154,7 +154,7 @@ describe('Sorting for process filters', () => { it('[C260478] Should be able to create a filter on APS for all processes - Oldest first and check on ADF', () => { browser.controlFlow().execute(async () => { - await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({
 + await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({ 'appId': null,
 'name': processFilter.all_old_first,
 'icon': 'glyphicon-random', 'filter': {'sort': 'created-asc', 'name': '', 'state': 'all'} }); @@ -174,8 +174,8 @@ describe('Sorting for process filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage - .goToProcessServices() + navigationBarPage + .navigateToProcessServicesPage() .goToTaskApp() .clickProcessButton(); @@ -198,7 +198,7 @@ describe('Sorting for process filters', () => { it('[C260479] Should be able to create a filter on APS for running processes - Newest first and check on ADF', () => { browser.controlFlow().execute(async () => { - await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({
 + await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({ 'appId': null,
 'name': processFilter.running_new_first,
 'icon': 'glyphicon-random', 'filter': {'sort': 'created-desc', 'name': '', 'state': 'running'} }); @@ -210,8 +210,8 @@ describe('Sorting for process filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage - .goToProcessServices() + navigationBarPage + .navigateToProcessServicesPage() .goToTaskApp() .clickProcessButton(); @@ -231,7 +231,7 @@ describe('Sorting for process filters', () => { it('[C260480] Should be able to create a filter on APS for completed processes - Newest first and check on ADF', () => { browser.controlFlow().execute(async () => { - await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({
 + await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({ 'appId': null,
 'name': processFilter.completed_new_first,
 'icon': 'glyphicon-random', 'filter': {'sort': 'created-desc', 'name': '', 'state': 'completed'} }); @@ -247,8 +247,8 @@ describe('Sorting for process filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage - .goToProcessServices() + navigationBarPage + .navigateToProcessServicesPage() .goToTaskApp() .clickProcessButton(); @@ -268,7 +268,7 @@ describe('Sorting for process filters', () => { it('[C260481] Should be able to create a filter on APS for all processes - Newest first and check on ADF', () => { browser.controlFlow().execute(async () => { - await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({
 + await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({ 'appId': null,
 'name': processFilter.all_new_first,
 'icon': 'glyphicon-random', 'filter': {'sort': 'created-desc', 'name': '', 'state': 'all'} }); @@ -288,8 +288,8 @@ describe('Sorting for process filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage - .goToProcessServices() + navigationBarPage + .navigateToProcessServicesPage() .goToTaskApp() .clickProcessButton(); @@ -312,7 +312,7 @@ describe('Sorting for process filters', () => { it('[C272815] Should be able to create a filter on APS for completed processes - Completed most recently and check on ADF', () => { browser.controlFlow().execute(async () => { - await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({
 + await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({ 'appId': null,
 'name': processFilter.completed_most_recently,
 'icon': 'glyphicon-random', 'filter': {'sort': 'ended-asc', 'name': '', 'state': 'completed'} }); @@ -328,8 +328,8 @@ describe('Sorting for process filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage - .goToProcessServices() + navigationBarPage + .navigateToProcessServicesPage() .goToTaskApp() .clickProcessButton(); @@ -349,7 +349,7 @@ describe('Sorting for process filters', () => { it('[C272816] Should be able to create a filter on APS for completed processes - Completed least recently and check on ADF', () => { browser.controlFlow().execute(async () => { - await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({
 + await this.alfrescoJsApi.activiti.userFiltersApi.createUserProcessInstanceFilter({ 'appId': null,
 'name': processFilter.completed_least_recently,
 'icon': 'glyphicon-random', 'filter': {'sort': 'ended-desc', 'name': '', 'state': 'completed'} }); @@ -365,8 +365,8 @@ describe('Sorting for process filters', () => { loginPage.loginToProcessServicesUsingUserModel(user); - processServicesPage - .goToProcessServices() + navigationBarPage + .navigateToProcessServicesPage() .goToTaskApp() .clickProcessButton(); diff --git a/e2e/process-services/dynamic_table_date_picker.e2e.ts b/e2e/process-services/dynamic_table_date_picker.e2e.ts index 918429de6e..40f06aef6d 100644 --- a/e2e/process-services/dynamic_table_date_picker.e2e.ts +++ b/e2e/process-services/dynamic_table_date_picker.e2e.ts @@ -16,12 +16,12 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage'; import { DynamicTableWidget } from '../pages/adf/process_services/widgets/dynamicTableWidget'; import { DropdownWidget } from '../pages/adf/process_services/widgets/dropdownWidget'; import { DatePickerPage } from '../pages/adf/material/datePickerPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import TestConfig = require('../test.config'); import resources = require('../util/resources'); @@ -33,11 +33,11 @@ import { UsersActions } from '../actions/users.actions'; describe('Dynamic Table', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); let processFiltersPage = new ProcessFiltersPage(); let appNavigationBarPage = new AppNavigationBarPage(); let dynamicTable = new DynamicTableWidget(); let datePicker = new DatePickerPage(); + let navigationBarPage = new NavigationBarPage(); let user, tenantId, appId, apps, users; beforeAll(async(done) => { @@ -97,7 +97,7 @@ describe('Dynamic Table', () => { }); beforeEach(() => { - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); appNavigationBarPage.clickProcessButton(); @@ -152,7 +152,7 @@ describe('Dynamic Table', () => { }); beforeEach(() => { - processServicesPage.goToProcessServices().goToApp(app.title).clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(app.title).clickProcessButton(); appNavigationBarPage.clickProcessButton(); diff --git a/e2e/process-services/empty_process_list_component.e2e.ts b/e2e/process-services/empty_process_list_component.e2e.ts index 8247365adf..9bd81fb2f3 100644 --- a/e2e/process-services/empty_process_list_component.e2e.ts +++ b/e2e/process-services/empty_process_list_component.e2e.ts @@ -65,7 +65,7 @@ describe('Empty Process List Test', () => { it('[C260494] Should add process to list when a process is created', () => { loginPage.loginToProcessServicesUsingUserModel(user); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); processServicesPage.goToApp(appA.title).clickProcessButton(); expect(processListPage.checkProcessListTitleIsDisplayed()).toEqual('No Processes Found'); @@ -79,7 +79,7 @@ describe('Empty Process List Test', () => { expect(processFiltersPage.numberOfProcessRows()).toEqual(1); processDetailsPage.checkProcessDetailsCard(); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); processServicesPage.goToApp(appB.title).clickProcessButton(); expect(processListPage.checkProcessListTitleIsDisplayed()).toEqual('No Processes Found'); diff --git a/e2e/process-services/form_people_widget.e2e.ts b/e2e/process-services/form_people_widget.e2e.ts index 0306956441..022e1fc61a 100644 --- a/e2e/process-services/form_people_widget.e2e.ts +++ b/e2e/process-services/form_people_widget.e2e.ts @@ -16,13 +16,13 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); import { Widget } from '../pages/adf/process_services/widgets/widget'; import StartProcess = require('../pages/adf/process_services/startProcessPage'); import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage'); import { TaskDetailsPage } from '../pages/adf/process_services/taskDetailsPage'; import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import TestConfig = require('../test.config'); import resources = require('../util/resources'); @@ -35,7 +35,6 @@ import { browser } from 'protractor'; describe('Form widgets - People', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); let processUserModel; let app = resources.Files.APP_WITH_USER_WIDGET; let processFiltersPage = new ProcessFiltersPage(); @@ -79,7 +78,7 @@ describe('Form widgets - People', () => { }); beforeEach(() => { - processServicesPage.goToProcessServices().goToApp(appModel.name) + new NavigationBarPage().navigateToProcessServicesPage().goToApp(appModel.name) .clickProcessButton(); processFiltersPage.clickCreateProcessButton(); processFiltersPage.clickNewProcessDropdown(); diff --git a/e2e/process-services/form_widgets_component.e2e.ts b/e2e/process-services/form_widgets_component.e2e.ts index cb77bfd1ff..abb06ee3e8 100644 --- a/e2e/process-services/form_widgets_component.e2e.ts +++ b/e2e/process-services/form_widgets_component.e2e.ts @@ -23,6 +23,7 @@ import { Widget } from '../pages/adf/process_services/widgets/widget'; import CONSTANTS = require('../util/constants'); import FormDefinitionModel = require('../models/APS/FormDefinitionModel'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import Task = require('../models/APS/Task'); import TestConfig = require('../test.config'); @@ -80,7 +81,7 @@ describe('Form widgets', () => { it('[C272778] Should display text and multi-line in form', () => { loginPage.loginToProcessServicesUsingUserModel(processUserModel); - processServicesPage.goToProcessServices().goToApp(appModel.name) + new NavigationBarPage().navigateToProcessServicesPage().goToApp(appModel.name) .clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(newTask).addDescription('Description').addForm(app.formName).clickStartButton() diff --git a/e2e/process-services/pagination_processlist_addingProcesses.e2e.ts b/e2e/process-services/pagination_processlist_addingProcesses.e2e.ts index 24797af3b4..6aff7beb1f 100644 --- a/e2e/process-services/pagination_processlist_addingProcesses.e2e.ts +++ b/e2e/process-services/pagination_processlist_addingProcesses.e2e.ts @@ -16,10 +16,10 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import PaginationPage = require('../pages/adf/paginationPage'); import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import TestConfig = require('../test.config'); import resources = require('../util/resources'); @@ -37,7 +37,6 @@ describe('Process List - Pagination when adding processes', () => { }; let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); let paginationPage = new PaginationPage(); let processFiltersPage = new ProcessFiltersPage(); let processDetailsPage = new ProcessDetailsPage(); @@ -72,7 +71,7 @@ describe('Process List - Pagination when adding processes', () => { loginPage.loginToProcessServicesUsingUserModel(processUserModel); - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + new NavigationBarPage().navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processDetailsPage.checkProcessTitleIsDisplayed(); processFiltersPage.waitForTableBody(); diff --git a/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts b/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts index 332e34c9ab..c333b574d0 100644 --- a/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts +++ b/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts @@ -16,9 +16,9 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; import PaginationPage = require('../pages/adf/paginationPage'); +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); @@ -33,7 +33,6 @@ import { browser } from 'protractor'; describe('Items per page set to 15 and adding of tasks', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); let taskPage = new TasksPage(); let paginationPage = new PaginationPage(); @@ -74,7 +73,7 @@ describe('Items per page set to 15 and adding of tasks', () => { }); it('[C260306] Items per page set to 15 and adding of tasks', () => { - processServicesPage.goToProcessServices().goToTaskApp(); + new NavigationBarPage().navigateToProcessServicesPage().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); paginationPage.selectItemsPerPage(itemsPerPage.fifteen); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen); diff --git a/e2e/process-services/people_component.e2e.ts b/e2e/process-services/people_component.e2e.ts index bd9de61002..9f1dae94b9 100644 --- a/e2e/process-services/people_component.e2e.ts +++ b/e2e/process-services/people_component.e2e.ts @@ -16,8 +16,8 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); @@ -34,7 +34,7 @@ import path = require('path'); describe('People component', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let processUserModel, assigneeUserModel, secondAssigneeUserModel; let app = resources.Files.SIMPLE_APP_WITH_USER_FORM; let taskPage = new TasksPage(); @@ -77,7 +77,7 @@ describe('People component', () => { }); it('[C279989] Should no people be involved when no user is typed', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); @@ -87,7 +87,7 @@ describe('People component', () => { }); it('[C279990] Should no people be involved when clicking on Cancel button', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); @@ -100,7 +100,7 @@ describe('People component', () => { }); it('[C261029] Should People dialog be displayed when clicking on add people button', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); @@ -112,7 +112,7 @@ describe('People component', () => { }); it('[C279991] Should not be able to involve a user when is the creator of the task', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); @@ -124,7 +124,7 @@ describe('People component', () => { }); it('[C261030] Should involved user be removed when clicking on remove button', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); @@ -141,7 +141,7 @@ describe('People component', () => { }); it('[C280013] Should not be able to complete a task by a involved user', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[1]).selectRowByContentName(tasks[1]); @@ -155,7 +155,7 @@ describe('People component', () => { .toEqual(assigneeUserModel.email); loginPage.loginToProcessServicesUsingUserModel(assigneeUserModel); - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[1]).selectRowByContentName(tasks[1]); @@ -164,7 +164,7 @@ describe('People component', () => { it('[C261031] Should be able to involve multiple users to a task', () => { loginPage.loginToProcessServicesUsingUserModel(processUserModel); - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[2]).selectRowByContentName(tasks[2]); @@ -195,7 +195,7 @@ describe('People component', () => { }); it('[C280014] Should involved user see the task in completed filters when the task is completed', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[3]).selectRowByContentName(tasks[3]); @@ -215,7 +215,7 @@ describe('People component', () => { .toEqual(assigneeUserModel.email); loginPage.loginToProcessServicesUsingUserModel(assigneeUserModel); - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[3]).selectRowByContentName(tasks[3]); diff --git a/e2e/process-services/process_attachmentList_actionMenu.e2e.ts b/e2e/process-services/process_attachmentList_actionMenu.e2e.ts index 18c06ffb44..5e9d1574bc 100644 --- a/e2e/process-services/process_attachmentList_actionMenu.e2e.ts +++ b/e2e/process-services/process_attachmentList_actionMenu.e2e.ts @@ -16,11 +16,11 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage'); import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage'; import { ViewerPage } from '../pages/adf/viewerPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import TestConfig = require('../test.config'); import resources = require('../util/resources'); @@ -37,10 +37,10 @@ import { browser } from 'protractor'; describe('Attachment list action menu for processes', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); let processFiltersPage = new ProcessFiltersPage(); let processDetailsPage = new ProcessDetailsPage(); let attachmentListPage = new AttachmentListPage(); + let navigationBarPage = new NavigationBarPage(); let viewerPage = new ViewerPage(); let app = resources.Files.SIMPLE_APP_WITH_USER_FORM; let pngFile = new FileModel({ @@ -97,7 +97,7 @@ describe('Attachment list action menu for processes', () => { }); it('[C260228] Should be able to access options of a file attached to an active process', () => { - processServicesPage.goToProcessServices().goToApp(app.title).clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(app.title).clickProcessButton(); processFiltersPage.selectFromProcessList(processName.active); @@ -131,7 +131,7 @@ describe('Attachment list action menu for processes', () => { }); it('[C279886] Should be able to access options of a file attached to a completed process', () => { - processServicesPage.goToProcessServices().goToApp(app.title).clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(app.title).clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.selectFromProcessList(processName.completed); @@ -165,7 +165,7 @@ describe('Attachment list action menu for processes', () => { }); it('[C277296] Should allow upload file when clicking on \'add\' icon', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.selectFromProcessList(processName.taskApp); @@ -177,7 +177,7 @@ describe('Attachment list action menu for processes', () => { }); it('[C260235] Should empty list component be displayed when no file is attached', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.selectFromProcessList(processName.emptyList); diff --git a/e2e/process-services/process_filters_component.e2e.ts b/e2e/process-services/process_filters_component.e2e.ts index d143f5c34d..d37a112dea 100644 --- a/e2e/process-services/process_filters_component.e2e.ts +++ b/e2e/process-services/process_filters_component.e2e.ts @@ -25,6 +25,7 @@ import StartProcessPage = require('../pages/adf/process_services/startProcessPag import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage'; import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage'); +import { ProcessListPage } from '../pages/adf/process_services/processListPage'; import AlfrescoApi = require('alfresco-js-api-node'); @@ -35,6 +36,7 @@ import { browser } from 'protractor'; describe('Process Filters Test', () => { let loginPage = new LoginPage(); + let processListPage = new ProcessListPage(); let navigationBarPage = new NavigationBarPage(); let processServicesPage = new ProcessServicesPage(); let startProcessPage = new StartProcessPage(); @@ -78,11 +80,11 @@ describe('Process Filters Test', () => { }); beforeEach(() => { - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); processServicesPage.goToApp(app.title); appNavigationBarPage.clickProcessButton(); - processServicesPage.checkProcessListIsDisplayed(); + processListPage.checkProcessListIsDisplayed(); }); it('[C260387] Should the running process be displayed when clicking on Running filter', () => { @@ -94,7 +96,7 @@ describe('Process Filters Test', () => { startProcessPage.clickFormStartProcessButton(); processDetailsPage.clickCancelProcessButton(); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.goToApp(app.title); @@ -151,7 +153,7 @@ describe('Process Filters Test', () => { taskAppFilters.data.forEach((filter) => { browser.get(processFilterUrl + filter.id); - processServicesPage.checkProcessListIsDisplayed(); + processListPage.checkProcessListIsDisplayed(); processFiltersPage.checkFilterIsHighlighted(filter.name); }); }); diff --git a/e2e/process-services/processlist_pagination.e2e.ts b/e2e/process-services/processlist_pagination.e2e.ts index 8e10676129..f94e265725 100644 --- a/e2e/process-services/processlist_pagination.e2e.ts +++ b/e2e/process-services/processlist_pagination.e2e.ts @@ -16,7 +16,7 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import PaginationPage = require('../pages/adf/paginationPage'); import ProcessFiltersPage = require('../pages/adf/process_services/processFiltersPage'); import ProcessDetailsPage = require('../pages/adf/process_services/processDetailsPage'); @@ -45,7 +45,7 @@ describe('Process List - Pagination', function () { let processFilterRunning = 'Running'; let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let paginationPage = new PaginationPage(); let processFiltersPage = new ProcessFiltersPage(); let processDetailsPage = new ProcessDetailsPage(); @@ -80,7 +80,7 @@ describe('Process List - Pagination', function () { describe('Empty processes', function () { it('[C280015] Should show empty content message an no pagination when no process are present', function () { - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.checkNoContentMessage(); paginationPage.checkPaginationIsNotDisplayed(); }); @@ -106,11 +106,11 @@ describe('Process List - Pagination', function () { }); it('[C261042] Should display default pagination', function () { - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); page = 1; totalPages = 1; - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.checkFilterIsHighlighted(processFilterRunning); processDetailsPage.checkProcessTitleIsDisplayed(); @@ -128,7 +128,7 @@ describe('Process List - Pagination', function () { it('[C261043] Should be possible to Items per page to 15', function () { page = 1; totalPages = 2; - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.checkFilterIsHighlighted(processFilterRunning); processDetailsPage.checkProcessTitleIsDisplayed(); @@ -157,7 +157,7 @@ describe('Process List - Pagination', function () { paginationPage.checkPreviousPageButtonIsEnabled(); page = 1; - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.checkFilterIsHighlighted(processFilterRunning); processDetailsPage.checkProcessTitleIsDisplayed(); @@ -170,7 +170,7 @@ describe('Process List - Pagination', function () { it('[C261044] Should be possible to Items per page to 10', function () { page = 1; totalPages = 2; - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.checkFilterIsHighlighted(processFilterRunning); processDetailsPage.checkProcessTitleIsDisplayed(); @@ -199,7 +199,7 @@ describe('Process List - Pagination', function () { paginationPage.checkPreviousPageButtonIsEnabled(); page = 1; - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.checkFilterIsHighlighted(processFilterRunning); processDetailsPage.checkProcessTitleIsDisplayed(); @@ -212,7 +212,7 @@ describe('Process List - Pagination', function () { it('[C261047] Should be possible to Items per page to 20', function () { page = 1; totalPages = 1; - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.checkFilterIsHighlighted(processFilterRunning); processDetailsPage.checkProcessTitleIsDisplayed(); @@ -228,7 +228,7 @@ describe('Process List - Pagination', function () { paginationPage.checkNextPageButtonIsDisabled(); paginationPage.checkPreviousPageButtonIsDisabled(); - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.checkFilterIsHighlighted(processFilterRunning); processDetailsPage.checkProcessTitleIsDisplayed(); @@ -242,7 +242,7 @@ describe('Process List - Pagination', function () { let showing; page = 1; totalPages = 4; - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.checkFilterIsHighlighted(processFilterRunning); processDetailsPage.checkProcessTitleIsDisplayed(); @@ -303,7 +303,7 @@ describe('Process List - Pagination', function () { paginationPage.checkPreviousPageButtonIsEnabled(); page = 1; - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.checkFilterIsHighlighted(processFilterRunning); processDetailsPage.checkProcessTitleIsDisplayed(); @@ -317,7 +317,7 @@ describe('Process List - Pagination', function () { let showing; page = 1; totalPages = 2; - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processDetailsPage.checkProcessTitleIsDisplayed(); processFiltersPage.waitForTableBody(); @@ -368,7 +368,7 @@ describe('Process List - Pagination', function () { }); it('[C261048] Should be possible to sort processes by name', function () { - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.checkFilterIsHighlighted(processFilterRunning); processDetailsPage.checkProcessTitleIsDisplayed(); @@ -388,7 +388,7 @@ describe('Process List - Pagination', function () { }); it('[C286260] Should keep sorting when changing \'Items per page\'', function () { - processServicesPage.goToProcessServices().goToTaskApp().clickProcessButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickProcessButton(); processFiltersPage.clickRunningFilterButton(); processFiltersPage.checkFilterIsHighlighted(processFilterRunning); processDetailsPage.checkProcessTitleIsDisplayed(); diff --git a/e2e/process-services/sort_tasklist_pagination.e2e.ts b/e2e/process-services/sort_tasklist_pagination.e2e.ts index 3388af8f7e..3c1a250ad1 100644 --- a/e2e/process-services/sort_tasklist_pagination.e2e.ts +++ b/e2e/process-services/sort_tasklist_pagination.e2e.ts @@ -18,6 +18,7 @@ import { LoginPage } from '../pages/adf/loginPage'; import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import PaginationPage = require('../pages/adf/paginationPage'); import CONSTANTS = require('../util/constants'); @@ -78,7 +79,7 @@ describe('Task List Pagination - Sorting', () => { }); it('[C260308] Should be possible to sort tasks by name', () => { - processServicesPage.goToProcessServices().goToTaskApp(); + new NavigationBarPage().navigateToProcessServicesPage().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); taskPage.tasksListPage().getDataTable().waitForTableBody(); paginationPage.selectItemsPerPage(itemsPerPage.twenty); diff --git a/e2e/process-services/standalone_task.e2e.ts b/e2e/process-services/standalone_task.e2e.ts index 105642cf69..968f52b603 100644 --- a/e2e/process-services/standalone_task.e2e.ts +++ b/e2e/process-services/standalone_task.e2e.ts @@ -18,8 +18,8 @@ import { browser } from 'protractor'; import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); @@ -37,7 +37,7 @@ import path = require('path'); describe('Start Task - Task App', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let processUserModel; let app = resources.Files.SIMPLE_APP_WITH_USER_FORM; let taskPage = new TasksPage(); @@ -71,7 +71,7 @@ describe('Start Task - Task App', () => { }); it('[C260421] Should a standalone task be displayed when creating a new task without form', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[0]).clickStartButton() .then(() => { @@ -86,7 +86,7 @@ describe('Start Task - Task App', () => { }); it('[C268910] Should a standalone task be displayed in completed tasks when completing it', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[1]).clickStartButton() .then(() => { @@ -104,7 +104,7 @@ describe('Start Task - Task App', () => { }); it('[C268911] Should allow adding a form to a standalone task when clicking on Add form button', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[2]).clickStartButton() .then(() => { @@ -117,7 +117,7 @@ describe('Start Task - Task App', () => { }); it('[C268912] Should a standalone task be displayed when removing the form from APS', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[3]).addForm(app.formName).clickStartButton(); diff --git a/e2e/process-services/start_process_component.e2e.ts b/e2e/process-services/start_process_component.e2e.ts index bec62173f0..7daa55d8c6 100644 --- a/e2e/process-services/start_process_component.e2e.ts +++ b/e2e/process-services/start_process_component.e2e.ts @@ -110,7 +110,7 @@ describe('Start Process Component', () => { beforeEach(() => { loginPage.loginToProcessServicesUsingUserModel(procUserModel); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); }); @@ -127,7 +127,7 @@ describe('Start Process Component', () => { beforeEach(() => { loginPage.loginToProcessServicesUsingUserModel(secondProcUserModel); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); }); @@ -373,7 +373,7 @@ describe('Start Process Component', () => { it('[C260457] Should display process in Completed when cancelled', () => { loginPage.loginToProcessServicesUsingUserModel(secondProcUserModel); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); processServicesPage.goToApp(app.title); appNavigationBarPage.clickProcessButton(); diff --git a/e2e/process-services/start_task_custom_app.e2e.ts b/e2e/process-services/start_task_custom_app.e2e.ts index 5242219dcf..e304e75086 100644 --- a/e2e/process-services/start_task_custom_app.e2e.ts +++ b/e2e/process-services/start_task_custom_app.e2e.ts @@ -18,10 +18,10 @@ import { by } from 'protractor'; import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage'; import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import Task = require('../models/APS/Task'); import Tenant = require('../models/APS/Tenant'); @@ -46,7 +46,7 @@ describe('Start Task - Custom App', () => { let TASK_DATA_FORMAT = 'mmm dd yyyy'; let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let attachmentListPage = new AttachmentListPage(); let appNavigationBarPage = new AppNavigationBarPage(); @@ -91,8 +91,7 @@ describe('Start Task - Custom App', () => { }); it('[C263942] Should be possible to modify a task', () => { - processServicesPage - .goToProcessServices() + navigationBarPage.navigateToProcessServicesPage() .goToApp(appModel.name) .clickTasksButton(); @@ -143,8 +142,7 @@ describe('Start Task - Custom App', () => { }); it('[C263947] Should be able to start a task without form', () => { - processServicesPage - .goToProcessServices() + navigationBarPage.navigateToProcessServicesPage() .goToApp(appModel.name) .clickTasksButton(); @@ -169,7 +167,7 @@ describe('Start Task - Custom App', () => { }); it('[C263948] Should be possible to cancel a task', () => { - processServicesPage.goToProcessServices() + navigationBarPage.navigateToProcessServicesPage() .goToApp(appModel.name) .clickTasksButton(); @@ -191,7 +189,7 @@ describe('Start Task - Custom App', () => { }); it('[C263949] Should be possible to save filled form', () => { - processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(appModel.name).clickTasksButton(); taskPage.filtersPage() .goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); @@ -229,7 +227,7 @@ describe('Start Task - Custom App', () => { }); it('[C263951] Should be possible to assign a user', () => { - processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(appModel.name).clickTasksButton(); taskPage .filtersPage() .goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); @@ -262,7 +260,7 @@ describe('Start Task - Custom App', () => { }); it('Attach a file', () => { - processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(appModel.name).clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage .createNewTask() @@ -274,7 +272,7 @@ describe('Start Task - Custom App', () => { }); it('[C263945] Should Information box be hidden when showHeaderContent property is set on false on custom app', () => { - processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(appModel.name).clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(showHeaderTask).clickStartButton(); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(showHeaderTask); @@ -293,11 +291,11 @@ describe('Start Task - Custom App', () => { }); it('[C263950] Should be able to see Spinner loading on task list when clicking on Tasks on custom app', () => { - processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(appModel.name).clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[7]).clickStartButton(); - processServicesPage.goToProcessServices().goToTaskApp(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp(); taskPage.tasksListPage().getDataTable().checkSpinnerIsDisplayed(); }); diff --git a/e2e/process-services/start_task_task_app.e2e.ts b/e2e/process-services/start_task_task_app.e2e.ts index 89a33cfd7c..d1ed6f89fb 100644 --- a/e2e/process-services/start_task_task_app.e2e.ts +++ b/e2e/process-services/start_task_task_app.e2e.ts @@ -18,10 +18,10 @@ import { by } from 'protractor'; import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage'; import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); @@ -43,19 +43,16 @@ import path = require('path'); describe('Start Task - Task App', () => { - let TASK_DATA_FORMAT = 'mmm dd yyyy'; - let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); let attachmentListPage = new AttachmentListPage(); let appNavigationBarPage = new AppNavigationBarPage(); + let navigationBarPage = new NavigationBarPage(); let processUserModel, assigneeUserModel; let app = resources.Files.SIMPLE_APP_WITH_USER_FORM; let formTextField = app.form_fields.form_fieldId; let formFieldValue = 'First value '; let taskPage = new TasksPage(); - let formModel; let firstComment = 'comm1', firstChecklist = 'checklist1'; let tasks = ['Modifying task', 'Information box', 'No form', 'Not Created', 'Refreshing form', 'Assignee task', 'Attach File']; let showHeaderTask = 'Show Header'; @@ -95,7 +92,7 @@ describe('Start Task - Task App', () => { }); it('[C260383] Should be possible to modify a task', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[0]) .addForm(app.formName).clickStartButton() @@ -117,7 +114,7 @@ describe('Start Task - Task App', () => { }); it('[C260422] Should be possible to cancel a task', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().checkStartButtonIsDisabled().addName(tasks[3]) .checkStartButtonIsEnabled().clickCancelButton() @@ -128,7 +125,7 @@ describe('Start Task - Task App', () => { }); it('[C260423] Should be possible to save filled form', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask() .addForm(app.formName).addName(tasks[4]).clickStartButton() @@ -145,7 +142,7 @@ describe('Start Task - Task App', () => { }); it('[C260425] Should be possible to assign a user', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[5]) .addAssignee(assigneeUserModel.firstName).clickStartButton() @@ -160,7 +157,7 @@ describe('Start Task - Task App', () => { }); it('Attach a file', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[6]).clickStartButton() .then(() => { @@ -170,7 +167,7 @@ describe('Start Task - Task App', () => { }); it('[C260420] Should Information box be hidden when showHeaderContent property is set on false', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(showHeaderTask); @@ -188,7 +185,7 @@ describe('Start Task - Task App', () => { }); it('[C260424] Should be able to see Spinner loading on task list when clicking on Tasks', () => { - processServicesPage.goToProcessServices().goToTaskApp(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp(); taskPage.tasksListPage().getDataTable().checkSpinnerIsDisplayed(); }); diff --git a/e2e/process-services/task-audit.e2e.ts b/e2e/process-services/task-audit.e2e.ts index 72fd36bc0a..1d59cee152 100644 --- a/e2e/process-services/task-audit.e2e.ts +++ b/e2e/process-services/task-audit.e2e.ts @@ -16,7 +16,7 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; import CONSTANTS = require('../util/constants'); @@ -36,7 +36,7 @@ import Util = require('../util/util'); describe('Task Audit', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let processUserModel; let app = resources.Files.SIMPLE_APP_WITH_USER_FORM; let taskPage = new TasksPage(); @@ -73,7 +73,7 @@ describe('Task Audit', () => { }); it('[C260386] Should Audit file be downloaded when clicking on Task Audit log icon on a standalone running task', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskTaskApp); @@ -82,7 +82,7 @@ describe('Task Audit', () => { }); it('[C260389] Should Audit file be downloaded when clicking on Task Audit log icon on a standalone completed task', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskTaskApp); @@ -96,7 +96,7 @@ describe('Task Audit', () => { }); it('[C263944] Should Audit file be downloaded when clicking on Task Audit log icon on a custom app standalone completed task', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.createNewTask().addName(taskCompleteCustomApp).clickStartButton(); @@ -113,7 +113,7 @@ describe('Task Audit', () => { }); it('[C263943] Should Audit file be downloaded when clicking on Task Audit log icon on a custom app standalone running task', () => { - processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(appModel.name).clickTasksButton(); taskPage.createNewTask().addName(taskCustomApp).clickStartButton(); diff --git a/e2e/process-services/task_attachmentList_actionMenu.e2e.ts b/e2e/process-services/task_attachmentList_actionMenu.e2e.ts index 596663c310..a587f3c278 100644 --- a/e2e/process-services/task_attachmentList_actionMenu.e2e.ts +++ b/e2e/process-services/task_attachmentList_actionMenu.e2e.ts @@ -18,7 +18,7 @@ import { browser } from 'protractor'; import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage'; import { ViewerPage } from '../pages/adf/viewerPage'; @@ -40,7 +40,7 @@ import FileModel = require('../models/ACS/fileModel'); describe('Attachment list action menu for tasks', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let taskPage = new TasksPage(); let attachmentListPage = new AttachmentListPage(); let viewerPage = new ViewerPage(); @@ -91,7 +91,7 @@ describe('Attachment list action menu for tasks', () => { }); it('[C277311] Should be able to View /Download /Remove from Attachment List on an active task', () => { - processServicesPage.goToProcessServices().goToApp(app.title).clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(app.title).clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(taskName.active).clickStartButton(); @@ -122,7 +122,7 @@ describe('Attachment list action menu for tasks', () => { }); it('[C260236] Should be able to View /Download /Remove from Attachment List on a completed task', () => { - processServicesPage.goToProcessServices().goToApp(app.title).clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(app.title).clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(taskName.completed).clickStartButton(); @@ -154,7 +154,7 @@ describe('Attachment list action menu for tasks', () => { }); it('[C260225] Should be able to upload a file in the Attachment list on Task App', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(taskName.taskApp).clickStartButton(); @@ -164,7 +164,7 @@ describe('Attachment list action menu for tasks', () => { }); it('[C279884] Should be able to view the empty attachment list for tasks', () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(taskName.emptyList).clickStartButton(); @@ -191,7 +191,7 @@ describe('Attachment list action menu for tasks', () => { relatedContentId = relatedContent.id; }); - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().selectRowByContentName('SHARE KNOWLEDGE'); @@ -202,7 +202,7 @@ describe('Attachment list action menu for tasks', () => { await this.alfrescoJsApi.activiti.contentApi.deleteContent(relatedContentId); }); - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().selectRowByContentName('SHARE KNOWLEDGE'); diff --git a/e2e/process-services/task_details.e2e.ts b/e2e/process-services/task_details.e2e.ts index 5cb1341a69..689e0cfe98 100644 --- a/e2e/process-services/task_details.e2e.ts +++ b/e2e/process-services/task_details.e2e.ts @@ -30,7 +30,7 @@ import CONSTANTS = require('../util/constants'); import dateFormat = require('dateformat'); import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; describe('Task Details component', () => { @@ -43,8 +43,8 @@ describe('Task Details component', () => { let apps; let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); let taskPage = new TasksPage(); + let navigationBarPage = new NavigationBarPage(); beforeAll(async (done) => { let users = new UsersActions(); @@ -71,7 +71,7 @@ describe('Task Details component', () => { }); it('[C260506] Should display task details for standalone task - Task App', async () => { - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[1]).addDescription('Description') .addForm(app.formName).clickStartButton(); @@ -113,7 +113,7 @@ describe('Task Details component', () => { }); it('[C263946] Should display task details for standalone task - Custom App', async () => { - processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(appModel.name).clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[1]).addDescription('Description') .addForm(app.formName).clickStartButton(); @@ -160,7 +160,7 @@ describe('Task Details component', () => { await apps.startProcess(this.alfrescoJsApi, appModel); }); - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); expect(taskPage.taskDetails().getTitle()).toEqual('Activities'); @@ -206,7 +206,7 @@ describe('Task Details component', () => { await apps.startProcess(this.alfrescoJsApi, appModel); }); - processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(appModel.name).clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); expect(taskPage.taskDetails().getTitle()).toEqual('Activities'); @@ -254,7 +254,7 @@ describe('Task Details component', () => { await this.alfrescoJsApi.activiti.taskApi.createNewTask({'name': taskName}); }); - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskName).selectRowByContentName(taskName); @@ -296,7 +296,7 @@ describe('Task Details component', () => { await apps.startProcess(this.alfrescoJsApi, appModel); }); - processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToApp(appModel.name).clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); expect(taskPage.taskDetails().getTitle()).toEqual('Activities'); @@ -338,7 +338,7 @@ describe('Task Details component', () => { return this.alfrescoJsApi.activiti.taskApi.createNewTask({'name': taskName}); }); - processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskName).selectRowByContentName(taskName); diff --git a/e2e/process-services/task_details_form.e2e.ts b/e2e/process-services/task_details_form.e2e.ts index e41141eff2..d3a22ef0a7 100644 --- a/e2e/process-services/task_details_form.e2e.ts +++ b/e2e/process-services/task_details_form.e2e.ts @@ -20,7 +20,7 @@ import Util = require('../util/util'); import CONSTANTS = require('../util/constants'); import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import TasksListPage = require('../pages/adf/process_services/tasksListPage'); import { TaskDetailsPage } from '../pages/adf/process_services/taskDetailsPage'; import FiltersPage = require('../pages/adf/process_services/filtersPage'); @@ -32,7 +32,7 @@ import { UsersActions } from '../actions/users.actions'; describe('Task Details - Form', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let tasksListPage = new TasksListPage(); let taskDetailsPage = new TaskDetailsPage(); let filtersPage = new FiltersPage(); @@ -82,8 +82,7 @@ describe('Task Details - Form', () => { task = await this.alfrescoJsApi.activiti.taskApi.getTask(emptyTask.id); - processServicesPage.goToProcessServices(); - processServicesPage.goToTaskApp(); + new NavigationBarPage().navigateToProcessServicesPage().goToTaskApp(); tasksListPage.checkTaskListIsLoaded(); filtersPage.goToFilter('Involved Tasks'); tasksListPage.checkTaskListIsLoaded(); diff --git a/e2e/process-services/task_filters_component.e2e.ts b/e2e/process-services/task_filters_component.e2e.ts index 681c701401..64860a2f4a 100644 --- a/e2e/process-services/task_filters_component.e2e.ts +++ b/e2e/process-services/task_filters_component.e2e.ts @@ -77,7 +77,7 @@ describe('Task', () => { loginPage.loginToProcessServicesUsingUserModel(user); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); processServicesPage.goToApp(app.title); @@ -265,7 +265,7 @@ describe('Task', () => { }); beforeEach(async () => { - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); processServicesPage.goToApp(app.title); }); diff --git a/e2e/process-services/task_filters_sorting.e2e.ts b/e2e/process-services/task_filters_sorting.e2e.ts index 1db7b782f6..6f8bc36f3a 100644 --- a/e2e/process-services/task_filters_sorting.e2e.ts +++ b/e2e/process-services/task_filters_sorting.e2e.ts @@ -79,7 +79,7 @@ describe('Task Filters Sorting', () => { await loginPage.loginToProcessServicesUsingUserModel(user); - navigationBarPage.clickProcessServicesButton(); + navigationBarPage.navigateToProcessServicesPage(); processServicesPage.checkApsContainer(); processServicesPage.goToApp(app.title); diff --git a/e2e/process-services/task_list_pagination.e2e.ts b/e2e/process-services/task_list_pagination.e2e.ts index 1dcb8093ee..3b0ab93b32 100644 --- a/e2e/process-services/task_list_pagination.e2e.ts +++ b/e2e/process-services/task_list_pagination.e2e.ts @@ -16,8 +16,8 @@ */ import { LoginPage } from '../pages/adf/loginPage'; -import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage'; import { TasksPage } from '../pages/adf/process_services/tasksPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import PaginationPage = require('../pages/adf/paginationPage'); import CONSTANTS = require('../util/constants'); @@ -32,7 +32,7 @@ import { UsersActions } from '../actions/users.actions'; describe('Task List Pagination', () => { let loginPage = new LoginPage(); - let processServicesPage = new ProcessServicesPage(); + let navigationBarPage = new NavigationBarPage(); let taskPage = new TasksPage(); let paginationPage = new PaginationPage(); @@ -80,7 +80,7 @@ describe('Task List Pagination', () => { }); it('[C260301] Should display default pagination', () => { - processServicesPage.goToProcessServices().goToTaskApp(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp(); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.default); expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + nrOfTasks + ' of ' + nrOfTasks); expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(nrOfTasks); @@ -92,7 +92,7 @@ describe('Task List Pagination', () => { }); it('[C260304] Should be possible to set Items per page to 5', () => { - processServicesPage.goToProcessServices().goToTaskApp(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); paginationPage.selectItemsPerPage(itemsPerPage.five); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five); @@ -114,13 +114,13 @@ describe('Task List Pagination', () => { expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks); expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.fiveValue); - processServicesPage.goToProcessServices().goToTaskApp(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five); }); it('[C260303] Should be possible to set Items per page to 10', () => { - processServicesPage.goToProcessServices().goToTaskApp(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); paginationPage.selectItemsPerPage(itemsPerPage.ten); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten); @@ -131,13 +131,13 @@ describe('Task List Pagination', () => { expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + itemsPerPage.twentyValue + ' of ' + nrOfTasks); expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.tenValue); - processServicesPage.goToProcessServices().goToTaskApp(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten); }); it('[C260302] Should be possible to set Items per page to 15', () => { - processServicesPage.goToProcessServices().goToTaskApp(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); paginationPage.selectItemsPerPage(itemsPerPage.fifteen); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen); @@ -148,7 +148,7 @@ describe('Task List Pagination', () => { expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + itemsPerPage.twentyValue + ' of ' + nrOfTasks); expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.fiveValue); - processServicesPage.goToProcessServices().goToTaskApp(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen); }); @@ -156,7 +156,7 @@ describe('Task List Pagination', () => { it('[C261006] Should be possible to navigate to a page with page number dropdown', () => { currentPage = 1; totalPages = 2; - processServicesPage.goToProcessServices().goToTaskApp(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); taskPage.tasksListPage().getDataTable().waitForTableBody(); paginationPage.selectItemsPerPage(itemsPerPage.ten); @@ -199,7 +199,7 @@ describe('Task List Pagination', () => { it('Pagination in an empty task list', () => { loginPage.loginToProcessServicesUsingUserModel(processUserModelEmpty); - processServicesPage.goToProcessServices().goToTaskApp(); + navigationBarPage.navigateToProcessServicesPage().goToTaskApp(); paginationPage.checkPaginationIsNotDisplayed(); });