Merge pull request #69 from aquality-automation/develop

0.3.4

Author: VladislavKostyukevich

CHANGELOG.md

@@ -1,5 +1,25 @@
 # CHANGELOG
 
+## 0.3.4 (2019-12-10)
+
+Features:
+  - Remove Customers Feature -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/25)
+  - Add 'Steps' label into Test page -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/31)
+  - Add ID column to Suites List -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/18)
+  - Add possibility to sync testsuites according to Not Executed results -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/32)
+  - Add Executor and Pass Rate column to Test Run List table -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/41)
+
+Bugfixes:
+  - It should not be possible to delete Customer that assigned to the projects -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/9)
+  - Link "View on Aquality Tracking" in report email is broken -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/30)
+  - Link from the audit email notification is invalid -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/13)
+  - Audits feature is visible when disabled -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/24)
+  - All available test are shown in tests list after updating Suite for some test -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/27)
+  - There is no scrolling in dashboard configuration -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/14)
+  - Empty line on dashboard if suite have no data -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/15)
+  - Suites Dashboard: Data refresh working wrong with empty cards -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/40)
+  - Suites Dashboard: Data is not updated for empty cards -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/39)
+
 ## 0.3.3 (2019-11-16)
 
 Features:
@@ -34,4 +54,4 @@ Features:
 
 Bugfixes:
 
-  - Fix Fail Reason Search
+  - Fix Fail Reason Search

e2e/elements/menuBar.element/index.ts

@@ -1,10 +1,12 @@
-import { by, element } from 'protractor';
+import { by, element, promise } from 'protractor';
 import { CreateOptions } from './create.options';
 import { TestsOptions } from './tests.options';
 import { UserOptions } from './user.options';
 import { AuditsOptions } from './audits.options';
 
 export class MenuBar {
+    private auditsButton = element(by.css('#Audits > a'));
+
     clickLogo() {
         return element(by.css('.navbar-brand')).click();
     }
@@ -28,7 +30,7 @@ export class MenuBar {
     }
 
     async audits() {
-        await element(by.css('#Audits > a')).click();
+        await this.auditsButton.click();
         return new AuditsOptions();
     }
 
@@ -54,4 +56,8 @@ export class MenuBar {
         await element(by.id('user-mb')).click();
         return new UserOptions();
     }
+
+    isAuditTabExists(): promise.Promise<boolean> {
+        return this.auditsButton.isPresent();
+    }
 }

e2e/elements/multiselect.element.ts

@@ -1,4 +1,4 @@
-import { by, Locator } from 'protractor';
+import { by, Locator, ElementFinder } from 'protractor';
 import { BaseElement } from './base.element';
 import { WithSearch } from './interfaces/elementWithSearch';
 
