inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing e2e - part III

Browse Source
This commit is contained in:
Vito Albano
2023-12-06 23:56:41 +00:00
committed by VitoAlbano
parent 7a075eaadb
commit e64e292615
11 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/process-services/pages/dialog/create-checklist-dialog.page.ts
View File

@@ -42,7 +42,7 @@ export class ChecklistDialog {
}
async getNameFieldPlaceholder(): Promise<string> {
return BrowserActions.getAttribute(this.nameField, 'data-placeholder');
return BrowserActions.getAttribute(this.nameField, 'placeholder');
}
async checkCancelButtonIsEnabled(): Promise<void> {

2
e2e/process-services/pages/dialog/start-task-dialog.page.ts
View File

@@ -58,7 +58,7 @@ export class StartTaskDialogPage {
}
async getAssignee(): Promise<string> {
return BrowserActions.getAttribute(this.assignee, 'data-placeholder');
return BrowserActions.getAttribute(this.assignee, 'placeholder');
}
async selectForm(form): Promise<void> {

4
e2e/process-services/pages/task-details.page.ts
View File

@@ -180,7 +180,7 @@ export class TaskDetailsPage {
}
async getDescriptionPlaceholder(): Promise<string> {
return BrowserActions.getAttribute(this.descriptionField, 'data-placeholder');
return BrowserActions.getAttribute(this.descriptionField, 'placeholder');
}
getDueDate(): Promise<string> {
@@ -310,7 +310,7 @@ export class TaskDetailsPage {
}
async getInvolvePeoplePlaceholder(): Promise<string> {
return BrowserActions.getAttribute(this.addPeopleField, 'data-placeholder');
return BrowserActions.getAttribute(this.addPeopleField, 'placeholder');
}
async checkCancelButtonIsEnabled(): Promise<void> {

4
lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts
View File

@@ -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;
});
}

4
lib/core/src/lib/context-menu/animations.ts
View File

@@ -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)' }))

6
lib/core/src/lib/form/components/widgets/form.theme.scss
View File

@@ -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;
}
}

5
lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss
View File

@@ -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);
}

4
lib/testing/src/lib/protractor/content-services/pages/search/search-sorting-picker.page.ts
View File

@@ -27,7 +27,7 @@ export class SearchSortingPickerPage {
async sortBy(sortOrder: string, sortType: string | RegExp): Promise<void> {
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<void> {
const selectedSortingOption = element(by.cssContainingText('.mat-option-text', option));
const selectedSortingOption = element(by.cssContainingText('.mdc-list-item__primary-text', option));
await BrowserActions.click(selectedSortingOption);
}

2
lib/testing/src/lib/protractor/core/pages/form/form-fields.ts
View File

@@ -97,7 +97,7 @@ export class FormFields {
async getFieldPlaceHolder(fieldId: string, locator = 'input'): Promise<string> {
const placeHolderLocator = $(`${locator}#${fieldId}`);
await BrowserVisibility.waitUntilElementIsVisible(placeHolderLocator);
return BrowserActions.getAttribute(placeHolderLocator, 'data-placeholder');
return BrowserActions.getAttribute(placeHolderLocator, 'placeholder');
}
async refreshForm(): Promise<void> {

4
lib/testing/src/lib/protractor/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts
View File

@@ -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"]');

2
lib/testing/src/lib/protractor/process-services-cloud/pages/start-process-cloud-component.page.ts
View File

@@ -64,7 +64,7 @@ export class StartProcessCloudPage {
async selectFirstOptionFromProcessDropdown(): Promise<void> {
await this.clickProcessDropdownArrow();
const selectFirstProcessDropdown = $$('.mat-option-text').first();
const selectFirstProcessDropdown = $$('.mdc-list-item__primary-text').first();
await BrowserActions.click(selectFirstProcessDropdown);
}