Merge pull request #83 from aquality-automation/Bug51-export-creation

VladislavKostyukevich · web-flow · commit fd7576965073 · 2020-03-11T11:31:05.000+03:00
Bug51 export creation
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,11 @@
 
 Features:
   - Test Run List: Add posibility to filter by Inactive Milestone -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/73)
+  - Mark import af failed when import is failed  -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/79)
 
 Bugfixes:
   - Test Runs: Fix Filter for No Resolution Column -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/22)
+  - Test Run View: Chart is not updated when user updating results in a bulk -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/78)
   
 ## 0.3.7 (2020-03-02)
 
@@ -19,6 +21,9 @@ Features:
   - 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:
+  - Fixed for downloading audits results from Audits Dashboard -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/51)
+
 ## 0.3.6 (2020-02-24)
 
 Features:
diff --git a/api/docker-compose.yml b/api/docker-compose.yml
@@ -16,6 +16,7 @@ services:
       - db
     image: tomcat:9.0-jre8-alpine
     restart: always
+    command: bash -c "apk add --update ttf-dejavu && rm -rf /var/cache/apk/* && catalina.sh run"
     volumes:
       - ./apps:/usr/local/tomcat/webapps/
     links:
diff --git a/e2e/data/import/cucumber.json b/e2e/data/import/cucumber.json
@@ -26,7 +26,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 1684328900
             }
           },
           {
@@ -39,7 +39,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 86
+              "duration": 1684328900
             }
           }
         ]
@@ -61,7 +61,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 2667613100
             }
           },
           {
@@ -74,7 +74,7 @@
             },
             "result": {
               "status": "failed",
-              "duration": 86,
+              "duration": 2667613100,
               "error_message": "step was failed"
             }
           }
@@ -97,7 +97,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 2667613100
             }
           },
           {
@@ -110,7 +110,7 @@
             },
             "result": {
               "status": "skipped",
-              "duration": 86,
+              "duration": 1684328900,
               "error_message": "step was skipped"
             }
           }
diff --git a/e2e/data/import/cucumberSpecialSymbols.json b/e2e/data/import/cucumberSpecialSymbols.json
@@ -26,7 +26,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 1684328900
             }
           },
           {
@@ -39,7 +39,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 86
+              "duration": 1684328900
             }
           }
         ]
@@ -61,7 +61,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 1684328900
             }
           },
           {
@@ -74,7 +74,7 @@
             },
             "result": {
               "status": "failed",
-              "duration": 86,
+              "duration": 1684328900,
               "error_message": "step was failed !”#$%&’()*+,-./:;<=>?@[\\]^_`{|}~"
             }
           }
@@ -97,7 +97,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 1684328900
             }
           },
           {
@@ -110,7 +110,7 @@
             },
             "result": {
               "status": "skipped",
-              "duration": 86,
+              "duration": 1684328900,
               "error_message": "step was skipped"
             }
           }
diff --git a/e2e/data/import/oneTestCucumber.json b/e2e/data/import/oneTestCucumber.json
@@ -26,7 +26,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 1684328900
             }
           },
           {
@@ -39,7 +39,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 86
+              "duration": 1684328900
             }
           }
         ]
diff --git a/e2e/data/users.json b/e2e/data/users.json
@@ -87,6 +87,19 @@
         "unit_coordinator": 0,
         "account_manager": 0
     },
