Merge branch 'develop' into inconsistent-tests

Author: Ayybeeshafi

.travis.yml

@@ -12,7 +12,7 @@ apt:
 before_install:
   -  npm install -g @angular/cli
 script:
-  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sbt ++$TRAVIS_SCALA_VERSION test; cd client && npm install && ng build --prod && npm run test -- --no-progress --browsers=ChromeHeadlessCI && cd .. ; fi'
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt ++$TRAVIS_SCALA_VERSION coverage test coverageReport coverageAggregate codacyCoverage; cd client && npm install && ng build --prod && npm run test -- --no-progress --browsers=ChromeHeadlessCI && cd .. ; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sbt ++$TRAVIS_SCALA_VERSION test; cd client && npm install && ng build --prod && npm run test -- --no-progress --browsers=ChromeHeadlessCI --source-map=false && cd .. ; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt ++$TRAVIS_SCALA_VERSION coverage test coverageReport coverageAggregate codacyCoverage; cd client && npm install && ng build --prod && npm run test -- --no-progress --browsers=ChromeHeadlessCI --source-map=false && cd .. ; fi'
 after_success:
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash <(curl -s https://codecov.io/bash); fi'

README.md

@@ -20,11 +20,20 @@ It takes commands from authenticated administrators over the web interface and i
 
 ## How can I use it?
 To build the angular app for deployment make sure to have npm and the angular cli installed 
+
 ```
 cd client && npm install && ng build --prod && cd ..
 ```
+
+For OS X users you need to expose the TCP port manually. The docker FAQ suggest it in this way:
+
+```
+docker run -d -v /var/run/docker.sock:/var/run/docker.sock -p 127.0.0.1:9095:9095 bobrik/socat TCP-LISTEN:9095,fork UNIX-CONNECT:/var/run/docker.sock
+```
+
 For any deployed instance you need an administrator account to interact with the application.
 You can start your own instance by executing
+
 ```
 sbt run
 ```

app/controllers/InstanceRegistryController.scala

@@ -117,12 +117,7 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
       .addQueryStringParameters("Id" -> instanceID)
       .post("")
       .map { response =>
-        response.status match {
-          case 202 =>
-            Ok(response.body)
-          case x =>
-            new Status(x)
-        }
+        new Status(response.status)
       }(myExecutionContext)
   }
 

client/package-lock.json

@@ -11,17 +11,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^7.2.0",
+    "@angular/animations": "^7.2.1",
     "@angular/cdk": "^7.2.1",
-    "@angular/common": "^7.2.0",
-    "@angular/compiler": "^7.2.0",
-    "@angular/core": "^7.2.0",
-    "@angular/forms": "^7.2.0",
-    "@angular/http": "^7.2.0",
+    "@angular/common": "^7.2.1",
+    "@angular/compiler": "^7.2.1",
+    "@angular/core": "^7.2.1",
+    "@angular/forms": "^7.2.1",
+    "@angular/http": "^7.2.1",
     "@angular/material": "^7.2.1",
-    "@angular/platform-browser": "^7.2.0",
-    "@angular/platform-browser-dynamic": "^7.2.0",
-    "@angular/router": "^7.2.0",
+    "@angular/platform-browser": "^7.2.1",
+    "@angular/platform-browser-dynamic": "^7.2.1",
+    "@angular/router": "^7.2.1",
     "@ng-bootstrap/ng-bootstrap": "^4.0.1",
     "bootstrap": "^4.1.3",
     "core-js": "^2.6.2",
@@ -31,13 +31,13 @@
     "material-design-icons": "^3.0.1",
     "popper.js": "^1.14.6",
     "rxjs": "^6.3.3",
-    "zone.js": "^0.8.27"
+    "zone.js": "^0.8.28"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.12.1",
-    "@angular/cli": "^7.2.1",
-    "@angular/compiler-cli": "^7.2.0",
-    "@angular/language-service": "^7.2.0",
+    "@angular-devkit/build-angular": "^0.12.2",
+    "@angular/cli": "^7.2.2",
+    "@angular/compiler-cli": "^7.2.1",
+    "@angular/language-service": "^7.2.1",
     "@types/jasmine": "^3.3.5",
     "@types/jasminewd2": "^2.0.6",
     "@types/node": "^10.12.18",

client/package.json

