diff --git a/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts index 64b8eabcfa..e66ad33ec6 100644 --- a/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts +++ b/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { Util } from '../../../util/util'; +import { Util } from '../../../../util/util'; -import { ProcessFiltersCloudComponent } from '../process-cloud/processFiltersCloudComponent'; -import { ProcessListCloudComponent } from '../process-cloud/processListCloudComponent'; -import { EditProcessFilterCloudComponent } from '../process-cloud/editProcessFilterCloudComponent'; +import { ProcessFiltersCloudComponent } from '../../process-cloud/processFiltersCloudComponent'; +import { ProcessListCloudComponent } from '../../process-cloud/processListCloudComponent'; +import { EditProcessFilterCloudComponent } from '../../process-cloud/editProcessFilterCloudComponent'; import { element, by } from 'protractor'; export class ProcessCloudDemoPage { diff --git a/e2e/pages/adf/demo-shell/process-services/taskFiltersDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/taskFiltersDemoPage.ts index 8ab9758846..ead767ed9d 100644 --- a/e2e/pages/adf/demo-shell/process-services/taskFiltersDemoPage.ts +++ b/e2e/pages/adf/demo-shell/process-services/taskFiltersDemoPage.ts @@ -15,10 +15,10 @@ * limitations under the License. */ -import { Util } from '../../../util/util'; +import { Util } from '../../../../util/util'; import { element, by } from 'protractor'; -import { TaskFiltersPage } from '../process-services/taskFiltersPage'; +import { TaskFiltersPage } from '../../process-services/taskFiltersPage'; export class TaskFiltersDemoPage { diff --git a/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts index 48b7b7a31f..007973349b 100644 --- a/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts +++ b/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { Util } from '../../../util/util'; -import { TasksListPage } from '../process-services/tasksListPage'; -import { PaginationPage } from '../paginationPage'; +import { Util } from '../../../../util/util'; +import { TasksListPage } from '../../process-services/tasksListPage'; +import { PaginationPage } from '../../paginationPage'; import { element, by } from 'protractor'; export class TaskListDemoPage { diff --git a/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts index a06ea9ab06..14d800785c 100644 --- a/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts +++ b/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { Util } from '../../../util/util'; +import { Util } from '../../../../util/util'; -import { TaskFiltersCloudComponent } from '../process-cloud/taskFiltersCloudComponent'; -import { TaskListCloudComponent } from '../process-cloud/taskListCloudComponent'; -import { EditTaskFilterCloudComponent } from '../process-cloud/editTaskFilterCloudComponent'; +import { TaskFiltersCloudComponent } from '../../process-cloud/taskFiltersCloudComponent'; +import { TaskListCloudComponent } from '../../process-cloud/taskListCloudComponent'; +import { EditTaskFilterCloudComponent } from '../../process-cloud/editTaskFilterCloudComponent'; import { element, by } from 'protractor'; export class TasksCloudDemoPage { @@ -29,7 +29,7 @@ export class TasksCloudDemoPage { activeFilter = element(by.css("mat-list-item[class*='active'] span")); taskFilters = element(by.css("mat-expansion-panel[data-automation-id='Task Filters']")); - + defaultActiveFilter = element.all(by.css('.adf-filters__entry')).first(); editTaskFilterCloud = new EditTaskFilterCloudComponent(); createButton = element(by.css('button[data-automation-id="create-button"')); @@ -97,4 +97,8 @@ export class TasksCloudDemoPage { return this; } + firstFilterIsActive () { + return this.defaultActiveFilter.getAttribute('class').then((value) => value.includes('adf-active')); + } + } diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index afe65e3aa4..962dfb2b8c 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -20,8 +20,8 @@ import TestConfig = require('../test.config'); import { LoginSSOPage } from '../pages/adf/loginSSOPage'; import { SettingsPage } from '../pages/adf/settingsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/processCloudDemoPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/tasksCloudDemoPage'; +import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { AppListCloudComponent } from '../pages/adf/process-cloud/appListCloudComponent'; import { ProcessDefinitions } from '../actions/APS-cloud/process-definitions'; diff --git a/e2e/process-services-cloud/process-filters-cloud.e2e.ts b/e2e/process-services-cloud/process-filters-cloud.e2e.ts index 080438d484..197be06821 100644 --- a/e2e/process-services-cloud/process-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-filters-cloud.e2e.ts @@ -20,8 +20,8 @@ import TestConfig = require('../test.config'); import { LoginSSOPage } from '../pages/adf/loginSSOPage'; import { SettingsPage } from '../pages/adf/settingsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/processCloudDemoPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/tasksCloudDemoPage'; +import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { AppListCloudComponent } from '../pages/adf/process-cloud/appListCloudComponent'; import { ProcessDefinitions } from '../actions/APS-cloud/process-definitions'; diff --git a/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts b/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts index c090d74b0f..162f35f18f 100644 --- a/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts @@ -20,7 +20,7 @@ import { SettingsPage } from '../pages/adf/settingsPage'; import { AppListCloudComponent } from '../pages/adf/process-cloud/appListCloudComponent'; import TestConfig = require('../test.config'); import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/tasksCloudDemoPage'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { StartTasksCloudComponent } from '../pages/adf/process-cloud/startTasksCloudComponent'; import { Util } from '../util/util'; diff --git a/e2e/process-services-cloud/task-filters-cloud.e2e.ts b/e2e/process-services-cloud/task-filters-cloud.e2e.ts index 860454170f..86d537ba0b 100644 --- a/e2e/process-services-cloud/task-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-filters-cloud.e2e.ts @@ -20,8 +20,9 @@ import TestConfig = require('../test.config'); import { LoginSSOPage } from '../pages/adf/loginSSOPage'; import { SettingsPage } from '../pages/adf/settingsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/tasksCloudDemoPage'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { AppListCloudComponent } from '../pages/adf/process-cloud/appListCloudComponent'; +import { Util } from '../util/util'; import { Tasks } from '../actions/APS-cloud/tasks'; describe('Task filters cloud', () => { @@ -36,7 +37,7 @@ describe('Task filters cloud', () => { const user = TestConfig.adf.adminEmail, password = TestConfig.adf.adminPassword; let silentLogin; - const newTask = 'newTask', completedTask = 'completedTask1'; + const newTask = Util.generateRandomString(5), completedTask = Util.generateRandomString(5); const simpleApp = 'simple-app'; beforeAll(() => { @@ -90,6 +91,11 @@ describe('Task filters cloud', () => { tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkContentIsDisplayed(completedTask); }); + it('[C291792] Should select the first task filter from the list as default', () => { + + expect(tasksCloudDemoPage.firstFilterIsActive()).toBe(true); + }); + }); }); diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts index a9e5d1e0d0..59fa15be77 100644 --- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts @@ -21,8 +21,8 @@ import resources = require('../util/resources'); import { LoginSSOPage } from '../pages/adf/loginSSOPage'; import { SettingsPage } from '../pages/adf/settingsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import TasksListPage = require('../pages/adf/process_services/tasksListPage'); -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/tasksCloudDemoPage'; +import { TasksListPage } from '../pages/adf/process_services/tasksListPage'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { AppListCloudComponent } from '../pages/adf/process-cloud/appListCloudComponent'; import AlfrescoApi = require('alfresco-js-api-node');