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

Rebase went little bit wrong

Browse Source
This commit is contained in:
Vito Albano
2023-12-07 00:09:36 +00:00
parent 10d6a7a4b5
commit bcf016fe8b
2 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/testing/src/lib/protractor/core/pages/form/widgets/attach-file-widget.page.ts
View File

@@ -28,17 +28,10 @@ export class AttachFileWidgetPage {
filesListLocator = 'div[data-automation-id="adf-attach-widget-readonly-list"]'; filesListLocator = 'div[data-automation-id="adf-attach-widget-readonly-list"]';
attachFileWidget = $('#attachfile'); attachFileWidget = $('#attachfile');
attachedFileMenu = $('mat-list-item button'); attachedFileMenu = $('mat-list-item button');
<<<<<<< Updated upstream
attachedFileOptions = $('.mat-mdc-menu-content');
viewFileOptionButton = $(`.mat-mdc-menu-content button[id$="show-file"]`);
downloadFileOptionButton = $(`.mat-mdc-menu-content button[id$="download-file"]`);
removeFileOptionButton = TestElement.byCss(`.mat-mdc-menu-content button[id$="remove"]`);
=======
attachedFileOptions = $('.mat-mdc-menu-panel .mat-mdc-menu-content'); attachedFileOptions = $('.mat-mdc-menu-panel .mat-mdc-menu-content');
viewFileOptionButton = $(`.mat-mdc-menu-panel .mat-mdc-menu-content button[id$="show-file"]`); viewFileOptionButton = $(`.mat-mdc-menu-panel .mat-mdc-menu-content button[id$="show-file"]`);
downloadFileOptionButton = $(`.mat-mdc-menu-panel .mat-mdc-menu-content button[id$="download-file"]`); downloadFileOptionButton = $(`.mat-mdc-menu-panel .mat-mdc-menu-content button[id$="download-file"]`);
removeFileOptionButton = TestElement.byCss(`.mat-mdc-menu-panel .mat-mdc-menu-content button[id$="remove"]`); removeFileOptionButton = TestElement.byCss(`.mat-mdc-menu-panel .mat-mdc-menu-content button[id$="remove"]`);
>>>>>>> Stashed changes
async attachFile(fieldId: string, fileLocation: string): Promise<void> { async attachFile(fieldId: string, fileLocation: string): Promise<void> {
const widget = await this.formFields.getWidget(fieldId); const widget = await this.formFields.getWidget(fieldId);

20
lib/testing/src/lib/protractor/core/pages/material/dropdown.page.ts
View File

@@ -35,11 +35,7 @@ export class DropdownPage {
async selectOption(option: string): Promise<void> { async selectOption(option: string): Promise<void> {
Logger.log(`Select dropdown option ${option}`); Logger.log(`Select dropdown option ${option}`);
<<<<<<< Updated upstream
const optionElement = element.all(by.cssContainingText('.mat-mdc-option .mdc-list-item__primary-text', option)).first(); const optionElement = element.all(by.cssContainingText('.mat-mdc-option .mdc-list-item__primary-text', option)).first();
=======
const optionElement = element.all(by.cssContainingText('mat-option span.mdc-list-item__primary-text', option)).first();
>>>>>>> Stashed changes
await BrowserActions.click(optionElement); await BrowserActions.click(optionElement);
await browser.waitForAngular(); await browser.waitForAngular();
} }
@@ -53,11 +49,7 @@ export class DropdownPage {
} }
async getNumberOfOptions(): Promise<number> { async getNumberOfOptions(): Promise<number> {
<<<<<<< Updated upstream
const dropdownOptions = $$('.mat-mdc-select-panel .mat-mdc-option'); const dropdownOptions = $$('.mat-mdc-select-panel .mat-mdc-option');
=======
const dropdownOptions = $$('.mat-mdc-select-panel mat-option');
>>>>>>> Stashed changes
return dropdownOptions.count(); return dropdownOptions.count();
} }
@@ -88,28 +80,16 @@ export class DropdownPage {
} }
async getSelectedOptionText(): Promise<string> { async getSelectedOptionText(): Promise<string> {
<<<<<<< Updated upstream
const selectedOption = this.dropDownElement.$('.mdc-list-item__primary-text');
=======
const selectedOption = this.dropDownElement.$('.mat-mdc-select-value-text span'); const selectedOption = this.dropDownElement.$('.mat-mdc-select-value-text span');
>>>>>>> Stashed changes
return BrowserActions.getText(selectedOption); return BrowserActions.getText(selectedOption);
} }
async checkOptionIsDisplayed(option: string): Promise<void> { async checkOptionIsDisplayed(option: string): Promise<void> {
<<<<<<< Updated upstream
await BrowserVisibility.waitUntilElementIsVisible(element.all(by.cssContainingText('.mat-mdc-option .mdc-list-item__primary-text', option)).first()); await BrowserVisibility.waitUntilElementIsVisible(element.all(by.cssContainingText('.mat-mdc-option .mdc-list-item__primary-text', option)).first());
} }
async checkOptionIsNotDisplayed(option: string): Promise<void> { async checkOptionIsNotDisplayed(option: string): Promise<void> {
await BrowserVisibility.waitUntilElementIsNotVisible(element.all(by.cssContainingText('.mat-mdc-option .mdc-list-item__primary-text', option)).first()); await BrowserVisibility.waitUntilElementIsNotVisible(element.all(by.cssContainingText('.mat-mdc-option .mdc-list-item__primary-text', option)).first());
=======
await BrowserVisibility.waitUntilElementIsVisible(element.all(by.cssContainingText('mat-option span.mdc-list-item__primary-text', option)).first());
}
async checkOptionIsNotDisplayed(option: string): Promise<void> {
await BrowserVisibility.waitUntilElementIsNotVisible(element.all(by.cssContainingText('mat-option span.mdc-list-item__primary-text', option)).first());
>>>>>>> Stashed changes
} }
async selectDropdownOption(option: string): Promise<void> { async selectDropdownOption(option: string): Promise<void> {