@@ -109,7 +109,7 @@ export class ApiService {
    * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
    * @param reportProgress flag to report request and response progress.
    */
-  public startInstance(instanceId: string, observe: any = 'body', reportProgress: boolean = false): Observable<HttpEvent<number>> {
+  public startInstance(instanceId: string, observe: any = 'body', reportProgress: boolean = false) {
     return this.postAction(START_INSTANCE, instanceId);
   }
 
@@ -119,7 +119,7 @@ export class ApiService {
    * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
    * @param reportProgress flag to report request and response progress.
    */
-  public stopInstance(instanceId: string, observe: any = 'body', reportProgress: boolean = false): Observable<HttpEvent<number>> {
+  public stopInstance(instanceId: string, observe: any = 'body', reportProgress: boolean = false) {
     return this.postAction(STOP_INSTANCE, instanceId);
   }
 
@@ -129,7 +129,7 @@ export class ApiService {
    * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
    * @param reportProgress flag to report request and response progress.
    */
-  public pauseInstance(instanceId: string, observe: any = 'body', reportProgress: boolean = false): Observable<HttpEvent<number>> {
+  public pauseInstance(instanceId: string, observe: any = 'body', reportProgress: boolean = false)  {
     return this.postAction(PAUSE_INSTANCE, instanceId);
   }
 
@@ -139,7 +139,7 @@ export class ApiService {
    * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
    * @param reportProgress flag to report request and response progress.
    */
-  public resumeInstance(instanceId: string, observe: any = 'body', reportProgress: boolean = false): Observable<HttpEvent<number>> {
+  public resumeInstance(instanceId: string, observe: any = 'body', reportProgress: boolean = false) {
     return this.postAction(RESUME_INSTANCE, instanceId);
   }
 
@@ -149,7 +149,7 @@ export class ApiService {
    * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
    * @param reportProgress flag to report request and response progress.
    */
-  public deleteInstance(instanceId: string): Observable<HttpEvent<number>> {
+  public deleteInstance(instanceId: string) {
     return this.postAction(DELETE_INSTANCE, instanceId);
   }
 
@@ -214,8 +214,7 @@ export class ApiService {
   }
 
 
-  private postAction(endpoint: string, idInstance: string, observe: any = 'body', reportProgress: boolean = false):
-    Observable<HttpEvent<number>> {
+  private postAction(endpoint: string, idInstance: string, observe: any = 'body', reportProgress: boolean = false) {
     let queryParam = new HttpParams({ encoder: new CustomHttpUrlEncodingCodec() });
 
     if (idInstance === null || idInstance === undefined) {
@@ -228,8 +227,7 @@ export class ApiService {
   }
 
 
-  private commonConf(endpoint: string, queryParameters: HttpParams, observe: any = 'body', reportProgress: boolean = false):
-  Observable<HttpEvent<number>> {
+  private commonConf(endpoint: string, queryParameters: HttpParams, observe: any = 'body', reportProgress: boolean = false) {
     let headers = this.defaultHeaders;
 
     // to determine the Accept header

client/src/app/api/api/api.service.ts

@@ -19,6 +19,7 @@
 import {TestBed} from '@angular/core/testing';
 
 import {SocketService} from './socket.service';
+import { doesNotReject } from 'assert';
 
 describe('SocketService', () => {
   let socketService: SocketService;
@@ -49,14 +50,4 @@ describe('SocketService', () => {
     expect(socketService).toBeTruthy();
   });
 
-
-  it('should return correct data on subscribe', () => {
-    console.log('new test');
-    socketService = TestBed.get(SocketService);
-    console.log('socket service', socketService);
-    // need to check the result based on some mock object to simulate the connection to the webserver
-    socketService.initSocket().then(() => {
-      console.log('fake socket open');
-    });
-  });
 });

client/src/app/api/api/socket.service.spec.ts

@@ -17,19 +17,34 @@
  */
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { HttpClientModule } from '@angular/common/http';
 import { StatusCardComponent } from './status-card.component';
+import { ApiService } from 'src/app/api/api/api.service';
+import { Observable } from 'rxjs';
+import { SysInfo } from 'src/app/model/models/sysInfo';
 
 
 describe('StatusCardComponent', () => {
   let component: StatusCardComponent;
   let fixture: ComponentFixture<StatusCardComponent>;
-
+  const JAVA_VERSION = '1.0';
+  const HOST_NAME = 'My Host Name';
+  const PLATFORM_NAME = 'My Platform Name';
+  const SCALA_VERSION = '2.0';
   beforeEach(async(() => {
+    let apiServiceStub: Partial<ApiService>;
+    apiServiceStub = {
+      getSysInfo: () => new Observable<SysInfo>((observer) => {
+        observer.next({
+          javaVersion: JAVA_VERSION,
+          hostName: HOST_NAME,
+          platformName: PLATFORM_NAME,
+          scalaVersion: SCALA_VERSION
+        });
+      })
+    };
     TestBed.configureTestingModule({
       declarations: [ StatusCardComponent ],
-      imports: [HttpClientTestingModule, HttpClientModule]
+      providers: [{provide: ApiService, useValue: apiServiceStub}]
     })
     .compileComponents();
   }));
@@ -41,6 +56,13 @@ describe('StatusCardComponent', () => {
   });
 
   it('should create', () => {
-    expect(component).toBeTruthy();
+    expect(component).toBeDefined();
+  });
+
+  it('should have the dummy data stored', () => {
+    expect(component.sysInfo.hostName).toBe(HOST_NAME);
+    expect(component.sysInfo.javaVersion).toBe(JAVA_VERSION);
+    expect(component.sysInfo.platformName).toBe(PLATFORM_NAME);
+    expect(component.sysInfo.scalaVersion).toBe(SCALA_VERSION);
   });
 });

client/src/app/dashboard/status-card/status-card.component.spec.ts

@@ -23,7 +23,7 @@
         <mat-form-field>
             <input id="filterData" matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
         </mat-form-field>
-        <table class="mat-elevation-z8 mat-table" mat-table [dataSource]="dataSource">
+        <mat-table class="mat-elevation-z8 mat-table" [dataSource]="dataSource">
             <ng-container matColumnDef="ID">
                 <mat-header-cell *matHeaderCellDef> ID </mat-header-cell>
                 <mat-cell *matCellDef="let element"> {{element.id}} </mat-cell>
@@ -78,7 +78,7 @@
 
             <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
             <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
-        </table>
+        </mat-table>
     </div>
 </ng-template>
 

client/src/app/dashboard/table-all/table-all.component.html

@@ -18,7 +18,7 @@
 
 import {Instance} from '../../model/models/instance';
 import { Component, OnInit, Input, ViewChild } from '@angular/core';
-import { MatDialog, MatTable, MatPaginator, MatTableDataSource } from '@angular/material';
+import { MatDialog, MatPaginator, MatTableDataSource } from '@angular/material';
 import { DeleteDialogComponent } from '../delete-dialog/delete-dialog.component';
 import { AddDialogComponent } from '../add-dialog/add-dialog.component';
 import { HttpEvent } from '@angular/common/http';
@@ -47,7 +47,6 @@ export class TableAllComponent implements OnInit {
     displayedColumns = ['ID', 'name', 'host', 'portNumber', 'instanceState', 'action'];
     dataSource: MatTableDataSource<Instance> = new MatTableDataSource<Instance>(this.dataArray);
     dialogResult: string;
-    @ViewChild(MatTable) table: MatTable<Instance>;
 
     constructor(public dialog: MatDialog, private apiService: ApiService, private modelService: ModelService) {
     }
@@ -81,7 +80,7 @@ export class TableAllComponent implements OnInit {
                     this.apiService.deleteInstance(id).subscribe((deleteResult: HttpEvent<number>) => {
                         console.log('result', deleteResult);
                     }, err => {
-                        console.log('error delete Instance');
+                        console.log('error delete Instance', err);
                     });
                     this.removeAt(i);
                 }
@@ -92,7 +91,6 @@ export class TableAllComponent implements OnInit {
 
     removeAt(index: number) {
         this.dataSource.data.splice(index, 1);
-        this.table.renderRows();
     }
 
     applyFilter(filterValue: string) {
@@ -113,10 +111,8 @@ export class TableAllComponent implements OnInit {
         dialogRef.afterClosed().subscribe(dialogResult => {
             this.apiService.postInstance(this.type, dialogResult.name).subscribe((result: Instance) => {
                 this.dataSource.data.push(result);
-                this.table.renderRows();
-            }, err => {
-
-                console.log('error receiving data for crawler');
+            }, (err: any) => {
+                console.log('error receiving data for crawler', err);
             });
         });
     }
@@ -127,8 +123,7 @@ export class TableAllComponent implements OnInit {
    */
     public startInstance(id: string): void {
 
-        this.apiService.startInstance(id).subscribe((result: HttpEvent<number>) => {
-            console.log('result', result);
+        this.apiService.startInstance(id).subscribe(() => {
         }, err => {
             console.log('error start Instance', err);
         });
@@ -140,8 +135,7 @@ export class TableAllComponent implements OnInit {
    */
     public stopInstance(id: string): void {
 
-        this.apiService.stopInstance(id).subscribe((result: HttpEvent<number>) => {
-            console.log('result', result);
+        this.apiService.stopInstance(id).subscribe(() => {
         }, err => {
             console.log('error stop Instance', err);
         });
@@ -153,8 +147,7 @@ export class TableAllComponent implements OnInit {
    */
     public pauseInstance(id: string): void {
 
-        this.apiService.pauseInstance(id).subscribe((result: HttpEvent<number>) => {
-            console.log('result', result);
+        this.apiService.pauseInstance(id).subscribe(() => {
         }, err => {
             console.log('error pause instance', err);
         });
@@ -166,8 +159,7 @@ export class TableAllComponent implements OnInit {
    */
     public resumeInstance(id: string): void {
 
-        this.apiService.resumeInstance(id).subscribe((result: HttpEvent<number>) => {
-            console.log('result', result);
+        this.apiService.resumeInstance(id).subscribe(() => {
         }, err => {
             console.log('error pause instance', err);
         });