Merge pull request #107 from aquality-automation/feature/new_dashboard

Feature/new dashboard

Author: VladislavKostyukevich

CHANGELOG.md

@@ -4,11 +4,15 @@
 
 Features:
   - Update Tests to use Admin API to create preconditions -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/100)
+  - Dashboard: My open Issues -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/74)
+  - Cannot open external issue from Modal and View of Issue -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/96)
+  - Test run Bulk Delete -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/91)
 
 Bugfixes:
   - Test run View Page performance is bad -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/99)
   - API Token page: Link to Aquality Tracking API leads to null -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/84)
   - External Link does not work on Issues List -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/97)
+  - Test page design is broken if steps are empty -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/94)
 
 ## 0.3.9 (2020-04-21)
 

e2e/api/base.api.ts

@@ -14,7 +14,7 @@ enum RequestType {
 export class BaseAPI {
     project: Project;
     token: string;
-    cookie: string;
+    protected cookie: string;
 
     constructor(project: Project, token: string, cookie: string = undefined) {
         this.project = project;

e2e/api/editor.api.ts

@@ -83,10 +83,6 @@ export class EditorAPI extends BaseAPI {
         return this.sendGet(Endpoints.milestone, milestone);
     }
 
-    public async removeTestRun(testRunId: number) {
-        return this.sendDelete(Endpoints.testrun, { id: testRunId, project_id: this.project.id }, null);
-    }
-
     public async createIssue(issue: Issue): Promise<Issue> {
         issue.project_id = this.project.id;
         issue.creator_id = 1;

e2e/api/user.api.ts

@@ -5,19 +5,24 @@ import { Customer } from '../../src/app/shared/models/customer';
 import { LocalPermissions } from '../../src/app/shared/models/LocalPermissions';
 import { PermissionType } from '../helpers/project.helper';
 import { logger } from '../utils/log.util';
+import { logIn } from '../pages/login.po';
+import { browser } from 'protractor';
 
 enum Endpoints {
     project = '/project',
     customer = '/customer',
     apiToken = '/project/apiToken',
     projectPermission = '/users/permissions',
-    users = '/users'
+    users = '/users',
+    testrun = '/testrun',
 }
 
 export class UserAPI extends BaseAPI {
+    private user: User;
 
-    constructor(authCookie: string) {
+    constructor(authCookie: string, user: User) {
         super(null, null, authCookie)
+        this.user = user;
     }
 
     public async createProject(project: Project): Promise<Project> {
@@ -74,4 +79,14 @@ export class UserAPI extends BaseAPI {
     public removeProject(project: Project): Promise<string> {
         return this.sendDelete(Endpoints.project, { id: project.id });
     }
+
+    public async relogin(): Promise<void> {
+        await logIn.logInAs(this.user.user_name, this.user.password);
+        const authCookie = await browser.manage().getCookie('iio78');
+        this.cookie = decodeURIComponent(authCookie.value)
+    }
+
+    public async removeTestRun(id: number, project_id: number) {
+        return this.sendDelete(Endpoints.testrun, { id, project_id }, null);
+    }
 }

e2e/elements/base.element.ts

@@ -23,6 +23,10 @@ export class BaseElement {
         return this.element.isPresent();
     }
 
+    async isDisplayed(): Promise<boolean> {
+        return this.element.isDisplayed();
+    }
+
     async isEnabled(): Promise<boolean> {
         return this.element.isEnabled();
     }

e2e/elements/inlineEditor.element.ts

@@ -1,39 +1,62 @@
-import { by, ElementFinder, Locator } from 'protractor';
+import { by, ElementFinder, Locator, browser } from 'protractor';
 import { BaseElement } from './base.element';
 import { Input } from './input.element';
+import { logger } from '../utils/log.util';
 
 export class InlineEditor extends BaseElement {
 
     constructor(locatorOrElement: Locator | ElementFinder) {
         super(locatorOrElement);
     }
 
-    private inlineForm: ElementFinder = this.element.element(by.css('.inlineEditForm'));
-    private inlineFormSave: ElementFinder = this.element.element(by.css('#inline-editor-button-save'));
-    private inlineInput: Input = new Input(this.element.element(by.css('input, textarea')));
-    private link: ElementFinder = this.element.element(by.css('a'));
+    private inlineForm: ElementFinder = this.element.element(by.css('.ie-value-holder'));
+    private inlineLinkForm: ElementFinder = this.element.element(by.css('.link-holder'));
+    private inlineFormPlaceholder: ElementFinder = this.element.element(by.css('.placeholder'));
+    private editFormOpener: ElementFinder = this.element.element(by.css('.ie-edit'));
+    private editorFormSave: ElementFinder = this.element.element(by.css('.ie-save'));
+    private editorFormCancel: ElementFinder = this.element.element(by.css('.ie-cancel'));
+    private editorInput: Input = new Input(this.element.element(by.css('.ie-editor')));
+    private error: ElementFinder = this.element.element(by.css('.invalid-feedback'));
 
     public async openEditor() {
-        if (!(await this.inlineForm.isDisplayed())) {
-            return this.element.click();
+        logger.info('Opening Inline Editor');
+        if (await this.inlineForm.isDisplayed()) {
+            await browser.actions().mouseMove(this.inlineForm).perform();
+            return this.editFormOpener.click();
         }
+        logger.warn('Inline Editor is not displayed or already opened!');
     }
 
     public async accept() {
-        if (await this.inlineForm.isDisplayed()) {
-            return this.inlineFormSave.click();
+        logger.info('Saving Inline Editor');
+        if (await this.editorInput.isDisplayed()) {
+            return this.editorFormSave.click();
         }
+        logger.warn('Inline Editor is not displayed or not opened!');
+    }
+
+    public async cancel() {
+        logger.info('Cancel Inline Editor');
+        if (await this.editorInput.isDisplayed()) {
+            return this.editorFormCancel.click();
+        }
+        logger.warn('Inline Editor is not displayed or not opened!');
     }
 
     public async typeText(value: string) {
-        if (await this.inlineForm.isDisplayed()) {
-            return this.inlineInput.typeText(value);
+        logger.info('Typing into Inline Editor');
+        if (await this.editorInput.isDisplayed()) {
+            return this.editorInput.typeText(value);
         }
+        logger.warn('Inline Editor is not displayed or not opened!');
     }
 
     public async isEnabled(): Promise<boolean> {
-        await this.element.click();
-        return this.inlineForm.isDisplayed();
+        if (await this.inlineForm.isDisplayed()) {
+            await browser.actions().mouseMove(this.inlineForm).perform();
+            return this.editFormOpener.isPresent();
+        }
+        logger.warn('Inline Editor is not displayed or opened!');
     }
 
     public async changeAndSetValue(value: string) {
@@ -42,7 +65,23 @@ export class InlineEditor extends BaseElement {
         return this.accept();
     }
 
+    public async getError(){
+        return this.error.getText();
+    }
+
     public async getValue() {
-        return this.link.getText();
+        logger.warn('Getting Inline Editor value!');
+        if (await this.inlineFormPlaceholder.isPresent()) {
+            logger.warn('Inline Editor value is empty!');
+            return ''
+        }
+
+        if (await this.inlineLinkForm.isPresent()) {
+            logger.warn('Inline Editor value is a link!');
+            return this.inlineLinkForm.getAttribute('href');
+        }
+
+        logger.warn('Inline Editor value is a text!');
+        return this.inlineForm.getText();
     }
 }

e2e/elements/menuBar.element/index.ts

@@ -1,4 +1,4 @@
-import { by, element, promise } from 'protractor';
+import { by, element, promise, browser } from 'protractor';
 import { CreateOptions } from './create.options';
 import { TestsOptions } from './tests.options';
 import { AuditsOptions } from './audits.options';
@@ -21,7 +21,10 @@ export class MenuBar {
             : undefined;
     }
 
-    clickLogOut() {
+    async clickLogOut() {
+        if(await element(by.css('.loader')).isPresent()) {
+            await browser.navigate().back();
+        }
         return element(by.id('logout')).click();
     }
 

e2e/elements/modal.element.ts

@@ -8,23 +8,36 @@ export class Modal extends BaseElement {
 
     private _keys = {
         yes: 'yes',
-        no: 'no'
+        no: 'no',
+        cancel: 'cancel'
     };
 
     private async _clickActionBtn(buttonName: string) {
-        const isVisible = await this.isVisible();
-        if (!isVisible) {
+        const isPresent = await this.isPresent();
+        if (!isPresent) {
             throw new Error('You are trying to click button on the modal but the modal does not exists');
         }
 
         return this.element.element(by.xpath(`.//button[text()="${buttonName}"]`)).click();
     }
 
+    private _clickSuccess() {
+        return this.element.element(by.css(`button.btn-success`)).click();
+    }
+
     clickYes() {
         return this._clickActionBtn(this._keys.yes);
     }
 
     clickNo() {
         return this._clickActionBtn(this._keys.no);
     }
+
+    clickCancel() {
+        return this._clickActionBtn(this._keys.cancel);
+    }
+    
+    clickSuccess() {
+        return this._clickSuccess();
+    }
 }

e2e/elements/smartTable.element/index.ts

@@ -9,6 +9,7 @@ import { Row, CellElements } from './row.element';
 import { ManageColumns } from './manageCollumns.element';
 import { compareCSVStrings } from '../../utils/csv.util';
 import { Dots } from '../dots.element';
+import { Checkbox } from '../checkbox.element';
 
 const EC = protractor.ExpectedConditions;
 
@@ -23,6 +24,8 @@ export class SmartTable extends BaseElement {
     private refreshButton = this.element.element(by.css('.actions-header .ft-refresh'));
     private totalLabel = this.element.element(by.css('.ft-total-label'));
     private getCSVButton = this.element.element(by.id('getSCV'));
+    private deleteAllButton = this.element.element(by.css('.bulk-delete'));
+    private selectAllCheckbox = new Checkbox(this.element.element(by.css('th input[name="select_all"]')));
 
     constructor(locator: Locator) {
         super(locator);
@@ -169,6 +172,10 @@ export class SmartTable extends BaseElement {
         return this.bulkEditRow.clickAction();
     }
 
+    public deleteAll() {
+        return this.deleteAllButton.click();
+    }
+
     public async getCreationTextFieldValue(columnName: string) {
         const columnIndex = await this.getColumnIndex(columnName);
         if (await this.isCreationOpened()) {
@@ -368,6 +375,10 @@ export class SmartTable extends BaseElement {
         const row = await this.getRow(searchValue, searchColumn);
         return row.removeMultiselectValueByColumnIndex(value, index);
     }
+    
+    public isSelectorAvailable(): Promise<boolean> {
+        return this.selectAllCheckbox.isPresent();
+    }
 
     private isCreationOpened() {
         return this.creationRow.isPresent();

e2e/helpers/project.helper.ts

@@ -48,7 +48,7 @@ export class ProjectHelper {
         try {
             await logIn.logInAs(this.admin.user_name, this.admin.password);
             const authCookie = await browser.manage().getCookie('iio78');
-            this.adminAPI = new UserAPI(decodeURIComponent(authCookie.value));
+            this.adminAPI = new UserAPI(decodeURIComponent(authCookie.value), this.admin);
             this.project = await this.adminAPI.createProject(this.project);
             const token = await this.adminAPI.createToken(this.project);
             if (permissions) {
@@ -76,7 +76,15 @@ export class ProjectHelper {
 
     public async dispose() {
         this.ifDisposed();
-        await this.adminAPI.removeProject(this.project);
+        browser.navigate().back();
+        try {
+            await this.adminAPI.removeProject(this.project);
+        } catch(err ) {
+            if((err as string).endsWith(`Credentials you've provided are not valid. Reenter please.`)) {
+                await this.adminAPI.relogin();
+                await this.adminAPI.removeProject(this.project);
+            }
+        }
         this.disposed = true;
     }