From b0dbf257f1650b6bf53085d314a784b69a5c919d Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Wed, 6 Dec 2023 23:56:41 +0000 Subject: [PATCH] Fixing e2e - part III --- .../dialog/create-checklist-dialog.page.ts | 2 +- .../pages/dialog/start-task-dialog.page.ts | 2 +- e2e/process-services/pages/task-details.page.ts | 4 ++-- .../search-properties.component.ts | 4 ++++ lib/core/src/lib/context-menu/animations.ts | 4 ++-- .../lib/form/components/widgets/form.theme.scss | 6 ++++++ .../dropdown/dropdown-cloud.widget.spec.ts | 17 +++++++++++++++++ .../form/widgets/dropdown/dropdown.widget.scss | 5 +++++ .../components/start-process.component.spec.ts | 5 +++++ .../pages/search/search-sorting-picker.page.ts | 4 ++-- .../protractor/core/pages/form/form-fields.ts | 2 +- .../edit-task-filter-cloud-component.page.ts | 4 ++-- .../pages/start-process-cloud-component.page.ts | 2 +- 13 files changed, 49 insertions(+), 12 deletions(-) diff --git a/e2e/process-services/pages/dialog/create-checklist-dialog.page.ts b/e2e/process-services/pages/dialog/create-checklist-dialog.page.ts index 15a51d5c8e..51c03cd734 100644 --- a/e2e/process-services/pages/dialog/create-checklist-dialog.page.ts +++ b/e2e/process-services/pages/dialog/create-checklist-dialog.page.ts @@ -42,7 +42,7 @@ export class ChecklistDialog { } async getNameFieldPlaceholder(): Promise { - return BrowserActions.getAttribute(this.nameField, 'data-placeholder'); + return BrowserActions.getAttribute(this.nameField, 'placeholder'); } async checkCancelButtonIsEnabled(): Promise { diff --git a/e2e/process-services/pages/dialog/start-task-dialog.page.ts b/e2e/process-services/pages/dialog/start-task-dialog.page.ts index 38abf9d8b1..42fc261c88 100644 --- a/e2e/process-services/pages/dialog/start-task-dialog.page.ts +++ b/e2e/process-services/pages/dialog/start-task-dialog.page.ts @@ -58,7 +58,7 @@ export class StartTaskDialogPage { } async getAssignee(): Promise { - return BrowserActions.getAttribute(this.assignee, 'data-placeholder'); + return BrowserActions.getAttribute(this.assignee, 'placeholder'); } async selectForm(form): Promise { diff --git a/e2e/process-services/pages/task-details.page.ts b/e2e/process-services/pages/task-details.page.ts index 05c0082053..db1bddbd53 100644 --- a/e2e/process-services/pages/task-details.page.ts +++ b/e2e/process-services/pages/task-details.page.ts @@ -180,7 +180,7 @@ export class TaskDetailsPage { } async getDescriptionPlaceholder(): Promise { - return BrowserActions.getAttribute(this.descriptionField, 'data-placeholder'); + return BrowserActions.getAttribute(this.descriptionField, 'placeholder'); } getDueDate(): Promise { @@ -310,7 +310,7 @@ export class TaskDetailsPage { } async getInvolvePeoplePlaceholder(): Promise { - return BrowserActions.getAttribute(this.addPeopleField, 'data-placeholder'); + return BrowserActions.getAttribute(this.addPeopleField, 'placeholder'); } async checkCancelButtonIsEnabled(): Promise { diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts index abe4ef6077..24bd5bec6b 100644 --- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts +++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts @@ -104,7 +104,11 @@ export class SearchPropertiesComponent implements OnInit, AfterViewChecked, Sear const extraFreeSpace = 20; this._fileSizeOperatorsMaxWidth = Math.max(...this._fileSizeOperators.map((operator) => this.getOperatorNameWidth(operator, this.getCanvasFont(this.fileSizeOperatorSelectElement.nativeElement)))) + +<<<<<<< Updated upstream this.fileSizeOperatorSelectElement.nativeElement.querySelector('.mat-mdc-select-arrow').clientWidth + +======= + this.fileSizeOperatorSelectElement.nativeElement.querySelector('.mat-mdc-select-arrow-wrapper').clientWidth + +>>>>>>> Stashed changes extraFreeSpace; }); } diff --git a/lib/core/src/lib/context-menu/animations.ts b/lib/core/src/lib/context-menu/animations.ts index 42d610dde7..2079642f96 100644 --- a/lib/core/src/lib/context-menu/animations.ts +++ b/lib/core/src/lib/context-menu/animations.ts @@ -33,10 +33,10 @@ export const contextMenuAnimation: ( AnimationStateMetadata | AnimationTransitio transform: 'scale(0.01, 0.01)' })), transition('void => *', sequence([ - query('.mat-menu-content', style({ opacity: 0 })), + query('.mat-mdc-menu-content', style({ opacity: 0 })), animate('100ms linear', style({ opacity: 1, transform: 'scale(1, 0.5)' })), group([ - query('.mat-menu-content', animate('400ms cubic-bezier(0.55, 0, 0.55, 0.2)', + query('.mat-mdc-menu-content', animate('400ms cubic-bezier(0.55, 0, 0.55, 0.2)', style({ opacity: 1 }) )), animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({ transform: 'scale(1, 1)' })) diff --git a/lib/core/src/lib/form/components/widgets/form.theme.scss b/lib/core/src/lib/form/components/widgets/form.theme.scss index 8567ba2b07..f96bc926b4 100644 --- a/lib/core/src/lib/form/components/widgets/form.theme.scss +++ b/lib/core/src/lib/form/components/widgets/form.theme.scss @@ -73,9 +73,15 @@ ul > li > form-field > .adf-focus { /* query for Microsoft IE 11 */ @media screen and (-ms-high-contrast: active), screen and (-ms-high-contrast: none) { adf-form-field { +<<<<<<< Updated upstream .mat-mdc-input-element, .mat-mdc-select, .mat-mdc-form-field { +======= + .mat-input-element, + .mat-mdc-select, + .mat-form-field { +>>>>>>> Stashed changes display: block !important; } } diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts index feb31a6232..5459e3b834 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts @@ -203,8 +203,13 @@ describe('DropdownCloudWidgetComponent', () => { await openSelect(); +<<<<<<< Updated upstream const options = fixture.debugElement.queryAll(By.css('.mat-mdc-option')); expect(options[0].nativeElement.innerText).toBe('default1_value'); +======= + const option = fixture.debugElement.query(By.css('.mdc-list-item__primary-text')); + expect(option.nativeElement.innerText).toBe('default1_value'); +>>>>>>> Stashed changes }); it('should preselect dropdown widget value when String (defined value) passed ', async () => { @@ -227,7 +232,11 @@ describe('DropdownCloudWidgetComponent', () => { fixture.detectChanges(); await openSelect(); +<<<<<<< Updated upstream const options = fixture.debugElement.queryAll(By.css('.mat-mdc-option')); +======= + const options = fixture.debugElement.queryAll(By.css('.mdc-list-item__primary-text')); +>>>>>>> Stashed changes expect(options[0].nativeElement.innerText).toBe('default1_value'); expect(widget.field.form.values['dropdown-id']).toEqual({ id: 'opt1', name: 'default1_value' }); }); @@ -452,7 +461,11 @@ describe('DropdownCloudWidgetComponent', () => { await openSelect('#dropdown-id'); +<<<<<<< Updated upstream const options = fixture.debugElement.queryAll(By.css('mat-option.mdc-list-item--selected span')); +======= + const options = fixture.debugElement.queryAll(By.css('.mat-mdc-selected span')); +>>>>>>> Stashed changes expect(Array.from(options).map(({ nativeElement }) => nativeElement.getInnerHTML().trim())) .toEqual(['option_1', 'option_2']); }); @@ -521,7 +534,11 @@ describe('DropdownCloudWidgetComponent', () => { await openSelect('#dropdown-id'); +<<<<<<< Updated upstream const options = fixture.debugElement.queryAll(By.css('mat-option.mdc-list-item--selected span')); +======= + const options = fixture.debugElement.queryAll(By.css('.mat-mdc-selected span')); +>>>>>>> Stashed changes expect(Array.from(options).map(({ nativeElement }) => nativeElement.getInnerHTML().trim())) .toEqual(['option_3', 'option_4']); }); diff --git a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss index d0643df4cf..f34f16af3e 100644 --- a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss +++ b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss @@ -6,8 +6,13 @@ padding-top: 0; width: 100%; } +<<<<<<< Updated upstream /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */ .mat-select-value-text { +======= + + .mat-mdc-select-value-text { +>>>>>>> Stashed changes font-size: var(--theme-body-1-font-size); } diff --git a/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts b/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts index 2de7447d2b..e0861f248d 100644 --- a/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts @@ -339,11 +339,16 @@ describe('StartProcessComponent', () => { selectElement.click(); fixture.detectChanges(); +<<<<<<< Updated upstream fixture.componentInstance.inputAutocomplete.openPanel(); fixture.detectChanges(); // await fixture.whenStable(); const options: any = fixture.debugElement.queryAll(By.css('.mdc-list-item__primary-textk')); +======= + await fixture.whenStable(); + const options: any = fixture.debugElement.queryAll(By.css('.mdc-list-item__primary-text')); +>>>>>>> Stashed changes expect(options.length).toBe(2); expect(options[0].nativeElement.innerText).toBe('My Process 1'); diff --git a/lib/testing/src/lib/protractor/content-services/pages/search/search-sorting-picker.page.ts b/lib/testing/src/lib/protractor/content-services/pages/search/search-sorting-picker.page.ts index 348f5522f9..c113839aad 100644 --- a/lib/testing/src/lib/protractor/content-services/pages/search/search-sorting-picker.page.ts +++ b/lib/testing/src/lib/protractor/content-services/pages/search/search-sorting-picker.page.ts @@ -27,7 +27,7 @@ export class SearchSortingPickerPage { async sortBy(sortOrder: string, sortType: string | RegExp): Promise { await this.sortingDropdown.clickDropdown(); - const selectedSortingOption = element(by.cssContainingText('.mat-option-text', sortType)); + const selectedSortingOption = element(by.cssContainingText('.mdc-list-item__primary-text', sortType)); await BrowserActions.click(selectedSortingOption); await this.sortByOrder(sortOrder); } @@ -53,7 +53,7 @@ export class SearchSortingPickerPage { } async clickSortingOption(option: string): Promise { - const selectedSortingOption = element(by.cssContainingText('.mat-option-text', option)); + const selectedSortingOption = element(by.cssContainingText('.mdc-list-item__primary-text', option)); await BrowserActions.click(selectedSortingOption); } diff --git a/lib/testing/src/lib/protractor/core/pages/form/form-fields.ts b/lib/testing/src/lib/protractor/core/pages/form/form-fields.ts index bd37c0d9bf..355d915630 100644 --- a/lib/testing/src/lib/protractor/core/pages/form/form-fields.ts +++ b/lib/testing/src/lib/protractor/core/pages/form/form-fields.ts @@ -97,7 +97,7 @@ export class FormFields { async getFieldPlaceHolder(fieldId: string, locator = 'input'): Promise { const placeHolderLocator = $(`${locator}#${fieldId}`); await BrowserVisibility.waitUntilElementIsVisible(placeHolderLocator); - return BrowserActions.getAttribute(placeHolderLocator, 'data-placeholder'); + return BrowserActions.getAttribute(placeHolderLocator, 'placeholder'); } async refreshForm(): Promise { diff --git a/lib/testing/src/lib/protractor/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts b/lib/testing/src/lib/protractor/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts index cf0e89e7b5..4ca088ba96 100644 --- a/lib/testing/src/lib/protractor/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts +++ b/lib/testing/src/lib/protractor/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts @@ -37,8 +37,8 @@ export class EditTaskFilterCloudComponentPage { id = $('input[data-automation-id="adf-cloud-edit-task-property-taskId"]'); processDefinitionId = $('input[data-automation-id="adf-cloud-edit-task-property-processDefinitionId"]'); processInstanceId = $('input[data-automation-id="adf-cloud-edit-task-property-processInstanceId"]'); - lastModifiedFrom = $('input[data-placeholder="LastModifiedFrom"]'); - lastModifiedTo = $('input[data-placeholder="LastModifiedTo"]'); + lastModifiedFrom = $('input[placeholder="LastModifiedFrom"]'); + lastModifiedTo = $('input[placeholder="LastModifiedTo"]'); parentTaskId = $('input[data-automation-id="adf-cloud-edit-task-property-parentTaskId"]'); owner = $('input[data-automation-id="adf-cloud-edit-task-property-owner"]'); saveButton = $('[data-automation-id="adf-filter-action-save"]'); diff --git a/lib/testing/src/lib/protractor/process-services-cloud/pages/start-process-cloud-component.page.ts b/lib/testing/src/lib/protractor/process-services-cloud/pages/start-process-cloud-component.page.ts index bf17234bce..7688e8e192 100644 --- a/lib/testing/src/lib/protractor/process-services-cloud/pages/start-process-cloud-component.page.ts +++ b/lib/testing/src/lib/protractor/process-services-cloud/pages/start-process-cloud-component.page.ts @@ -64,7 +64,7 @@ export class StartProcessCloudPage { async selectFirstOptionFromProcessDropdown(): Promise { await this.clickProcessDropdownArrow(); - const selectFirstProcessDropdown = $$('.mat-option-text').first(); + const selectFirstProcessDropdown = $$('.mdc-list-item__primary-text').first(); await BrowserActions.click(selectFirstProcessDropdown); }