@@ -9,6 +9,9 @@ export class Multiselect extends BaseElement implements WithSearch {
 
     private search = this.element.element(by.css('.ms-search'));
     private selector = this.element.element(by.css('.ms-main-selector'));
+    private disabledElement = this.element.element(by.css('.disabled-lookup'));
+    private msBoxes = this.element.all(by.css('.ms-box > .ms-box-text'));
+    private removeMsBox = (name: string): ElementFinder => this.element.element(by.css(`.ms-box[title='${name}'] > .remove-ms-box`));
 
     public openSelector() {
         return this.selector.click();
@@ -28,7 +31,28 @@ export class Multiselect extends BaseElement implements WithSearch {
         return this.selectOption(value);
     }
 
+    public remove(name: string) {
+        return this.removeMsBox(name).click();
+    }
+
+    public async isEditable() {
+        return !(await this.disabledElement.isPresent());
+    }
+
+    public async getValue() {
+        if (this.isEditable()) {
+            const values = [];
+            const msBoxes = await this.msBoxes;
+            for (let i = 0; i < msBoxes.length; i++) {
+                values.push(await msBoxes[i].getText());
+            }
+            return values;
+        }
+
+        return (await this.disabledElement.getText()).split(', ');
+    }
+
     private findOption(value: string) {
-        return this.element.element(by.xpath(`//*[contains(@class, "selector-suggestions")]//li[@title="${value}"]`));
+        return this.element.element(by.css(`.selector-suggestions li[title="${value}"]`));
     }
 }

e2e/elements/smartTable.element/index.ts

@@ -1,4 +1,4 @@
-import { by, Locator, ElementFinder, browser, protractor, ElementArrayFinder, element } from 'protractor';
+import { by, Locator, ElementFinder, browser, protractor, ElementArrayFinder, element, promise } from 'protractor';
 import { BaseElement } from '../base.element';
 import { logger } from '../../utils/log.util';
 import { Lookup } from '../lookup.element';
@@ -200,6 +200,12 @@ export class SmartTable extends BaseElement {
         return cell.getText();
     }
 
+    public async getCellValue(column: string, searchValue: string | number, searchColumn: string): Promise<string|string[]> {
+        const columnIndex = await this.getColumnIndex(column);
+        const row = await this.getRow(searchValue, searchColumn);
+        return row.getRowCellValue(columnIndex);
+    }
+
     public async getCellTextUsingRowIndex(columnWithText: string, rowIndex: number): Promise<string> {
         const cell = await this.getCellUsingRowIndex(columnWithText, rowIndex);
         return cell.getText();
@@ -311,6 +317,18 @@ export class SmartTable extends BaseElement {
         return index >= 0;
     }
 
+    public async addValueFromMultiselect(value: string, column: string, searchValue: string, searchColumn: string) {
+        const index = await this.getColumnIndex(column);
+        const row = await this.getRow(searchValue, searchColumn);
+        return row.addMultiselectValueByColumnIndex(value, index);
+    }
+
+    public async removeValueFromMultiselect(value: string, column: string, searchValue: string, searchColumn: string) {
+        const index = await this.getColumnIndex(column);
+        const row = await this.getRow(searchValue, searchColumn);
+        return row.removeMultiselectValueByColumnIndex(value, index);
+    }
+
     private isCreationOpened() {
         return this.creationRow.isPresent();
     }

e2e/elements/smartTable.element/row.element.ts

@@ -7,6 +7,7 @@ import { Autocomplete } from '../autocomplete.element';
 import { InlineEditor } from '../inlineEditor.element';
 import { logger } from '../../utils/log.util';
 import { InlineAttach } from '../inlineAttach.element';
+import { Multiselect } from '../multiselect.element';
 
 export class Row extends BaseElement {
     constructor(locator: ElementFinder | Locator) {
@@ -52,7 +53,8 @@ export class Row extends BaseElement {
                 new Autocomplete(cell.element(by.xpath(`.//lookup-autocomplete`))),
             inlineEditor: () => new InlineEditor(cell.element(by.tagName('inline-editor'))),
             lookup: () => new Lookup(cell.element(by.xpath('.//lookup-colored'))),
-            inlineAttachment: () => new InlineAttach(cell.element(by.xpath('.//attachment-inline')))
+            inlineAttachment: () => new InlineAttach(cell.element(by.xpath('.//attachment-inline'))),
+            multiselect: () => new Multiselect(cell.element(by.xpath('.//lookup-autocomplete-multiselect')))
         };
     }
 
@@ -82,6 +84,30 @@ export class Row extends BaseElement {
         throw new Error(`You are trying to edit not editable ${columnIndex} column!`);
     }
 
+    public async addMultiselectValueByColumnIndex(value: string, columnIndex: number) {
+        const rowElements = await this.getRowElements(columnIndex);
+        if (await this.isCellContainsEditableElement(columnIndex)) {
+            if (await rowElements.multiselect().element.isPresent()) {
+                return rowElements.multiselect().select(value);
+            }
+            throw new Error(`Column ${columnIndex} does not contain multiselect!`);
+        }
+
+        throw new Error(`You are trying to edit not editable ${columnIndex} column!`);
+    }
+
+    public async removeMultiselectValueByColumnIndex(value: string, columnIndex: number) {
+        const rowElements = await this.getRowElements(columnIndex);
+        if (await this.isCellContainsEditableElement(columnIndex)) {
+            if (await rowElements.multiselect().element.isPresent()) {
+                return rowElements.multiselect().remove(value);
+            }
+            throw new Error(`Column ${columnIndex} does not contain multiselect!`);
+        }
+
+        throw new Error(`You are trying to edit not editable ${columnIndex} column!`);
+    }
+
     public async isCellContainsEditableElement(columnIndex: number) {
         const rowElements = await this.getRowElements(columnIndex);
         if (await rowElements.inlineEditor().element.isPresent()) {
@@ -105,19 +131,24 @@ export class Row extends BaseElement {
         if (await rowElements.inlineAttachment().element.isPresent()) {
             return rowElements.inlineAttachment().isEditable();
         }
+        if (await rowElements.multiselect().element.isPresent()) {
+            return rowElements.multiselect().isEditable();
+        }
         return false;
     }
 
     public async getRowCellValue(columnIndex: number) {
         const rowElements = await this.getRowElements(columnIndex);
         if (await rowElements.input().element.isPresent()) {
             return rowElements.input().getValue();
-        } if (await rowElements.coloredLookup().element.isPresent()) {
+        } else if (await rowElements.coloredLookup().element.isPresent()) {
             return rowElements.coloredLookup().getSelectedValue();
-        } if (await rowElements.lookup().element.isPresent()) {
+        } else if (await rowElements.lookup().element.isPresent()) {
             return rowElements.lookup().getSelectedValue();
-        } if (await rowElements.checkbox().element.isPresent()) {
+        } else if (await rowElements.checkbox().element.isPresent()) {
             return rowElements.checkbox().isSelected();
+        } else if (await rowElements.multiselect().element.isPresent()) {
+            return rowElements.multiselect().getValue();
         } else {
             return (await this.getCellFromRow(columnIndex)).getText();
         }
@@ -156,4 +187,5 @@ export class CellElements {
     inlineEditor: () => InlineEditor;
     lookup: () => Lookup;
     inlineAttachment: () => InlineAttach;
+    multiselect: () => Multiselect;
 }

e2e/pages/administration/appSettings.po/constants.ts

@@ -1,14 +1,17 @@
 import { by, element } from 'protractor';
 import { Input } from '../../../elements/input.element';
 import { LargeTextContainer } from '../../../elements/largeTextContainer';
+import { UiSwitch } from '../../../elements/ui-switch';
 
 export const baseUrl = '#/administration/global/appSettings';
 
 export const elements = {
     uniqueElement: element(by.css('#app-settings-administration.active')),
     defaultEmailPattern: new Input(by.id('defaultEmailPattern')),
     defaultEmailPatternhint: new LargeTextContainer(by.id('defaultEmailPatternHint')),
-    saveEmailSettings: element(by.id('saveEmailSettings'))
+    saveEmailSettings: element(by.id('saveEmailSettings')),
+    saveGeneralSettings: element(by.id('save-general')),
+    auditsModuleSwitch: new UiSwitch(by.id('audits-module'))
 };
 
 export const names = {

e2e/pages/administration/appSettings.po/index.ts

@@ -30,4 +30,16 @@ export class AppSettings extends AdministrationBase {
   toggleHint() {
     return elements.defaultEmailPatternhint.toggle();
   }
+
+  saveGeneralSettings() {
+    return elements.saveGeneralSettings.click();
+  }
+
+  disableAuditModule() {
+    return elements.auditsModuleSwitch.switchOff();
+  }
+
+  enableAuditModule() {
+    return elements.auditsModuleSwitch.switchOn();
+  }
 }

e2e/pages/administration/users.po/index.ts

@@ -111,7 +111,6 @@ export class UserAdministration extends AdministrationBase {
     await this.fillPassword(user.password);
     await this.fillConfirmPassword(user.password);
     await this.setUnitCoordinator(user.unit_coordinator);
-    await this.setAccountManager(user.account_manager);
     await this.setAdmin(user.admin);
     await this.setCoordinator(user.manager);
     await this.setAuditor(user.auditor);

e2e/pages/suite/view.po/index.ts

@@ -35,10 +35,30 @@ export class SuiteView extends BasePage {
   }
 
   async clickMoveTest() {
-      return elements.moveTestBtn.click();
+    return elements.moveTestBtn.click();
   }
 
   openTest(testName: string) {
-      return elements.testsTable.clickRow(testName, columns.name);
+    return elements.testsTable.clickRow(testName, columns.name);
+  }
+
+  removeSuite(suiteName: string, testName: string) {
+    return elements.testsTable.removeValueFromMultiselect(suiteName, columns.suites, testName, columns.name);
+  }
+
+  addSuite(suiteName: string, testName: string) {
+    return elements.testsTable.addValueFromMultiselect(suiteName, columns.suites, testName, columns.name);
+  }
+
+  getTestSuites(testName: string): Promise<string[]|string> {
+       return elements.testsTable.getCellValue(columns.suites, testName, columns.name);
+  }
+
+  isTableEditable(): Promise<boolean> {
+    return elements.testsTable.isRowEditableByIndex(0);
+  }
+
+  isTestPresent(name: string): Promise<boolean> {
+    return elements.testsTable.isRowExists(name, columns.name);
   }
 }

e2e/specs/administration/appSettings.spec.ts

@@ -26,8 +26,29 @@ describe('Full Admin Administartion User Flow', () => {
         }
     });
 
+
+    describe('Audit Module', () => {
+        it('I can disable Audit Module', async () => {
+            await userAdministration.sidebar.appSettings();
+            await appSettings.disableAuditModule();
+            await appSettings.saveGeneralSettings();
+            await appSettings.menuBar.clickLogo();
+            return expect(projectList.menuBar.isAuditTabExists()).toBe(false, 'Audit Module is not disabled!');
+        });
+
+        it('I can enable Audit Module', async () => {
+            await (await projectList.menuBar.user()).administration();
+            await userAdministration.sidebar.appSettings();
+            await appSettings.enableAuditModule();
+            await appSettings.saveGeneralSettings();
+            await appSettings.menuBar.clickLogo();
+            return expect(projectList.menuBar.isAuditTabExists()).toBe(true, 'Audit Module is not enabled!');
+        });
+    });
+
     describe('Default Email Pattern', () => {
         it('I can see closed Email Pattern Hint', async () => {
+            await (await projectList.menuBar.user()).administration();
             await userAdministration.sidebar.appSettings();
             return expect(appSettings.getHintText()).toEqual(Constants.emailHelpTextHint);
         });