Merge pull request #91 from aquality-automation/feature/milestone_due_date

Feature/milestone due date

Author: VladislavKostyukevich

CHANGELOG.md

@@ -5,6 +5,11 @@
 Features:
   - Improve Test Run and Test List page performance -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/71)
   - Exclude Debug results from last results column -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/70)
+  - Milestone: Add selected Suites to milestone -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/63)
+  - Milestone: Add not executed suites -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/64)
+  - Milestone: Add Due Date to Milestone. -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/61)
+  - Milestone: Add possibility to Close Milestone. -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/62)
+  - Test Runs List: Add possibility to Add milestone from Test Runs List. -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/59)
 
 Bugfixes:
 

e2e/api/editor.api.ts

@@ -6,7 +6,6 @@ import { Milestone } from '../../src/app/shared/models/milestone';
 import { sendPost, sendGet, sendDelete } from '../utils/aqualityTrackingAPI.util';
 import { TestResult } from '../../src/app/shared/models/test-result';
 import { Project } from '../../src/app/shared/models/project';
-import { ResultResolution } from '../../src/app/shared/models/result_resolution';
 
 enum Endpoints {
     suite = '/suite',
@@ -68,6 +67,7 @@ export class EditorAPI {
     }
 
     public async getSuites(testSuite: TestSuite): Promise<TestSuite[]> {
+        testSuite.project_id = this.project.id;
         return sendGet(Endpoints.suite, testSuite, this.token, this.project.id);
     }
 
@@ -83,7 +83,23 @@ export class EditorAPI {
         return sendGet(Endpoints.testrun, testrun, this.token, this.project.id);
     }
 
+    public async getMilestones(milestone: Milestone): Promise<Milestone[]> {
+        milestone.project_id = this.project.id;
+        return sendGet(Endpoints.milestone, milestone, this.token, this.project.id);
+    }
+
     public async removeTestRun(testRunId: number) {
-        return sendDelete(Endpoints.testrun, { id: testRunId, project_id: this.project.id}, null, this.token, this.project.id);
+        return sendDelete(Endpoints.testrun, { id: testRunId, project_id: this.project.id }, null, this.token, this.project.id);
+    }
+
+    public async addSuiteToMilestone(milestoneName: string, suiteName: string) {
+        const milestone: Milestone = (await this.getMilestones({ name: milestoneName }))[0];
+        const suite: TestSuite = (await this.getSuites({ name: suiteName }))[0];
+        if (milestone.suites) {
+            milestone.suites.push(suite);
+        } else {
+            milestone.suites = [suite];
+        }
+        return this.createMilestone(milestone);
     }
 }

e2e/data/expected/milestoneView/noAssignedTestRuns.csv

@@ -1,4 +1 @@
-Test,Test Suite,Result,Resolution,Comment,Finished
-"Login: should be able to login as admin","Login","Not Executed",,,"Invalid Date"
-"Login: should not be able to login with wrong username","Login","Not Executed",,,"Invalid Date"
-"Login: should not be able to login with wrong password","Login","Not Executed",,,"Invalid Date"
+Test,Test Suite,Test Run,Result,Resolution,Comment,Finished

e2e/elements/notification.element.ts

@@ -1,8 +1,19 @@
-import { by, element } from 'protractor';
+import { by, element, browser } from 'protractor';
 import { BaseElement } from './base.element';
 
 export class Notification extends BaseElement {
     private pageName: string;
+    private clickSectionScript = `
+    (function mouseEnter(el, etype) {
+    if (el.fireEvent) {
+        el.fireEvent('on' + etype);
+    } else {
+        var evObj = document.createEvent('Events');
+        evObj.initEvent(etype, true, false);
+        el.dispatchEvent(evObj);
+    }
+    })(arguments[0], 'mouseenter')
+    `;
 
     constructor(pageName: string) {
         super(by.tagName('simple-notification'));
@@ -51,7 +62,14 @@ export class Notification extends BaseElement {
         return this.assert('warn', message, header);
     }
 
+    private mouseOver() {
+        return browser.executeScript(this.clickSectionScript, this.getContainer());
+    }
+
     private async assert(type: string, message?: string, header?: string) {
+        if (await this.isVisible()) {
+            this.mouseOver();
+        }
         await expect(type === 'error' ? this.isError() : type === 'success' ? this.isSuccess() : type === 'warn' ? this.isWarning() : false)
             .toBe(true, `${this.pageName}: No Success notification message!`);
         if (message) {

e2e/elements/smartTable.element/manageCollumns.element.ts

@@ -59,4 +59,13 @@ export class ManageColumns extends BaseElement {
         await this.hideColumn(columnName);
         return this.apply();
     }
+
+    async removeColumns(columnNames: string[]) {
+        await this.openManageColumns();
+        for (let i = 0; i < columnNames.length; i++) {
+            const columnName = columnNames[i];
+            await this.hideColumn(columnName);
+        }
+        return this.apply();
+    }
 }

e2e/pages/milestone/view.po/constants.ts

@@ -22,5 +22,6 @@ export const columns = {
     test: 'Test',
     finished: 'Finished',
     result: 'Result',
-    resolution: 'Resolution'
+    resolution: 'Resolution',
+    testrun: 'Test Run'
 };

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

@@ -14,8 +14,8 @@ class MilestoneView extends BasePage {
         return elements.milestonesTable.checkIfTableEqualToCSv(path);
     }
 
-    removeFinishedColumn() {
-        return elements.milestonesTable.manageColumns.removeColumn(columns.finished);
+    removeGenericColumn() {
+        return elements.milestonesTable.manageColumns.removeColumns([columns.finished, columns.testrun]);
     }
 
     setDistinctTest(state: boolean) {

e2e/pages/testrun/list.po/index.ts

@@ -16,7 +16,7 @@ class TestRunList extends BasePage {
     }
 
     openTestRun(buildName: string) {
-        return elements.testRunsTable.clickRow(buildName, columns.build);
+        return elements.testRunsTable.clickCell(columns.build, buildName, columns.build);
     }
 
     getTestRunsCount() {

e2e/pages/testrun/view.po/constants.ts

@@ -38,11 +38,6 @@ export const elements = {
     debug: new Checkbox(by.id('debug'))
 };
 
-export const regexps = {
-    // tslint:disable-next-line: max-line-length
-    startDateRegexp: '(?<day>(\\d{2}))\\/(?<month>(\\d{2}))\\/(?<year>(\\d{2}))\\s(?<hours>(\\d{2})):(?<minutes>(\\d{2})):(?<seconds>(\\d{2}))\\s(?<period>(\\w{2}))'
-};
-
 export const columns = {
     testName: 'Test Name',
     failReason: 'Fail Reason',