Merge branch 'streamline-testing' into developer

Author: Alexander Bainczyk

frontend/src/app/views/test-case-view/test-case-view.component.html

@@ -2,7 +2,7 @@
   <action-bar>
     <div class="d-flex flex-row align-items-center">
       <div class="btn-group btn-group-sm ml-auto">
-        <button (click)="execute()" class="btn btn-primary">
+        <button (click)="execute()" [disabled]="this.testConfig == undefined" class="btn btn-primary">
           Execute
         </button>
         <button (click)="openTestConfigModal()" class="btn btn-primary">

frontend/src/app/views/test-case-view/test-case-view.component.ts

@@ -72,12 +72,6 @@ export class TestCaseViewComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     window.addEventListener('keydown', this.keyDownHandler);
 
-    this.testConfig = {
-      tests: [this.testCase],
-      environment: this.project.getDefaultEnvironment(),
-      driverConfig: new WebDriverConfig()
-    };
-
     this.symbolGroupApi.getAll(this.project.id).subscribe(
       groups => {
         SymbolGroupUtils.getSymbols(groups).forEach(s => this.symbolMap[s.id] = s);
@@ -90,7 +84,7 @@ export class TestCaseViewComponent implements OnInit, OnDestroy {
       const i = configs.findIndex(c => c.default);
       if (i > -1) {
         this.testConfig = configs[i];
-        this.testConfig.environment = this.project.getEnvironmentById(this.testConfig.environment);
+        this.testConfig.environment = this.project.getEnvironmentById(this.testConfig.environment.id);
       }
     });
   }
