[ACA-1628] async await (#693)

* async / await on login component and utils * more async / awaits * remove fdescribe * expect for exact totalItems in waitForApi methods other async / awaits * pagination tests * more tries * disable selenium promise manager * try to fix shared-links tests * re-enable selenium_promise_manager and some more fixes * add target es2017 to e2e * set target to es2017 on tsconfig.spec.json * other tries * forgotten console.log * disable pagination tests * some fixes for pagination * temporary fix viewer actions tests * fix some actions tests * fix some tests for actions * fix some tests for undo action * try to fix some more tests * fixes for toolbar actions * fix NoSuchElementError for openMoreMenu * fix NoSuchElementError for rightClickOnMultipleSelection * fixes for mark as favourite * more fixes * more fixes * change order of some expects * forgot describe
2026-09-09 18:02:54 +00:00 · 2018-10-08 09:21:02 +01:00
parent 0d4795bfa8
commit 7d73ae309c
53 changed files with 1553 additions and 1662 deletions
@@ -29,74 +29,74 @@ import { BROWSER_WAIT_TIMEOUT } from '../../configs';
 import { Toolbar } from '../toolbar/toolbar';

 export class Viewer extends Component {
-    private static selectors = {
-        root: 'adf-viewer',
+  private static selectors = {
+    root: 'adf-viewer',

-        layout: '.adf-viewer-layout-content',
-        contentContainer: '.adf-viewer-content-container',
-        closeBtn: '.adf-viewer-close-button',
-        fileTitle: '.adf-viewer__file-title',
+    layout: '.adf-viewer-layout-content',
+    contentContainer: '.adf-viewer-content-container',
+    closeBtn: '.adf-viewer-close-button',
+    fileTitle: '.adf-viewer__file-title',

-        viewerExtensionContent: 'app-preview-extension'
-    };
+    viewerExtensionContent: 'app-preview-extension'
+  };

-    root: ElementFinder = browser.$(Viewer.selectors.root);
-    viewerLayout: ElementFinder = this.component.element(by.css(Viewer.selectors.layout));
-    viewerContainer: ElementFinder = this.component.element(by.css(Viewer.selectors.contentContainer));
-    closeButton: ElementFinder = this.component.element(by.css(Viewer.selectors.closeBtn));
-    fileTitle: ElementFinder = this.component.element(by.css(Viewer.selectors.fileTitle));
-    viewerExtensionContent: ElementFinder = this.component.element(by.css(Viewer.selectors.viewerExtensionContent));
+  root: ElementFinder = browser.$(Viewer.selectors.root);
+  viewerLayout: ElementFinder = this.component.element(by.css(Viewer.selectors.layout));
+  viewerContainer: ElementFinder = this.component.element(by.css(Viewer.selectors.contentContainer));
+  closeButton: ElementFinder = this.component.element(by.css(Viewer.selectors.closeBtn));
+  fileTitle: ElementFinder = this.component.element(by.css(Viewer.selectors.fileTitle));
+  viewerExtensionContent: ElementFinder = this.component.element(by.css(Viewer.selectors.viewerExtensionContent));

-    toolbar = new Toolbar(this.component);
+  toolbar = new Toolbar(this.component);

-    constructor(ancestor?: ElementFinder) {
-        super(Viewer.selectors.root, ancestor);
-    }
-
-    async waitForViewerToOpen() {
-        return await browser.wait(EC.presenceOf(this.viewerContainer), BROWSER_WAIT_TIMEOUT)
-            .catch(err => err);
-    }
-
-    async isViewerOpened() {
-        return await browser.isElementPresent(this.viewerLayout);
-    }
-
-    async isViewerContentDisplayed() {
-        return await browser.isElementPresent(this.viewerContainer);
-    }
-
-    async isViewerToolbarDisplayed() {
-        return await browser.isElementPresent(this.toolbar.component);
-    }
-
-    async isCloseButtonDisplayed() {
-        return await browser.isElementPresent(this.closeButton);
-    }
-
-    async isFileTitleDisplayed() {
-        return await browser.isElementPresent(this.fileTitle);
-    }
-
-    async clickClose() {
-        return await this.closeButton.click();
-    }
-
-    async getCloseButtonTooltip() {
-        return await this.toolbar.getButtonTooltip(this.closeButton);
-    }
-
-    async getFileTitle() {
-        return await this.fileTitle.getText();
-    }
-
-    async isCustomContentPresent() {
-        return await browser.isElementPresent(this.viewerExtensionContent);
-    }
-
-    async getComponentIdOfView() {
-        if (await this.isCustomContentPresent()) {
-            return await this.viewerExtensionContent.getAttribute('data-automation-id');
-        }
+  constructor(ancestor?: ElementFinder) {
+    super(Viewer.selectors.root, ancestor);
+  }
+
+  async waitForViewerToOpen() {
+    await browser.wait(EC.presenceOf(this.viewerContainer), BROWSER_WAIT_TIMEOUT);
+  }
+
+  async isViewerOpened() {
+    return await browser.isElementPresent(this.viewerLayout);
+    // return await this.viewerLayout.isPresent();
+  }
+
+  async isViewerContentDisplayed() {
+    return await browser.isElementPresent(this.viewerContainer);
+  }
+
+  async isViewerToolbarDisplayed() {
+    return await browser.isElementPresent(this.toolbar.component);
+  }
+
+  async isCloseButtonDisplayed() {
+    return await browser.isElementPresent(this.closeButton);
+  }
+
+  async isFileTitleDisplayed() {
+    return await browser.isElementPresent(this.fileTitle);
+  }
+
+  async clickClose() {
+    await this.closeButton.click();
+  }
+
+  async getCloseButtonTooltip() {
+    return await this.toolbar.getButtonTooltip(this.closeButton);
+  }
+
+  async getFileTitle() {
+    return await this.fileTitle.getText();
+  }
+
+  async isCustomContentPresent() {
+    return await browser.isElementPresent(this.viewerExtensionContent);
+  }
+
+  async getComponentIdOfView() {
+    if (await this.isCustomContentPresent()) {
+      return await this.viewerExtensionContent.getAttribute('data-automation-id');
    }
+  }
 }