fix for

http://46.243.183.199:8888/#/project/1/issue/56

Author: VladislavKostyukevich

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

@@ -13,7 +13,8 @@ enum Endpoints {
     customer = '/customer',
     apiToken = '/project/apiToken',
     projectPermission = '/users/permissions',
-    users = '/users'
+    users = '/users',
+    testrun = '/testrun',
 }
 
 export class UserAPI extends BaseAPI {
@@ -84,4 +85,8 @@ export class UserAPI extends BaseAPI {
         const authCookie = await browser.manage().getCookie('iio78');
         this.cookie = decodeURIComponent(authCookie.value)
     }
+
+    public async removeTestRun(testRunId: number) {
+        return this.sendDelete(Endpoints.testrun, { id: testRunId, project_id: this.project.id }, null);
+    }
 }

e2e/helpers/project.helper.ts

@@ -76,6 +76,7 @@ export class ProjectHelper {
 
     public async dispose() {
         this.ifDisposed();
+        browser.navigate().back();
         try {
             await this.adminAPI.removeProject(this.project);
         } catch(err ) {

e2e/specs/suite/syncSuite.spec.ts

@@ -96,9 +96,9 @@ describe('Sync Test Suite', () => {
       });
 
       afterAll(async () => {
-        await projectHelper.editorAPI.removeTestRun(notSyncTestRun[0].id);
-        await projectHelper.editorAPI.removeTestRun(syncTestRuns[0].id);
-        return projectHelper.editorAPI.removeTestRun(syncTestRuns[1].id);
+        await projectHelper.adminAPI.removeTestRun(notSyncTestRun[0].id);
+        await projectHelper.adminAPI.removeTestRun(syncTestRuns[0].id);
+        return projectHelper.adminAPI.removeTestRun(syncTestRuns[1].id);
       });
 
       it('Check default fields if suite was not chosen', async () => {

src/app/pages/project/project-view/project-veiw.component.ts

@@ -82,7 +82,7 @@ export class ProjectViewComponent implements OnInit {
 
     this.project = (await this.projectService.getProjects(this.project).toPromise())[0];
 
-    [this.allIssues,this.suites, this.testRuns, this.testRunStats] = await Promise.all([
+    [this.allIssues, this.suites, this.testRuns, this.testRunStats] = await Promise.all([
       this.issueService.getIssues({ project_id: projectId }),
       this.testSuiteService.getTestSuite({ project_id: projectId }),
       this.testrunService.getTestRun(this.testRun, 5),
@@ -175,17 +175,21 @@ export class ProjectViewComponent implements OnInit {
   calculateAutomationQuality(testRunStatsBySuites: { suite: TestSuite, stats: TestRunStat[] }[]): { quality: number, NA: number, testIssue: number, other: number, appIssue: number, passed: number, total: number } {
     let stat = { quality: 0, NA: 0, testIssue: 0, other: 0, appIssue: 0, passed: 0, total: 0 }
 
+    console.log(testRunStatsBySuites)
+
     for (const suiteStat of testRunStatsBySuites) {
       if (suiteStat.stats[0]) {
-        stat.NA += suiteStat.stats[0].not_assigned;
-        stat.appIssue += suiteStat.stats[0].app_issue;
-        stat.passed += suiteStat.stats[0].passed;
-        stat.testIssue += suiteStat.stats[0].warning;
-        stat.other += suiteStat.stats[0].other;
-        stat.total += suiteStat.stats[0].total;
+        stat.NA += suiteStat.stats[0].not_assigned ? suiteStat.stats[0].not_assigned : 0;
+        stat.appIssue += suiteStat.stats[0].app_issue ? suiteStat.stats[0].app_issue : 0;
+        stat.passed += suiteStat.stats[0].passed ? suiteStat.stats[0].passed : 0;
+        stat.testIssue += suiteStat.stats[0].warning ? suiteStat.stats[0].warning : 0;
+        stat.other += suiteStat.stats[0].other ? suiteStat.stats[0].other : 0;
+        stat.total += suiteStat.stats[0].total ? suiteStat.stats[0].total : 0;
       }
     }
 
+    console.log(stat)
+
     stat.quality = stat.total > 0 ? (1 - ((stat.NA * 1 + stat.testIssue * 0.75 + stat.other * 0.5) / (stat.total))) * 100 : 0;
     if (stat.quality < 0) {
       stat.quality = 0;
@@ -204,10 +208,10 @@ export class ProjectViewComponent implements OnInit {
     for (const suiteStat of testRunStatsBySuite) {
       for (const stat of suiteStat.stats) {
         if (Math.floor(new Date().getTime() - new Date(stat.finish_time).getTime()) / (1000 * 60 * 60 * 24) < 90) {
-          ttlNA += stat.not_assigned;
-          ttltestIssue += stat.warning;
-          ttlOther += stat.other;
-          ttl += stat.total;
+          ttlNA += stat.not_assigned ? stat.not_assigned : 0;
+          ttltestIssue += stat.warning ? stat.warning : 0;
+          ttlOther += stat.other ? stat.other : 0;
+          ttl += stat.total ? stat.total : 0;
         }
       }
     }
@@ -220,6 +224,7 @@ export class ProjectViewComponent implements OnInit {
   }
 
   createChartData(data: { quality: number, NA: number, testIssue: number, other: number, appIssue: number, passed: number }) {
+    console.log(data);
     return [{
       value: data.passed,
       color: '#28A745',

src/app/pages/project/test/steps-container/steps-container.component.html

@@ -10,12 +10,12 @@
 
   <ul *ngIf="editable" class="col-sm-12 no-padding creator">
     <li class="clearfix step-row form-row">
-      <div class="col-sm-1 add-step-cell">
+      <div class="col-sm-2 add-step-cell">
         <lookup-autocomplete class="type-selector" [cutLongText]="true" [small]="true" placeholder="Step Type" [allowEmptyValue]="true"
           [propertiesToShow]="['name']" [array]="types" [model]="newStepType" (modelChange)="setNewStepType($event)">
         </lookup-autocomplete>
       </div>
-      <div class="col-sm-10 add-step-cell">
+      <div class="col-sm-9 add-step-cell">
         <lookup-autocomplete class="step-selector" [cutLongText]="true" [small]="true" placeholder="Step" [allowEmptyValue]="false"
           [propertiesToShow]="['name']" [array]="filteredSteps" [(model)]="newStep" [disabled]="!newStepType"
           [allowCreation]="true" (searchText)="createStep($event)">