cleaned scripts

Author: arcuri82

js_npm/rest/spacex-api/em/app-driver.js

@@ -1,21 +1,10 @@
 const dbHandler = require("./db-handler");
-const {getFreePort} =require("./get-free-port")
-const http  = require("http");
-
-const em= require("evomaster-client-js");
-const mongoose = require('mongoose');
+const em = require("evomaster-client-js");
 
 
 class AppController extends em.SutController {
 
-    setupForGeneratedTest(){
-        return new Promise((resolve)=>{
-            this.testcontainer = dbHandler.startDb();
-            resolve(this.testcontainer);
-        });
-    }
-
-    getInfoForAuthentication(){
+    getInfoForAuthentication() {
         let header = new em.dto.HeaderDto();
         header.name = "spaceX-key";
         header.value = "foo";
@@ -35,37 +24,39 @@ class AppController extends em.SutController {
         return dto;
     }
 
-    isSutRunning(){
+    isSutRunning() {
         if (!this.server) {
             return false;
         }
         return this.server.listening;
     }
 
-    resetStateOfSUT(){
+    resetStateOfSUT() {
         return new Promise((async resolve => {
             await dbHandler.cleanDb();
             dbHandler.initAuth('foo');
             resolve();
         }))
     }
 
-    startSut(){
-        return new Promise( (resolve) => {
-            getFreePort().then((value)=>{
-                this.port = value;
-                this.server = require("./appAPIs");
-                this.server.listen(this.port, "localhost", () => {
-                    resolve("http://localhost:" + this.port);
-                });
-            })
+    startSut() {
+        return new Promise(async (resolve) => {
+
+            await dbHandler.startDb();
+
+            this.server = require("./appAPIs");
+            this.server.listen(0, "localhost", () => {
+                this.port = this.server.address().port;
+                resolve("http://localhost:" + this.port);
+            });
+
         });
     }
 
     stopSut() {
-        return new Promise( (async resolve => {
+        return new Promise((async resolve => {
                 await dbHandler.stopDb();
-                this.server.close( () => {
+                this.server.close(() => {
                     process.exit();
                     resolve();
                 });

js_npm/rest/spacex-api/em/db-handler.js

@@ -1,21 +1,18 @@
 const { GenericContainer } = require("testcontainers");
 const mongoose = require('mongoose');
-const cache = require("../src/middleware/cache");
 
-let dbPort = 27017;
-let exposedDbPort = 0;
-let dbURL = "mongodb://localhost/spacex"
 let test_container = null;
 
 module.exports ={
+
     startDb: async () =>{
         console.log("start db")
-        dbPort = process.env.DB_PORT || 27017;
+        const dbPort = 27017;
         test_container= await new GenericContainer("mongo", "3.5")
             .withExposedPorts(dbPort)
             .start();
-        exposedDbPort = test_container.getMappedPort(dbPort)
-        dbURL = `mongodb://localhost:${exposedDbPort}/spacex`
+        const exposedDbPort = test_container.getMappedPort(dbPort)
+        const dbURL = `mongodb://localhost:${exposedDbPort}/spacex`
         process.env.SPACEX_MONGO = dbURL;
 
         console.log("connecting "+dbURL);
@@ -52,9 +49,6 @@ module.exports ={
                 ]});
     },
 
-    getDbPort: () =>{
-        return exposedDbPort
-    },
     /*
         https://github.com/KristianWEB/fakebooker-backend/blob/471d6f6fafc95af57a99b6506c8f945dce43ffe9/jest.setup.js
         https://kb.objectrocket.com/postgresql/mongoose-drop-collection-if-exists-605