Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AAE-4379] i18n fixes #6515

Merged
merged 18 commits into from
Jan 11, 2021
Merged

[AAE-4379] i18n fixes #6515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8f35a08
add missing translations
DenysVuika Jan 8, 2021
8a1b8b0
add missing translations
DenysVuika Jan 8, 2021
93d0f12
fix unit tests
DenysVuika Jan 8, 2021
62b9857
reduce overhead
DenysVuika Jan 8, 2021
6181c6a
update e2e
DenysVuika Jan 9, 2021
2c6e73e
update e2e
DenysVuika Jan 9, 2021
0326b50
cleanup e2e
DenysVuika Jan 9, 2021
ab3a690
cleanup e2e
DenysVuika Jan 9, 2021
e534ec9
cleanup e2e
DenysVuika Jan 9, 2021
97705c6
update e2e
DenysVuika Jan 9, 2021
63557e8
update e2e
DenysVuika Jan 9, 2021
2088b8a
update code
DenysVuika Jan 9, 2021
ab4c2e4
update code
DenysVuika Jan 9, 2021
6d4696e
update code
DenysVuika Jan 9, 2021
b87db04
update code
DenysVuika Jan 9, 2021
3b89379
code fixes
DenysVuika Jan 9, 2021
fd50694
code fixes
DenysVuika Jan 9, 2021
886eb7a
code fixes
DenysVuika Jan 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
271 changes: 139 additions & 132 deletions e2e/process-services-cloud/edit-process-filters-component.e2e.ts
View file
Open in desktop

Large diffs are not rendered by default.

