Rebase went little bit wrong

Alfresco · Dec 7, 2023 · c614033 · c614033
1 parent 906654f
commit c614033
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 27 deletions.
diff --git a/lib/testing/src/lib/protractor/core/pages/form/widgets/attach-file-widget.page.ts b/lib/testing/src/lib/protractor/core/pages/form/widgets/attach-file-widget.page.ts
@@ -28,17 +28,10 @@ export class AttachFileWidgetPage {
     filesListLocator = 'div[data-automation-id="adf-attach-widget-readonly-list"]';
     attachFileWidget = $('#attachfile');
     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');
     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"]`);
     removeFileOptionButton = TestElement.byCss(`.mat-mdc-menu-panel .mat-mdc-menu-content button[id$="remove"]`);
->>>>>>> Stashed changes
 
     async attachFile(fieldId: string, fileLocation: string): Promise<void> {
         const widget = await this.formFields.getWidget(fieldId);

diff --git a/lib/testing/src/lib/protractor/core/pages/material/dropdown.page.ts b/lib/testing/src/lib/protractor/core/pages/material/dropdown.page.ts
@@ -35,11 +35,7 @@ export class DropdownPage {
 
     async selectOption(option: string): Promise<void> {
         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-option span.mdc-list-item__primary-text', option)).first();
->>>>>>> Stashed changes
         await BrowserActions.click(optionElement);
         await browser.waitForAngular();
     }
@@ -53,11 +49,7 @@ export class DropdownPage {
     }
 
     async getNumberOfOptions(): Promise<number> {
-<<<<<<< Updated upstream
         const dropdownOptions = $$('.mat-mdc-select-panel .mat-mdc-option');
-=======
-        const dropdownOptions = $$('.mat-mdc-select-panel mat-option');
->>>>>>> Stashed changes
         return dropdownOptions.count();
     }
 
@@ -88,28 +80,16 @@ export class DropdownPage {
     }
 
     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');
->>>>>>> Stashed changes
         return BrowserActions.getText(selectedOption);
     }
 
     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());
     }
 
     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.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> {