@@ -121,11 +115,9 @@ export class TestCaseViewComponent implements OnInit, OnDestroy {
 
     this.saveTest().subscribe(
       () => {
-        const config = JSON.parse(JSON.stringify(this.testConfig));
-        config.tests = [this.testCase.id];
-        config.environment = config.environment.id;
+        this.testConfig.tests = [this.testCase.id];
 
-        this.testApi.executeMany(this.project.id, config).subscribe(
+        this.testApi.executeMany(this.project.id, this.testConfig).subscribe(
           data => {
             this.currentTestRun = data;
             this.pollForResult();
@@ -141,11 +133,13 @@ export class TestCaseViewComponent implements OnInit, OnDestroy {
 
   openTestConfigModal(): void {
     const modalRef = this.modalService.open(TestConfigModalComponent);
-    modalRef.componentInstance.configuration = JSON.parse(JSON.stringify(this.testConfig));
+    if (this.testConfig != null) {
+      modalRef.componentInstance.configuration = JSON.parse(JSON.stringify(this.testConfig));
+    }
     modalRef.componentInstance.project = this.project;
-    modalRef.result.then(data => {
-      this.toastService.success('The settings have been updated.');
-      this.testConfig = data;
+    modalRef.result.then((config) => {
+      this.testConfig = config;
+      this.toastService.success(`The config has been saved for the moment.`)
     }).catch(() => {});
   }
 

frontend/src/app/views/test-suite-view/test-suite-view.component.html

@@ -70,17 +70,11 @@
           </button>
         </div>
 
-        <div class="btn-group btn-group-sm float-right ml-2">
-          <button (click)="openCreateTestConfigModal()" class="btn btn-success" ngbTooltip="Save configuration" placement="left">
-            <i class="fas fa-fw fa-plus"></i> New Config
-          </button>
-        </div>
-
         <div class="btn-group btn-group-sm float-right">
           <button (click)="executeSelected()" class="btn btn-primary" [disabled]="!selectedTests.isAnySelected() || this.testConfig == undefined">
             Execute
           </button>
-          <button (click)="openEditTestConfigModal()" class="btn btn-primary" [disabled]="this.testConfig == undefined">
+          <button (click)="openTestConfigModal()" class="btn btn-primary">
             <i class="fas fa-fw fa-cog"></i>
           </button>
         </div>

frontend/src/app/views/test-suite-view/test-suite-view.component.ts

@@ -34,10 +34,7 @@ import { AppStoreService } from '../../services/app-store.service';
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TestsImportModalComponent } from './tests-import-modal/tests-import-modal.component';
-import {
-  TestConfigModalAction,
-  TestConfigModalComponent
-} from '../tests-view/test-config-modal/test-config-modal.component';
+import { TestConfigModalComponent } from '../tests-view/test-config-modal/test-config-modal.component';
 import { TestsMoveModalComponent } from './tests-move-modal/tests-move-modal.component';
 import { TestReportStatus, TestStatus } from '../../entities/test-status';
 import { TestLockInfo, TestPresenceService } from '../../services/test-presence.service';
@@ -274,32 +271,16 @@ export class TestSuiteViewComponent implements OnInit, OnDestroy {
       && this.testStatus.currentTest.id === test.id;
   }
 
-  openCreateTestConfigModal(): void {
+  openTestConfigModal(): void {
     const modalRef = this.modalService.open(TestConfigModalComponent);
-    modalRef.componentInstance.action = TestConfigModalAction.CREATE;
-    modalRef.componentInstance.configuration = {};
-    modalRef.componentInstance.configuration.driverConfig = {};
-    modalRef.componentInstance.project = this.project;
-    modalRef.result.then(_ => {
-      this.testConfigApi.getAll(this.project.id).subscribe(
-        testConfigs => {
-          this.testConfigs = testConfigs;
-        },
-        console.error
-      );
-    }).catch(() => {
-    });
-  }
-
-  openEditTestConfigModal(): void {
-    const modalRef = this.modalService.open(TestConfigModalComponent);
-    modalRef.componentInstance.action = TestConfigModalAction.EDIT;
-    modalRef.componentInstance.configuration = JSON.parse(JSON.stringify(this.testConfig));
+    if (this.testConfig != null) {
+      modalRef.componentInstance.configuration = JSON.parse(JSON.stringify(this.testConfig));
+    }
     modalRef.componentInstance.project = this.project;
     modalRef.result.then(config => {
-      const i = this.testConfigs.findIndex(value => value.id === config.id);
-      this.testConfigs[i] = config;
-    }).catch(() => {
+      this.testConfig = config;
+      this.toastService.success(`Config has been saved for the moment.`)
+      }).catch(() => {
     });
   }
 
@@ -415,7 +396,7 @@ export class TestSuiteViewComponent implements OnInit, OnDestroy {
       return {};
     }
 
-    if (this.report.status === TestReportStatus.IN_PROGRESS && this.testStatus != null) {
+    if (this.report.status === TestReportStatus.IN_PROGRESS && this.testStatus?.currentTestRun?.results != null) {
       return this.testStatus.currentTestRun.results;
     }
 

frontend/src/app/views/tests-view/test-config-modal/test-config-modal.component.html

@@ -31,51 +31,23 @@ <h4 class="modal-title">Configure the test run</h4>
 
         <div class="list-group">
           <div
-            (click)="selectedEnvironment = env"
+            (click)="this.configuration.environmentId = env.id"
             *ngFor="let env of project.environments"
-            [ngClass]="{'active': env.id === selectedEnvironment.id}"
+            [ngClass]="{'active': env.id === this.configuration.environmentId}"
             class="list-group-item cursor-pointer"
           >
             {{env.name}}
           </div>
         </div>
       </ng-template>
     </ng-container>
-    <ng-container ngbNavItem>
-      <a ngbNavLink>Test</a>
-      <ng-template ngbNavContent>
-        <br>
-
-        <div class="form-group">
-          <label>Name</label>
-          <textarea
-            [(ngModel)]="configuration.name"
-            class="form-control"
-            rows="1"
-            placeholder="Enter a name for the test config"
-          >
-          </textarea>
-        </div>
-        <div class="form-group">
-          <label>Description</label>
-          <textarea
-            [(ngModel)]="configuration.description"
-            class="form-control"
-            rows="3"
-            placeholder="Enter a description for the test config"
-          >
-          </textarea>
-        </div>
-      </ng-template>
-    </ng-container>
   </nav>
 
   <div [ngbNavOutlet]="nav"></div>
 
 </div>
 
 <div class="modal-footer">
-  <button *ngIf="action === TestConfigModalAction.CREATE" (click)="create()" class="btn btn-success btn-sm">Create</button>
-  <button *ngIf="action === TestConfigModalAction.EDIT" (click)="update()" class="btn btn-primary btn-sm">Update</button>
+  <button (click)="update()" [disabled]="!validConfig" class="btn btn-success btn-sm">Update</button>
   <button (click)="modal.dismiss(); $event.preventDefault()" class="btn btn-default btn-sm">Cancel</button>
 </div>

frontend/src/app/views/tests-view/test-config-modal/test-config-modal.component.ts

@@ -42,55 +42,25 @@ export class TestConfigModalComponent implements OnInit {
   @Input()
   project: Project;
 
-  /** The model for the url ids. */
-  @Input()
-  selectedEnvironment: ProjectEnvironment;
-
-  /** The action for which this modal has been opened. */
-  @Input()
-  action: TestConfigModalAction;
-
   /** Constructor. */
   constructor(public modal: NgbActiveModal,
               public testConfigApi: TestConfigApiService,
               public toastService: ToastService) {
   }
 
   ngOnInit(): void {
-    this.selectedEnvironment = this.project.getDefaultEnvironment();
-  }
-
-  create(): void {
-    this.configuration.id = null;
-    this.configuration.driverConfig.id = null;
-    this.configuration.tests = [];
-    this.configuration.project = this.project.id;
-    this.configuration.environmentId = this.selectedEnvironment.id;
-
-    this.testConfigApi.create(this.project.id, this.configuration).subscribe(config => {
-      this.toastService.success('The config has been created.');
-      this.modal.close(config);
-    }, res => {
-      this.toastService.danger(`The config couldn't be created. ${res.error.message}`);
-      this.modal.dismiss();
-    });
+    if (this.configuration == null) {
+      this.configuration = {}
+      this.configuration.driverConfig = {}
+      this.configuration.environmentId = this.project.getDefaultEnvironment().id;
+    }
   }
 
-  /**
-   * Close the modal window and pass the configuration.
-   */
   update(): void {
-    this.configuration.environmentId = this.selectedEnvironment.id;
-    this.testConfigApi.update(this.project.id, this.configuration).subscribe(config => {
-      this.toastService.success('The config has been updated.');
-      this.modal.close(config);
-    }, res => {
-      this.toastService.danger(`The config couldn't be updated. ${res.error.message}`);
-      this.modal.dismiss();
-    });
+    this.modal.close(this.configuration);
   }
 
-  get TestConfigModalAction() {
-    return TestConfigModalAction;
+  get validConfig(): boolean {
+    return this.configuration.driverConfig.browser != null && this.configuration.driverConfig.platform != null
   }
 }