add tests for Upload New Version (#960)

e2e/components/data-table/data-table.ts

@@ -48,7 +48,9 @@ export class DataTable extends Component {
     nameLink: '.adf-datatable-link',
     libraryRole: 'adf-library-role-column',
 
-    selectedIcon: '.mat-icon',
+    selectedIcon: '.mat-icon[class*="selected"]',
+    lockIcon: 'img[src*="lock"]',
+    lockOwner: '.aca-locked-by',
 
     emptyListContainer: 'div.adf-no-content-container',
     emptyFolderDragAndDrop: '.adf-empty-list_template .adf-empty-folder',
@@ -60,9 +62,7 @@ export class DataTable extends Component {
 
   head: ElementFinder = this.component.element(by.css(DataTable.selectors.head));
   body: ElementFinder = this.component.element(by.css(DataTable.selectors.body));
-  cell = by.css(DataTable.selectors.cell);
-  locationLink = by.css(DataTable.selectors.locationLink);
-  nameLink: ElementFinder = browser.element(by.css(DataTable.selectors.nameLink));
+
   emptyList: ElementFinder = this.component.element(by.css(DataTable.selectors.emptyListContainer));
   emptyFolderDragAndDrop: ElementFinder = this.component.element(by.css(DataTable.selectors.emptyFolderDragAndDrop));
   emptyListTitle: ElementFinder = this.component.element(by.css(DataTable.selectors.emptyListTitle));
@@ -160,7 +160,8 @@ export class DataTable extends Component {
   getRowByName(name: string, location: string = '') {
     if (location) {
       return this.body.all(by.cssContainingText(DataTable.selectors.row, name))
-        .filter(async (elem) => await browser.isElementPresent(elem.element(by.cssContainingText(DataTable.selectors.cell, location))));
+        .filter(async (elem) => await browser.isElementPresent(elem.element(by.cssContainingText(DataTable.selectors.cell, location))))
+        .first();
     }
     return this.body.element(by.cssContainingText(DataTable.selectors.row, name));
   }
@@ -181,8 +182,27 @@ export class DataTable extends Component {
     return await this.getRowNameCellText(name).getAttribute('title');
   }
 
-  async hasCheckMarkIcon(itemName: string) {
-    return await this.getRowByName(itemName).element(by.css(DataTable.selectors.selectedIcon)).isPresent();
+  async hasCheckMarkIcon(itemName: string, location: string = '') {
+    const row = this.getRowByName(itemName, location);
+    return await row.element(by.css(DataTable.selectors.selectedIcon)).isPresent();
+  }
+
+  async hasLockIcon(itemName: string, location: string = '') {
+    const row = this.getRowByName(itemName, location);
+    return await row.element(by.css(DataTable.selectors.lockIcon)).isPresent();
+  }
+
+  async hasLockOwnerInfo(itemName: string, location: string = '') {
+    const row = this.getRowByName(itemName, location);
+    return await row.element(by.css(DataTable.selectors.lockOwner)).isPresent();
+  }
+
+  async getLockOwner(itemName: string, location: string = '') {
+    if (await this.hasLockOwnerInfo(itemName, location)) {
+      const row = this.getRowByName(itemName, location);
+      return await row.$(DataTable.selectors.lockOwner).$('.locked_by--name').getText();
+    }
+    return '';
   }
 
   getNameLink(itemName: string) {
@@ -252,7 +272,7 @@ export class DataTable extends Component {
   }
 
   getItemLocationEl(name: string) {
-    return this.getRowByName(name).element(this.locationLink);
+    return this.getRowByName(name).element(by.css(DataTable.selectors.locationLink));
   }
 
   async getItemLocation(name: string) {
@@ -330,7 +350,7 @@ export class DataTable extends Component {
 
   async getEntireDataTableText() {
     return this.getRows().map((row) => {
-      return row.all(this.cell).map(async cell => await cell.getText());
+      return row.all(by.css(DataTable.selectors.cell)).map(async cell => await cell.getText());
     });
   }
 

e2e/components/dialog/upload-new-version-dialog.ts

@@ -0,0 +1,121 @@
+/*!
+ * @license
+ * Alfresco Example Content Application
+ *
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { ElementFinder, by, browser, ExpectedConditions as EC } from 'protractor';
+import { BROWSER_WAIT_TIMEOUT } from '../../configs';
+import { Component } from '../component';
+import { Utils } from '../../utilities/utils';
+
+export class UploadNewVersionDialog extends Component {
+  private static selectors = {
+    root: '.aca-node-version-upload-dialog',
+
+    title: '.mat-dialog-title',
+    content: '.mat-dialog-content',
+    button: '.mat-button',
+
+    radioButton: `.mat-radio-label`,
+
+    descriptionTextArea: 'textarea'
+  };
+
+  title: ElementFinder = this.component.element(by.css(UploadNewVersionDialog.selectors.title));
+  content: ElementFinder = this.component.element(by.css(UploadNewVersionDialog.selectors.content));
+  cancelButton: ElementFinder = this.component.element(by.cssContainingText(UploadNewVersionDialog.selectors.button, 'Cancel'));
+  uploadButton: ElementFinder = this.component.element(by.cssContainingText(UploadNewVersionDialog.selectors.button, 'Upload'));
+
+  majorOption: ElementFinder = this.component.element(by.cssContainingText(UploadNewVersionDialog.selectors.radioButton, 'Major'));
+  minorOption: ElementFinder = this.component.element(by.cssContainingText(UploadNewVersionDialog.selectors.radioButton, 'Minor'));
+
+  description: ElementFinder = this.component.element(by.css(UploadNewVersionDialog.selectors.descriptionTextArea));
+
+  constructor(ancestor?: ElementFinder) {
+    super(UploadNewVersionDialog.selectors.root, ancestor);
+  }
+
+  async waitForDialogToClose() {
+    return await browser.wait(EC.stalenessOf(this.title), BROWSER_WAIT_TIMEOUT);
+  }
+
+  async isDialogOpen() {
+    return await browser.$(UploadNewVersionDialog.selectors.root).isDisplayed();
+  }
+
+  async getTitle() {
+    return await this.title.getText();
+  }
+
+  async getText() {
+    return await this.content.getText();
+  }
+
+
+  async isDescriptionDisplayed() {
+    return await this.description.isDisplayed();
+  }
+
+  async isMinorOptionDisplayed() {
+    return await this.minorOption.isDisplayed();
+  }
+
+  async isMajorOptionDisplayed() {
+    return await this.majorOption.isDisplayed();
+  }
+
+  async isCancelButtonEnabled() {
+    return this.cancelButton.isEnabled();
+  }
+
+  async isUploadButtonEnabled() {
+    return this.uploadButton.isEnabled();
+  }
+
+
+  async clickCancel() {
+    await this.cancelButton.click();
+    await this.waitForDialogToClose();
+  }
+
+  async clickUpload() {
+    await this.uploadButton.click();
+    await this.waitForDialogToClose();
+  }
+
+
+  async clickMajor() {
+    return await this.majorOption.click();
+  }
+
+  async clickMinor() {
+    return await this.minorOption.click();
+  }
+
+
+  async enterDescription(description: string) {
+    await this.description.clear();
+    await Utils.typeInField(this.description, description);
+  }
+
+}

e2e/components/menu/menu.ts

@@ -61,6 +61,7 @@ export class Menu extends Component {
   leaveAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Leave'));
   managePermissionsAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Permissions'));
   manageVersionsAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Manage Versions'));
+  uploadNewVersionAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Upload new version'));
   moveAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Move'));
   permanentDeleteAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Permanently delete'));
   restoreAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Restore'));
@@ -251,6 +252,10 @@ export class Menu extends Component {
     return await this.manageVersionsAction.isPresent();
   }
 
+  async isUploadNewVersionPresent() {
+    return await this.uploadNewVersionAction.isPresent();
+  }
+
   async isFavoritePresent() {
     return await this.favoriteAction.isPresent();
   }

e2e/components/toolbar/toolbar.ts

@@ -217,6 +217,21 @@ export class Toolbar extends Component {
     return await this.menu.clickMenuItem('Copy');
   }
 
+  async clickMoreActionsEditOffline() {
+    await this.openMoreMenu();
+    return await this.menu.clickMenuItem('Edit offline');
+  }
+
+  async clickMoreActionsCancelEditing() {
+    await this.openMoreMenu();
+    return await this.menu.clickMenuItem('Cancel editing');
+  }
+
+  async clickMoreActionsUploadNewVersion() {
+    await this.openMoreMenu();
+    return await this.menu.clickMenuItem('Upload new version');
+  }
+
 
   async clickFullScreen() {
     return await this.fullScreenButton.click();