373 changes: 189 additions & 184 deletions e2e/process-services-cloud/edit-task-filters-component.e2e.ts
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 14 additions & 10 deletions e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ describe('Form Field Component - Dropdown Widget', () => {
const loginSSOPage = new LoginPage();
const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage();

const tasksCloudDemoPage = new TasksCloudDemoPage();
const taskFilter = tasksCloudDemoPage.taskFilterCloudComponent;
const taskList = tasksCloudDemoPage.taskListCloudComponent();

const taskFormCloudComponent = new TaskFormCloudComponent();
const notificationHistoryPage = new NotificationHistoryPage();
const taskHeaderCloudPage = new TaskHeaderCloudPage();
Expand Down Expand Up @@ -84,11 +88,11 @@ describe('Form Field Component - Dropdown Widget', () => {
});

it('[C290069] Should be able to read rest service dropdown options, save and complete the task form', async () => {
await tasksCloudDemoPage.taskFilterCloudComponent.clickTaskFilter('my-tasks');
await tasksCloudDemoPage.taskListCloudComponent().getDataTable().waitTillContentLoaded();
await taskFilter.clickTaskFilter('my-tasks');
await taskList.getDataTable().waitTillContentLoaded();

await tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(task.entry.name);
await tasksCloudDemoPage.taskListCloudComponent().selectRow(task.entry.name);
await taskList.checkContentIsDisplayedByName(task.entry.name);
await taskList.selectRow(task.entry.name);

await taskHeaderCloudPage.checkTaskPropertyListIsDisplayed();

Expand All @@ -106,16 +110,16 @@ describe('Form Field Component - Dropdown Widget', () => {
await taskFormCloudComponent.checkCompleteButtonIsDisplayed();
await taskFormCloudComponent.clickCompleteButton();

await expect(await tasksCloudDemoPage.taskFilterCloudComponent.getActiveFilterName()).toBe('My Tasks');
await expect(await taskFilter.getActiveFilterName()).toBe('My Tasks');

await tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(task.entry.name);
await taskList.checkContentIsNotDisplayedByName(task.entry.name);
await notificationHistoryPage.checkNotifyContains('Task has been saved successfully');

await tasksCloudDemoPage.taskFilterCloudComponent.clickTaskFilter('completed-tasks');
await tasksCloudDemoPage.taskListCloudComponent().getDataTable().waitTillContentLoaded();
await taskFilter.clickTaskFilter('completed-tasks');
await taskList.getDataTable().waitTillContentLoaded();

await tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(task.entry.name);
await tasksCloudDemoPage.taskListCloudComponent().selectRow(task.entry.name);
await taskList.checkContentIsDisplayedByName(task.entry.name);
await taskList.selectRow(task.entry.name);

await taskFormCloudComponent.formFields().checkFormIsDisplayed();
await taskFormCloudComponent.formFields().checkWidgetIsVisible('Dropdown097maj');
Expand Down
35 changes: 21 additions & 14 deletions e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,18 @@ describe('Task cloud visibility', async () => {

const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage();

const tasksCloudDemoPage = new TasksCloudDemoPage();
const taskList = tasksCloudDemoPage.taskListCloudComponent();

const startTask = new StartTasksCloudPage();
const taskFormCloudComponent = new TaskFormCloudComponent();
const startProcessPage = new StartProcessCloudPage();

const processCloudDemoPage = new ProcessCloudDemoPage();
const editProcessFilter = processCloudDemoPage.editProcessFilterCloudComponent();
const processList = processCloudDemoPage.processListCloudComponent();

const loginSSOPage = new LoginPage();
const widget = new ProcessCloudWidgetPage();

Expand Down Expand Up @@ -83,8 +90,8 @@ describe('Task cloud visibility', async () => {
await startTask.selectFormDefinition(browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.forms.requirednumbervisibility.name);

await startTask.clickStartButton();
await tasksCloudDemoPage.taskListCloudComponent().getDataTable().waitTillContentLoaded();
await tasksCloudDemoPage.taskListCloudComponent().selectRow(standaloneTaskName);
await taskList.getDataTable().waitTillContentLoaded();
await taskList.selectRow(standaloneTaskName);

await taskFormCloudComponent.formFields().checkWidgetIsVisible('Number1');
await taskFormCloudComponent.formFields().checkWidgetIsHidden('Number2');
Expand All @@ -108,11 +115,11 @@ describe('Task cloud visibility', async () => {
await startProcessPage.checkStartProcessButtonIsEnabled();
await startProcessPage.clickStartProcessButton();

await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ processName });
await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded();
await processCloudDemoPage.processListCloudComponent().selectRow(processName);
await tasksCloudDemoPage.taskListCloudComponent().getDataTable().waitTillContentLoaded();
await tasksCloudDemoPage.taskListCloudComponent().selectRow('number_visibility_task');
await editProcessFilter.setFilter({ processName });
await processList.getDataTable().waitTillContentLoaded();
await processList.selectRow(processName);
await taskList.getDataTable().waitTillContentLoaded();
await taskList.selectRow('number_visibility_task');
await taskFormCloudComponent.clickClaimButton();

await taskFormCloudComponent.formFields().checkWidgetIsVisible('Number1');
Expand Down Expand Up @@ -140,11 +147,11 @@ describe('Task cloud visibility', async () => {
await browser.sleep(400);
await startProcessPage.clickStartProcessButton();

await processCloudDemoPage.editProcessFilterCloudComponent().setFilter({ processName });
await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded();
await processCloudDemoPage.processListCloudComponent().selectRow(processName);
await tasksCloudDemoPage.taskListCloudComponent().getDataTable().waitTillContentLoaded();
await tasksCloudDemoPage.taskListCloudComponent().selectRow('boolean_visibility_task');
await editProcessFilter.setFilter({ processName });
await processList.getDataTable().waitTillContentLoaded();
await processList.selectRow(processName);
await taskList.getDataTable().waitTillContentLoaded();
await taskList.selectRow('boolean_visibility_task');
await taskFormCloudComponent.clickClaimButton();

await browser.sleep(400);
Expand All @@ -169,8 +176,8 @@ describe('Task cloud visibility', async () => {
await startTask.selectFormDefinition(browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.forms.booleanvisibility.name);

await startTask.clickStartButton();
await tasksCloudDemoPage.taskListCloudComponent().getDataTable().waitTillContentLoaded();
await tasksCloudDemoPage.taskListCloudComponent().selectRow(standaloneTaskName);
await taskList.getDataTable().waitTillContentLoaded();
await taskList.selectRow(standaloneTaskName);

await taskFormCloudComponent.formFields().checkWidgetIsVisible('Checkbox2');
await taskFormCloudComponent.formFields().checkWidgetIsHidden('Checkbox3');
Expand Down
5 changes: 0 additions & 5 deletions e2e/process-services-cloud/pages/tasks-cloud-demo.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ export class TasksCloudDemoPage {
togglePage = new TogglePage();

editTaskFilterCloud = new EditTaskFilterCloudComponentPage();

taskFilterCloudComponent = new TaskFiltersCloudComponentPage();

async disableDisplayTaskDetails(): Promise<void> {
Expand Down Expand Up @@ -83,10 +82,6 @@ export class TasksCloudDemoPage {
return new TaskListCloudComponentPage();
}

editTaskFilterCloudComponent(): EditTaskFilterCloudComponentPage {
return this.editTaskFilterCloud;
}

async openNewTaskForm(): Promise<void> {
await BrowserActions.click(this.createButton);
await BrowserActions.clickExecuteScript('button[data-automation-id="btn-start-task"]');
Expand Down