+    "unitCoordinator":{
+        "user_name": "auto.unitcoordinator",
+        "password": "123456",
+        "first_name": "auto",
+        "second_name": "coordinator",
+        "email": "coordinator@example.com",
+        "admin":0,
+        "manager":0,
+        "auditor":0,
+        "audit_admin":0,
+        "unit_coordinator":1,
+        "account_manager":0
+    },
     "viewer": {
         "user_name": "auto.viewer",
         "password": "123456",
diff --git a/e2e/pages/audit/dashboard.po/constants.ts b/e2e/pages/audit/dashboard.po/constants.ts
@@ -0,0 +1,14 @@
+import { by, element } from 'protractor';
+import { SmartTable } from '../../../elements/smartTable.element';
+
+export const elements = {
+    uniqueElement: element(by.id('audits-dashboard-page')),
+    exportToExcel: element(by.id('export')),
+    allSubmittedAudits: element(by.xpath('//a[@class="dropdown-item"][text()="All submitted audits"]')),
+    lastSubmittedAudits: element(by.xpath('//a[@class="dropdown-item"][text()="Last submitted audits"]')),
+    auditsSmartTable: new SmartTable(by.id('datatable'))
+};
+
+export const names = {
+    pageName: 'Audits Dashboard'
+};
diff --git a/e2e/pages/audit/dashboard.po/index.ts b/e2e/pages/audit/dashboard.po/index.ts
@@ -0,0 +1,20 @@
+import { elements, names } from './constants';
+import { BasePage } from '../../base.po';
+
+class AuditsDashboard extends BasePage {
+    constructor() {
+        super(elements.uniqueElement, names.pageName);
+    }
+
+    async exportAllSubmittedAudits(): Promise<void> {
+        await elements.exportToExcel.click();
+        return elements.allSubmittedAudits.click();
+    }
+
+    async exportLastSubmittedAudits(): Promise<void> {
+        await elements.exportToExcel.click();
+        return elements.lastSubmittedAudits.click();
+    }
+}
+
+export const auditsDashboardPage = new AuditsDashboard();
diff --git a/e2e/pages/base.po.ts b/e2e/pages/base.po.ts
@@ -44,6 +44,11 @@ export class BasePage {
         return browser.navigate().back();
     }
 
+    async getConsoleLogs() {
+        const browserLog = await browser.manage().logs().get('browser');
+        return require('util').inspect(browserLog);
+    }
+
     async getCurrentProjectId(): Promise<number> {
         const url = `${await browser.getCurrentUrl()}/`;
         const regexp = /.*\/project\/(\d+)\/.*/;
diff --git a/e2e/pages/login.po/index.ts b/e2e/pages/login.po/index.ts
@@ -29,7 +29,10 @@ class LogIn extends BasePage {
       logger.info('Going to log out, before logging in with another user account.');
       await this.menuBar.clickLogOut();
     }
-    await expect(await this.isOpened()).toBe(true, 'Was not logged out!');
+    if (!(await this.isOpened())) {
+      const logs = await this.getConsoleLogs();
+      expect(true).toBe(false, `Was not logged out!\nLogs:\n${logs}`);
+    }
     await this.setUserName(userName);
     await this.setPassword(password);
     await this.clickLogIn();
diff --git a/e2e/specs/audit/auditDashboard.spec.ts b/e2e/specs/audit/auditDashboard.spec.ts
@@ -0,0 +1,66 @@
+import { logIn } from '../../pages/login.po';
+import { auditsDashboardPage } from '../../pages/audit/dashboard.po';
+import { testData } from '../../utils/testData.util';
+import { projectList } from '../../pages/project/list.po';
+import { dateUtil } from '../../utils/date.util';
+import using from 'jasmine-data-provider';
+import users from '../../data/users.json';
+
+const editorExamples = {
+    auditAdmin: users.auditAdmin,
+    manager: users.manager
+};
+
+const notEditorExamples = {
+    autoAdmin: users.autoAdmin,
+    viewer: users.viewer,
+    coordinator: users.unitCoordinator
+};
+
+const getAllSubmittedAuditsfileName = (): string => {
+    return `Aquality_Tracking_All_Submitted_Audits_${dateUtil.getDateFormat()}.xlsx`;
+};
+
+const getLastSubmittedAuditsfileName = (): string => {
+    return `Aquality_Tracking_Last_Submitted_Audits_${dateUtil.getDateFormat()}.xlsx`;
+};
+
+describe('Audits Dashboard:', () => {
+    using(notEditorExamples, (user, description) => {
+        describe(`${description} role:`, () => {
+            it(`Is not available for role ${description}`, async () => {
+                await logIn.logInAs(user.user_name, user.password);
+                return expect(projectList.menuBar.isAuditTabExists()).toBe(false, 'Audits Dashboard should be unavailable');
+            });
+        });
+    });
+
+    using(editorExamples, (user, description) => {
+        describe(`${description} role:`, () => {
+            beforeAll(async () => {
+                await testData.cleanUpDownloadsData();
+                await logIn.logInAs(user.user_name, user.password);
+                return projectList.menuBar.audits();
+            });
+
+            afterAll(async () => {
+                return testData.cleanUpDownloadsData();
+            });
+
+            it('Can export all submitted audits', async () => {
+                await auditsDashboardPage.exportAllSubmittedAudits();
+                return expect(
+                    await testData.waitUntilFileExists(testData.getSimpleDownloadsFolderPath(), getAllSubmittedAuditsfileName()))
+                    .toBe(true, `All submitted audits should be exported to file: ${getAllSubmittedAuditsfileName()}`);
+            });
+
+            it('Can export last submitted audits', async () => {
+                await auditsDashboardPage.exportLastSubmittedAudits();
+                return expect(
+                    await testData.waitUntilFileExists(testData.getSimpleDownloadsFolderPath(), getLastSubmittedAuditsfileName()))
+                    .toBe(true, `Last submitted audits should be exported to file: ${getLastSubmittedAuditsfileName()}`);
+            });
+        });
+    });
+});
+
diff --git a/e2e/specs/hooks.spec.ts b/e2e/specs/hooks.spec.ts
@@ -33,6 +33,7 @@ beforeAll(async () => {
     await userAdministration.create(usersTestData.manager);
     await userAdministration.create(usersTestData.projectTemp);
     await userAdministration.create(usersTestData.viewer);
+    await userAdministration.create(usersTestData.unitCoordinator);
     await userAdministration.menuBar.clickLogOut();
 });
 
@@ -53,5 +54,6 @@ afterAll(async () => {
     await userAdministration.remove(usersTestData.manager.user_name);
     await userAdministration.remove(usersTestData.projectTemp.user_name);
     await userAdministration.remove(usersTestData.viewer.user_name);
+    await userAdministration.remove(usersTestData.unitCoordinator.user_name);
     await userAdministration.menuBar.clickLogOut();
 });
diff --git a/e2e/specs/milestone/milestoneView.spec.ts b/e2e/specs/milestone/milestoneView.spec.ts
@@ -174,7 +174,7 @@ describe('Milestone:', () => {
 
     using(editorExamples, (user, description) => {
         describe(`Milestone View: ${description} role:`, () => {
-            let testrun;
+            let testrun: TestRun;
             beforeAll(async () => {
                 await logIn.logInAs(user.user_name, user.password);
                 await projectHelper.openProject();
diff --git a/e2e/specs/suite/syncSuite.spec.ts b/e2e/specs/suite/syncSuite.spec.ts
@@ -9,6 +9,8 @@ import using from 'jasmine-data-provider';
 import cucumberImport from '../../data/import/cucumber.json';
 import syncImport from '../../data/import/oneTestCucumber.json';
 import users from '../../data/users.json';
+import { TestRun } from '../../../src/app/shared/models/testRun';
+import { EditorAPI } from '../../api/editor.api';
 
 const editorExamples = {
   localAdmin: users.localAdmin,
@@ -30,6 +32,12 @@ const isTestRunCorrect = (testResults: TestResult[], includedTests: string[], re
   return included && removed;
 };
 
+const updateTestRunDates = (api: EditorAPI, testRun: TestRun, started: Date, finished: Date) =>{
+  testRun.start_time = started;
+  testRun.finish_time = finished;
+  return api.createTestRun(testRun);
+};
+
 const testSuite = 'Sync Test Suite';
 const defaultNumberOfTestRuns = '5';
 const numberOfTestRunsForSync = '2';
@@ -80,6 +88,9 @@ describe('Sync Test Suite', () => {
         notSyncTestRun = await projectHelper.importer.executeCucumberImport(testSuite, [cucumberImport], [builds.filenames[0]]);
         syncTestRuns = await projectHelper.importer.executeCucumberImport(
           testSuite, [syncImport, syncImport], [builds.filenames[1], builds.filenames[2]]);
+        await updateTestRunDates(projectHelper.editorAPI, notSyncTestRun[0], new Date('03/09/2020'), new Date('03/10/2020'));
+        await updateTestRunDates(projectHelper.editorAPI, syncTestRuns[0], new Date('03/10/2020'), new Date('03/11/2020'));
+        await updateTestRunDates(projectHelper.editorAPI, syncTestRuns[1], new Date('03/11/2020'), new Date('03/12/2020'));
         await logIn.logInAs(user.user_name, user.password);
         return projectHelper.openProject();
       });
diff --git a/e2e/specs/testrun/result_searcher.testrun.spec.ts b/e2e/specs/testrun/result_searcher.testrun.spec.ts
@@ -20,8 +20,6 @@ describe('Test Run Result Searcher', () => {
             [`${builds.build_1}.json`,
             `${builds.build_2}.json`]);
         await projectView.menuBar.testRuns();
-        const isTestRunAppear = await testRunList.waitForTestRun(builds.build_2);
-        expect(isTestRunAppear).toBe(true, 'Import was not finished!');
         await testRunList.openTestRun(builds.build_1);
     });
 
diff --git a/e2e/utils/date.util.ts b/e2e/utils/date.util.ts
@@ -0,0 +1,9 @@
+import { DatePipe } from '@angular/common';
+
+class DateUtil {
+  getDateFormat(locale: string = 'en', format: string = 'MM.dd.yyyy'): string {
+    return new DatePipe(locale).transform(new Date(), format);
+  }
+}
+
+export const dateUtil = new DateUtil();
diff --git a/e2e/utils/testData.util.ts b/e2e/utils/testData.util.ts
diff --git a/src/app/elements/charts/resultResolutions/resultResolutions.charts.component.ts b/src/app/elements/charts/resultResolutions/resultResolutions.charts.component.ts
diff --git a/src/app/pages/audit/audit-list/audit.component.html b/src/app/pages/audit/audit-list/audit.component.html
diff --git a/src/app/pages/project/import/import.component.ts b/src/app/pages/project/import/import.component.ts
diff --git a/src/app/pages/project/results/results-grid/results.grid.component.ts b/src/app/pages/project/results/results-grid/results.grid.component.ts
diff --git a/src/app/pages/project/testrun/testrun-view/testrun.view.component.ts b/src/app/pages/project/testrun/testrun-view/testrun.view.component.ts
diff --git a/src/app/shared/models/import.ts b/src/app/shared/models/import.ts

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`},`
`27`	`27`	`"result": {`
`28`	`28`	`"status": "passed",`
`29`		`- "duration": 7033`
	`29`	`+ "duration": 1684328900`
`30`	`30`	`}`
`31`	`31`	`},`
`32`	`32`	`{`
`@@ -39,7 +39,7 @@`
`39`	`39`	`},`
`40`	`40`	`"result": {`
`41`	`41`	`"status": "passed",`
`42`		`- "duration": 86`
	`42`	`+ "duration": 1684328900`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`]`
`@@ -61,7 +61,7 @@`
`61`	`61`	`},`
`62`	`62`	`"result": {`
`63`	`63`	`"status": "passed",`
`64`		`- "duration": 7033`
	`64`	`+ "duration": 2667613100`
`65`	`65`	`}`
`66`	`66`	`},`
`67`	`67`	`{`
`@@ -74,7 +74,7 @@`
`74`	`74`	`},`
`75`	`75`	`"result": {`
`76`	`76`	`"status": "failed",`
`77`		`- "duration": 86,`
	`77`	`+ "duration": 2667613100,`
`78`	`78`	`"error_message": "step was failed"`
`79`	`79`	`}`
`80`	`80`	`}`
`@@ -97,7 +97,7 @@`
`97`	`97`	`},`
`98`	`98`	`"result": {`
`99`	`99`	`"status": "passed",`
`100`		`- "duration": 7033`
	`100`	`+ "duration": 2667613100`
`101`	`101`	`}`
`102`	`102`	`},`
`103`	`103`	`{`
`@@ -110,7 +110,7 @@`
`110`	`110`	`},`
`111`	`111`	`"result": {`
`112`	`112`	`"status": "skipped",`
`113`		`- "duration": 86,`
	`113`	`+ "duration": 1684328900,`
`114`	`114`	`"error_message": "step was skipped"`
`115`	`115`	`}`
`116`	`116`	`}`